Skip to content

Commit 7f2c3e1

Browse files
authored
Rollup merge of rust-lang#63077 - petrochenkov:nolangfeat, r=petrochenkov
cleanup: Remove some language features related to built-in macros They are now library features. Cleanup after rust-lang#62086. The unstable book files are moved because tidy complained.
2 parents 5922a19 + b92697b commit 7f2c3e1

13 files changed

+6
-31
lines changed

src/libsyntax/feature_gate.rs

-18
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,6 @@ declare_features! (
243243
// Allows using `#![needs_allocator]`, an implementation detail of `#[global_allocator]`.
244244
(active, allocator_internals, "1.20.0", None, None),
245245

246-
// Allows using the `format_args_nl` macro.
247-
(active, format_args_nl, "1.29.0", Some(0), None),
248-
249246
// no-tracking-issue-end
250247

251248
// Added for testing E0705; perma-unstable.
@@ -286,12 +283,6 @@ declare_features! (
286283
// feature-group-start: actual feature gates
287284
// -------------------------------------------------------------------------
288285

289-
// Allows using `asm!` macro with which inline assembly can be embedded.
290-
(active, asm, "1.0.0", Some(29722), None),
291-
292-
// Allows using the `concat_idents!` macro with which identifiers can be concatenated.
293-
(active, concat_idents, "1.0.0", Some(29599), None),
294-
295286
// Allows using the `#[link_args]` attribute.
296287
(active, link_args, "1.0.0", Some(29596), None),
297288

@@ -307,12 +298,6 @@ declare_features! (
307298
// Allows using `#[thread_local]` on `static` items.
308299
(active, thread_local, "1.0.0", Some(29594), None),
309300

310-
// Allows using the `log_syntax!` macro.
311-
(active, log_syntax, "1.0.0", Some(29598), None),
312-
313-
// Allows using the `trace_macros!` macro.
314-
(active, trace_macros, "1.0.0", Some(29598), None),
315-
316301
// Allows the use of SIMD types in functions declared in `extern` blocks.
317302
(active, simd_ffi, "1.0.0", Some(27731), None),
318303

@@ -402,9 +387,6 @@ declare_features! (
402387
// Allows `extern "x86-interrupt" fn()`.
403388
(active, abi_x86_interrupt, "1.17.0", Some(40180), None),
404389

405-
// Allows module-level inline assembly by way of `global_asm!()`.
406-
(active, global_asm, "1.18.0", Some(35119), None),
407-
408390
// Allows overlapping impls of marker traits.
409391
(active, overlapping_marker_traits, "1.18.0", Some(29864), None),
410392

src/test/ui/feature-gates/feature-gate-asm2.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// gate-test-asm
21
// ignore-emscripten
32

43
fn main() {

src/test/ui/feature-gates/feature-gate-asm2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0658]: use of unstable library feature 'asm': inline assembly is not stable enough for use and is subject to change
2-
--> $DIR/feature-gate-asm2.rs:6:26
2+
--> $DIR/feature-gate-asm2.rs:5:26
33
|
44
LL | println!("{:?}", asm!(""));
55
| ^^^

src/test/ui/feature-gates/feature-gate-concat_idents2.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// gate-test-concat_idents
2-
31
fn main() {
42
concat_idents!(a, b); //~ ERROR `concat_idents` is not stable enough
53
//~| ERROR cannot find value `ab` in this scope

src/test/ui/feature-gates/feature-gate-concat_idents2.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` is not stable enough for use and is subject to change
2-
--> $DIR/feature-gate-concat_idents2.rs:4:5
2+
--> $DIR/feature-gate-concat_idents2.rs:2:5
33
|
44
LL | concat_idents!(a, b);
55
| ^^^^^^^^^^^^^
@@ -8,7 +8,7 @@ LL | concat_idents!(a, b);
88
= help: add `#![feature(concat_idents)]` to the crate attributes to enable
99

1010
error[E0425]: cannot find value `ab` in this scope
11-
--> $DIR/feature-gate-concat_idents2.rs:4:5
11+
--> $DIR/feature-gate-concat_idents2.rs:2:5
1212
|
1313
LL | concat_idents!(a, b);
1414
| ^^^^^^^^^^^^^^^^^^^^^ not found in this scope

src/test/ui/feature-gates/feature-gate-concat_idents3.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// gate-test-concat_idents
2-
31
const XY_1: i32 = 10;
42

53
fn main() {

src/test/ui/feature-gates/feature-gate-concat_idents3.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` is not stable enough for use and is subject to change
2-
--> $DIR/feature-gate-concat_idents3.rs:7:20
2+
--> $DIR/feature-gate-concat_idents3.rs:5:20
33
|
44
LL | assert_eq!(10, concat_idents!(X, Y_1));
55
| ^^^^^^^^^^^^^
@@ -8,7 +8,7 @@ LL | assert_eq!(10, concat_idents!(X, Y_1));
88
= help: add `#![feature(concat_idents)]` to the crate attributes to enable
99

1010
error[E0658]: use of unstable library feature 'concat_idents': `concat_idents` is not stable enough for use and is subject to change
11-
--> $DIR/feature-gate-concat_idents3.rs:8:20
11+
--> $DIR/feature-gate-concat_idents3.rs:6:20
1212
|
1313
LL | assert_eq!(20, concat_idents!(X, Y_2));
1414
| ^^^^^^^^^^^^^
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// gate-test-log_syntax
2-
31
fn main() {
42
println!("{:?}", log_syntax!()); //~ ERROR `log_syntax!` is not stable
53
}

src/test/ui/feature-gates/feature-gate-log_syntax2.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0658]: use of unstable library feature 'log_syntax': `log_syntax!` is not stable enough for use and is subject to change
2-
--> $DIR/feature-gate-log_syntax2.rs:4:22
2+
--> $DIR/feature-gate-log_syntax2.rs:2:22
33
|
44
LL | println!("{:?}", log_syntax!());
55
| ^^^^^^^^^^

0 commit comments

Comments
 (0)