Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b8c54d6

Browse files
committed
Auto merge of #140083 - ChrisDenton:rollup-o0xjy0y, r=ChrisDenton
Rollup of 5 pull requests Successful merges: - #138870 (Add target-specific NaN payloads for the missing tier 2 targets) - #139028 (Make target maintainers more easily pingable) - #140063 (Remove stray newline from post-merge report) - #140067 (Remove (now unused) #[rustc_macro_edition_2021] attribute) - #140068 (replace broken links armv7-rtems-eabihf.md) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 49e5e4e + 637518b commit b8c54d6

File tree

98 files changed

+185
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+185
-211
lines changed

‎compiler/rustc_attr_data_structures/src/attributes.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ pub enum AttributeKind {
191191
},
192192
MacroTransparency(Transparency),
193193
Repr(ThinVec<(ReprAttr, Span)>),
194-
RustcMacroEdition2021,
195194
Stability {
196195
stability: Stability,
197196
/// Span of the `#[stable(...)]` or `#[unstable(...)]` attribute

‎compiler/rustc_attr_parsing/src/attributes/mod.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ pub(crate) mod cfg;
2828
pub(crate) mod confusables;
2929
pub(crate) mod deprecation;
3030
pub(crate) mod repr;
31-
pub(crate) mod rustc;
3231
pub(crate) mod stability;
3332
pub(crate) mod transparency;
3433
pub(crate) mod util;

‎compiler/rustc_attr_parsing/src/attributes/rustc.rs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎compiler/rustc_attr_parsing/src/context.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ use crate::attributes::allow_unstable::{AllowConstFnUnstableParser, AllowInterna
1515
use crate::attributes::confusables::ConfusablesParser;
1616
use crate::attributes::deprecation::DeprecationParser;
1717
use crate::attributes::repr::ReprParser;
18-
use crate::attributes::rustc::RustcMacroEdition2021Parser;
1918
use crate::attributes::stability::{
2019
BodyStabilityParser, ConstStabilityIndirectParser, ConstStabilityParser, StabilityParser,
2120
};
@@ -77,7 +76,6 @@ attribute_groups!(
7776
// tidy-alphabetical-start
7877
Single<ConstStabilityIndirectParser>,
7978
Single<DeprecationParser>,
80-
Single<RustcMacroEdition2021Parser>,
8179
Single<TransparencyParser>,
8280
// tidy-alphabetical-end
8381
];

‎compiler/rustc_feature/src/builtin_attrs.rs‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -676,14 +676,6 @@ pub static BUILTIN_ATTRIBUTES: &[BuiltinAttribute] = &[
676676
"`rustc_never_type_options` is used to experiment with never type fallback and work on \
677677
never type stabilization, and will never be stable"
678678
),
679-
rustc_attr!(
680-
rustc_macro_edition_2021,
681-
Normal,
682-
template!(Word),
683-
ErrorFollowing,
684-
EncodeCrossCrate::No,
685-
"makes spans in this macro edition 2021"
686-
),
687679

688680
// ==========================================================================
689681
// Internal attributes: Runtime related:

‎compiler/rustc_resolve/src/macros.rs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use std::sync::Arc;
88
use rustc_ast::expand::StrippedCfgItem;
99
use rustc_ast::{self as ast, Crate, NodeId, attr};
1010
use rustc_ast_pretty::pprust;
11-
use rustc_attr_parsing::{AttributeKind,StabilityLevel, find_attr};
11+
use rustc_attr_parsing::StabilityLevel;
1212
use rustc_data_structures::intern::Interned;
1313
use rustc_errors::{Applicability, DiagCtxtHandle, StashKey};
1414
use rustc_expand::base::{
@@ -1128,13 +1128,6 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
11281128
edition,
11291129
);
11301130

1131-
// The #[rustc_macro_edition_2021] attribute is used by the pin!() macro
1132-
// as a temporary workaround for a regression in expressiveness in Rust 2024.
1133-
// See https://github.com/rust-lang/rust/issues/138718.
1134-
if find_attr!(attrs.iter(), AttributeKind::RustcMacroEdition2021) {
1135-
ext.edition = Edition::Edition2021;
1136-
}
1137-
11381131
if let Some(builtin_name) = ext.builtin_name {
11391132
// The macro was marked with `#[rustc_builtin_macro]`.
11401133
if let Some(builtin_ext_kind) = self.builtin_macros.get(&builtin_name) {

‎compiler/rustc_span/src/symbol.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1824,7 +1824,6 @@ symbols! {
18241824
rustc_lint_opt_ty,
18251825
rustc_lint_query_instability,
18261826
rustc_lint_untracked_query_information,
1827-
rustc_macro_edition_2021,
18281827
rustc_macro_transparency,
18291828
rustc_main,
18301829
rustc_mir,

‎library/core/src/primitive_docs.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,10 +1307,12 @@ mod prim_f16 {}
13071307
// FIXME: Is there a better place to put this?
13081308
///
13091309
/// | `target_arch` | Extra payloads possible on this platform |
1310-
/// |---------------|---------|
1311-
/// | `x86`, `x86_64`, `arm`, `aarch64`, `riscv32`, `riscv64` | None |
1310+
/// |---------------|------------------------------------------|
1311+
// Sorted alphabetically
1312+
/// | `aarch64`, `arm`, `arm64ec`, `loongarch64`, `powerpc` (except when `target_abi = "spe"`), `powerpc64`, `riscv32`, `riscv64`, `s390x`, `x86`, `x86_64` | None |
1313+
/// | `nvptx64` | All payloads |
13121314
/// | `sparc`, `sparc64` | The all-one payload |
1313-
/// | `wasm32`, `wasm64` | If all input NaNs are quiet with all-zero payload: None.<br> Otherwise: all possible payloads. |
1315+
/// | `wasm32`, `wasm64` | If all input NaNs are quiet with all-zero payload: None.<br> Otherwise: all payloads. |
13141316
///
13151317
/// For targets not in this table, all payloads are possible.
13161318
///

‎src/ci/citool/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ fn post_merge_report(db: JobDatabase, current: String, parent: String) -> anyhow
191191

192192
output_details("Test dashboard", || {
193193
println!(
194-
r#"\nRun
194+
r#"Run
195195
196196
```bash
197197
cargo run --manifest-path src/ci/citool/Cargo.toml -- \

‎src/doc/rustc/src/platform-support/TEMPLATE.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ One-sentence description of the target (e.g. CPU, OS)
66

77
## Target maintainers
88

9-
- Some Person, https://github.com/...
9+
[@Ghost](https://github.com/Ghost)
10+
[@octocat](https://github.com/octocat)
1011

1112
## Requirements
1213

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /