Skip to content

Commit 2cf200f

Browse files
committed
tidy
1 parent 205d0d2 commit 2cf200f

File tree

9 files changed

+8
-11
lines changed

9 files changed

+8
-11
lines changed

compiler/rustc_builtin_macros/messages.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ builtin_macros_eii_macro_expected_function = `#[{$name}]` is only valid on funct
153153
builtin_macros_eii_macro_for_expected_list = `#[eii_macro_for(...)]` expects a list of one or two elements
154154
builtin_macros_eii_macro_for_expected_macro = `#[eii_macro_for(...)]` is only valid on macros
155155
builtin_macros_eii_macro_for_expected_max_one_argument = `#[{$name}]` expected no arguments or a single argument: `#[{$name}(default)]`
156-
builtin_macros_eii_macro_for_expected_unsafe = expected this argument to be "unsafe".
156+
builtin_macros_eii_macro_for_expected_unsafe = expected this argument to be "unsafe"
157157
.note = the second argument is optional
158158
159159
builtin_macros_env_not_defined = environment variable `{$var}` not defined at compile time

compiler/rustc_feature/src/unstable.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,8 @@ declare_features! (
476476
(unstable, doc_masked, "1.21.0", Some(44027)),
477477
/// Allows `dyn* Trait` objects.
478478
(incomplete, dyn_star, "1.65.0", Some(102425)),
479+
/// Externally implementatble items
480+
(unstable, eii, "CURRENT_RUSTC_VERSION", Some(125418)),
479481
/// Allows the .use postfix syntax `x.use` and use closures `use |x| { ... }`
480482
(incomplete, ergonomic_clones, "CURRENT_RUSTC_VERSION", Some(132290)),
481483
/// Allows exhaustive pattern matching on types that contain uninhabited types.
@@ -489,8 +491,6 @@ declare_features! (
489491
(unstable, extern_system_varargs, "1.86.0", Some(136946)),
490492
/// Allows defining `extern type`s.
491493
(unstable, extern_types, "1.23.0", Some(43467)),
492-
/// Externally implementatble items
493-
(unstable, eii, "CURRENT_RUSTC_VERSION", Some(125418)),
494494
/// Allow using 128-bit (quad precision) floating point numbers.
495495
(unstable, f128, "1.78.0", Some(116909)),
496496
/// Allow using 16-bit (half precision) floating point numbers.

compiler/rustc_passes/messages.ftl

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ passes_duplicate_eii_impls =
287287
*[other] more implementations were also found in the following crates: {$additional_crate_names}
288288
}
289289
290-
.help = an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict.
290+
.help = an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict
291291
292292
passes_duplicate_feature_err =
293293
the feature `{$feature}` has already been enabled

library/core/src/macros/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,7 @@ pub(crate) mod builtin {
17841784
/// Externally Implementable Item: Defines an attribute macro that can override the item
17851785
/// this is applied to.
17861786
#[cfg(not(bootstrap))]
1787-
#[unstable(feature = "eii", issue = "none")]
1787+
#[unstable(feature = "eii", issue = "125418")]
17881788
#[rustc_builtin_macro]
17891789
#[allow_internal_unstable(eii_internals, decl_macro, rustc_attrs)]
17901790
pub macro eii($item:item) {
@@ -1794,7 +1794,7 @@ pub(crate) mod builtin {
17941794
/// Unsafely Externally Implementable Item: Defines an unsafe attribute macro that can override
17951795
/// the item this is applied to.
17961796
#[cfg(not(bootstrap))]
1797-
#[unstable(feature = "eii", issue = "none")]
1797+
#[unstable(feature = "eii", issue = "125418")]
17981798
#[rustc_builtin_macro]
17991799
#[allow_internal_unstable(eii_internals, decl_macro, rustc_attrs)]
18001800
pub macro unsafe_eii($item:item) {

library/core/src/prelude/v1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ pub use crate::macros::builtin::deref;
120120
#[cfg(not(bootstrap))]
121121
pub use crate::macros::builtin::define_opaque;
122122

123-
#[unstable(feature = "eii", issue = "none")]
123+
#[unstable(feature = "eii", issue = "125418")]
124124
#[cfg(not(bootstrap))]
125125
pub use crate::macros::builtin::{eii, unsafe_eii};
126126

library/std/src/prelude/v1.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ pub use core::prelude::v1::deref;
112112
#[cfg(not(bootstrap))]
113113
pub use core::prelude::v1::define_opaque;
114114

115-
#[unstable(feature = "eii", issue = "none")]
115+
#[unstable(feature = "eii", issue = "125418")]
116116
#[cfg(not(bootstrap))]
117117
pub use core::prelude::v1::{eii, unsafe_eii};
118118

tests/ui/eii/auxiliary/codegen2.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44

55
#[eii(eii1)]
66
pub fn decl1(x: u64);
7-

tests/ui/eii/default/auxiliary/decl_with_default.rs

-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@
66
pub fn decl1(x: u64) {
77
println!("default {x}");
88
}
9-

tests/ui/eii/duplicate/auxiliary/decl.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44

55
#[eii(eii1)]
66
fn decl1(x: u64);
7-

0 commit comments

Comments
 (0)