diff options
111 files changed, 236 insertions, 272 deletions
diff --git a/compiler/rustc_interface/src/passes.rs b/compiler/rustc_interface/src/passes.rs index 5d633846bcf..e88ad04e0f5 100644 --- a/compiler/rustc_interface/src/passes.rs +++ b/compiler/rustc_interface/src/passes.rs @@ -934,6 +934,11 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> { }); }, { + sess.time("unused_lib_feature_checking", || { + rustc_passes::stability::check_unused_or_stable_features(tcx) + }); + }, + { // We force these querie to run, // since they might not otherwise get called. // This marks the corresponding crate-level attributes @@ -1012,11 +1017,6 @@ fn analysis(tcx: TyCtxt<'_>, (): ()) -> Result<()> { .par_for_each_module(|module| tcx.ensure().check_mod_deathness(module)); }, { - sess.time("unused_lib_feature_checking", || { - rustc_passes::stability::check_unused_or_stable_features(tcx) - }); - }, - { sess.time("lint_checking", || { rustc_lint::check_crate(tcx, || { rustc_lint::BuiltinCombinedLateLintPass::new() diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs index 36041e4b8ef..41c9a265cd7 100644 --- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs +++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-1.rs @@ -1,6 +1,6 @@ // compile-flags:-C panic=abort -#![feature(alloc_error_handler, panic_handler)] +#![feature(alloc_error_handler)] #![no_std] #![no_main] diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs index 009f6bce6d3..49ea3105fbd 100644 --- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs +++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-2.rs @@ -1,6 +1,6 @@ // compile-flags:-C panic=abort -#![feature(alloc_error_handler, panic_handler)] +#![feature(alloc_error_handler)] #![no_std] #![no_main] diff --git a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs index f2d884b7469..321fd954db6 100644 --- a/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs +++ b/src/test/ui/alloc-error/alloc-error-handler-bad-signature-3.rs @@ -1,6 +1,6 @@ // compile-flags:-C panic=abort -#![feature(alloc_error_handler, panic_handler)] +#![feature(alloc_error_handler)] #![no_std] #![no_main] diff --git a/src/test/ui/asm/naked-functions.rs b/src/test/ui/asm/naked-functions.rs index 5b4293972ea..9c6e810dfce 100644 --- a/src/test/ui/asm/naked-functions.rs +++ b/src/test/ui/asm/naked-functions.rs @@ -4,7 +4,6 @@ // ignore-wasm32 #![feature(naked_functions)] -#![feature(or_patterns)] #![feature(asm_const, asm_sym, asm_unwind)] #![crate_type = "lib"] diff --git a/src/test/ui/asm/naked-functions.stderr b/src/test/ui/asm/naked-functions.stderr index c1dcc433db6..5520f815f3e 100644 --- a/src/test/ui/asm/naked-functions.stderr +++ b/src/test/ui/asm/naked-functions.stderr @@ -1,35 +1,35 @@ error: asm with the `pure` option must have at least one output - --> $DIR/naked-functions.rs:111:14 + --> $DIR/naked-functions.rs:110:14 | LL | asm!("", options(readonly, nostack), options(pure)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^ error: patterns not allowed in naked function parameters - --> $DIR/naked-functions.rs:21:5 + --> $DIR/naked-functions.rs:20:5 | LL | mut a: u32, | ^^^^^ error: patterns not allowed in naked function parameters - --> $DIR/naked-functions.rs:23:5 + --> $DIR/naked-functions.rs:22:5 | LL | &b: &i32, | ^^ error: patterns not allowed in naked function parameters - --> $DIR/naked-functions.rs:25:6 + --> $DIR/naked-functions.rs:24:6 | LL | (None | Some(_)): Option<std::ptr::NonNull<u8>>, | ^^^^^^^^^^^^^^ error: patterns not allowed in naked function parameters - --> $DIR/naked-functions.rs:27:5 + --> $DIR/naked-functions.rs:26:5 | LL | P { x, y }: P, | ^^^^^^^^^^ error: referencing function parameters is not allowed in naked functions - --> $DIR/naked-functions.rs:36:5 + --> $DIR/naked-functions.rs:35:5 | LL | a + 1 | ^ @@ -37,7 +37,7 @@ LL | a + 1 = help: follow the calling convention in asm block to use parameters error[E0787]: naked functions must contain a single asm block - --> $DIR/naked-functions.rs:34:1 + --> $DIR/naked-functions.rs:33:1 | LL | / pub unsafe extern "C" fn inc(a: u32) -> u32 { LL | | @@ -48,7 +48,7 @@ LL | | } | |_^ error: referencing function parameters is not allowed in naked functions - --> $DIR/naked-functions.rs:42:31 + --> $DIR/naked-functions.rs:41:31 | LL | asm!("/* {0} */", in(reg) a, options(noreturn)); | ^ @@ -56,13 +56,13 @@ LL | asm!("/* {0} */", in(reg) a, options(noreturn)); = help: follow the calling convention in asm block to use parameters error[E0787]: only `const` and `sym` operands are supported in naked functions - --> $DIR/naked-functions.rs:42:23 + --> $DIR/naked-functions.rs:41:23 | LL | asm!("/* {0} */", in(reg) a, options(noreturn)); | ^^^^^^^^^ error[E0787]: naked functions must contain a single asm block - --> $DIR/naked-functions.rs:48:1 + --> $DIR/naked-functions.rs:47:1 | LL | / pub unsafe extern "C" fn inc_closure(a: u32) -> u32 { LL | | @@ -72,7 +72,7 @@ LL | | } | |_^ error[E0787]: only `const` and `sym` operands are supported in naked functions - --> $DIR/naked-functions.rs:65:10 + --> $DIR/naked-functions.rs:64:10 | LL | in(reg) a, | ^^^^^^^^^ @@ -87,7 +87,7 @@ LL | out(reg) e, | ^^^^^^^^^^ error[E0787]: asm in naked functions must use `noreturn` option - --> $DIR/naked-functions.rs:63:5 + --> $DIR/naked-functions.rs:62:5 | LL | / asm!("/* {0} {1} {2} {3} {4} {5} {6} */", LL | | @@ -99,7 +99,7 @@ LL | | ); | |_____^ error[E0787]: naked functions must contain a single asm block - --> $DIR/naked-functions.rs:54:1 + --> $DIR/naked-functions.rs:53:1 | LL | / pub unsafe extern "C" fn unsupported_operands() { LL | | @@ -119,7 +119,7 @@ LL | | } | |_^ error[E0787]: naked functions must contain a single asm block - --> $DIR/naked-functions.rs:77:1 + --> $DIR/naked-functions.rs:76:1 | LL | / pub extern "C" fn missing_assembly() { LL | | @@ -127,25 +127,25 @@ LL | | } | |_^ error[E0787]: asm in naked functions must use `noreturn` option - --> $DIR/naked-functions.rs:84:5 + --> $DIR/naked-functions.rs:83:5 | LL | asm!(""); | ^^^^^^^^ error[E0787]: asm in naked functions must use `noreturn` option - --> $DIR/naked-functions.rs:86:5 + --> $DIR/naked-functions.rs:85:5 | LL | asm!(""); | ^^^^^^^^ error[E0787]: asm in naked functions must use `noreturn` option - --> $DIR/naked-functions.rs:88:5 + --> $DIR/naked-functions.rs:87:5 | LL | asm!(""); | ^^^^^^^^ error[E0787]: naked functions must contain a single asm block - --> $DIR/naked-functions.rs:82:1 + --> $DIR/naked-functions.rs:81:1 | LL | / pub extern "C" fn too_many_asm_blocks() { LL | | @@ -163,7 +163,7 @@ LL | | } | |_^ error: referencing function parameters is not allowed in naked functions - --> $DIR/naked-functions.rs:97:11 + --> $DIR/naked-functions.rs:96:11 | LL | *&y | ^ @@ -171,7 +171,7 @@ LL | *&y = help: follow the calling convention in asm block to use parameters error[E0787]: naked functions must contain a single asm block - --> $DIR/naked-functions.rs:95:5 + --> $DIR/naked-functions.rs:94:5 | LL | / pub extern "C" fn inner(y: usize) -> usize { LL | | @@ -182,31 +182,31 @@ LL | | } | |_____^ error[E0787]: asm options unsupported in naked functions: `nomem`, `preserves_flags` - --> $DIR/naked-functions.rs:105:5 + --> $DIR/naked-functions.rs:104:5 | LL | asm!("", options(nomem, preserves_flags, noreturn)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0787]: asm options unsupported in naked functions: `nostack`, `pure`, `readonly` - --> $DIR/naked-functions.rs:111:5 + --> $DIR/naked-functions.rs:110:5 | LL | asm!("", options(readonly, nostack), options(pure)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0787]: asm in naked functions must use `noreturn` option - --> $DIR/naked-functions.rs:111:5 + --> $DIR/naked-functions.rs:110:5 | LL | asm!("", options(readonly, nostack), options(pure)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ error[E0787]: asm options unsupported in naked functions: `may_unwind` - --> $DIR/naked-functions.rs:119:5 + --> $DIR/naked-functions.rs:118:5 | LL | asm!("", options(noreturn, may_unwind)); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ warning: Rust ABI is unsupported in naked functions - --> $DIR/naked-functions.rs:124:15 + --> $DIR/naked-functions.rs:123:15 | LL | pub unsafe fn default_abi() { | ^^^^^^^^^^^ @@ -214,43 +214,43 @@ LL | pub unsafe fn default_abi() { = note: `#[warn(undefined_naked_function_abi)]` on by default warning: Rust ABI is unsupported in naked functions - --> $DIR/naked-functions.rs:130:15 + --> $DIR/naked-functions.rs:129:15 | LL | pub unsafe fn rust_abi() { | ^^^^^^^^ error: naked functions cannot be inlined - --> $DIR/naked-functions.rs:170:1 + --> $DIR/naked-functions.rs:169:1 | LL | #[inline] | ^^^^^^^^^ error: naked functions cannot be inlined - --> $DIR/naked-functions.rs:177:1 + --> $DIR/naked-functions.rs:176:1 | LL | #[inline(always)] | ^^^^^^^^^^^^^^^^^ error: naked functions cannot be inlined - --> $DIR/naked-functions.rs:184:1 + --> $DIR/naked-functions.rs:183:1 | LL | #[inline(never)] | ^^^^^^^^^^^^^^^^ error: naked functions cannot be inlined - --> $DIR/naked-functions.rs:191:1 + --> $DIR/naked-functions.rs:190:1 | LL | #[inline] | ^^^^^^^^^ error: naked functions cannot be inlined - --> $DIR/naked-functions.rs:193:1 + --> $DIR/naked-functions.rs:192:1 | LL | #[inline(always)] | ^^^^^^^^^^^^^^^^^ error: naked functions cannot be inlined - --> $DIR/naked-functions.rs:195:1 + --> $DIR/naked-functions.rs:194:1 | LL | #[inline(never)] | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/associated-consts/associated-const-in-trait.rs b/src/test/ui/associated-consts/associated-const-in-trait.rs index f3024120df1..cf5d5d859b6 100644 --- a/src/test/ui/associated-consts/associated-const-in-trait.rs +++ b/src/test/ui/associated-consts/associated-const-in-trait.rs @@ -1,7 +1,5 @@ // #29924 -#![feature(associated_consts)] - trait Trait { const N: usize; } diff --git a/src/test/ui/associated-consts/associated-const-in-trait.stderr b/src/test/ui/associated-consts/associated-const-in-trait.stderr index fc949f24948..60bbe385c01 100644 --- a/src/test/ui/associated-consts/associated-const-in-trait.stderr +++ b/src/test/ui/associated-consts/associated-const-in-trait.stderr @@ -1,11 +1,11 @@ error[E0038]: the trait `Trait` cannot be made into an object - --> $DIR/associated-const-in-trait.rs:9:6 + --> $DIR/associated-const-in-trait.rs:7:6 | LL | impl dyn Trait { | ^^^^^^^^^ `Trait` cannot be made into an object | note: for a trait to be "object safe" it needs to allow building a vtable to allow the call to be resolvable dynamically; for more information visit <https://doc.rust-lang.org/reference/items/traits.html#object-safety> - --> $DIR/associated-const-in-trait.rs:6:11 + --> $DIR/associated-const-in-trait.rs:4:11 | LL | trait Trait { | ----- this trait cannot be made into an object... diff --git a/src/test/ui/async-await/try-on-option-in-async.rs b/src/test/ui/async-await/try-on-option-in-async.rs index c520a07abc1..afaaed2ef6e 100644 --- a/src/test/ui/async-await/try-on-option-in-async.rs +++ b/src/test/ui/async-await/try-on-option-in-async.rs @@ -1,4 +1,4 @@ -#![feature(try_trait, async_closure)] +#![feature(async_closure)] // edition:2018 fn main() {} diff --git a/src/test/ui/attributes/const-stability-on-macro.rs b/src/test/ui/attributes/const-stability-on-macro.rs index 3fc60f7ce48..412af195d7a 100644 --- a/src/test/ui/attributes/const-stability-on-macro.rs +++ b/src/test/ui/attributes/const-stability-on-macro.rs @@ -1,3 +1,6 @@ +#![feature(staged_api)] +#![stable(feature = "rust1", since = "1.0.0")] + #[rustc_const_stable(feature = "foo", since = "0")] //~^ ERROR macros cannot have const stability attributes macro_rules! foo { diff --git a/src/test/ui/attributes/const-stability-on-macro.stderr b/src/test/ui/attributes/const-stability-on-macro.stderr index ef24e44d190..c3da02c79cb 100644 --- a/src/test/ui/attributes/const-stability-on-macro.stderr +++ b/src/test/ui/attributes/const-stability-on-macro.stderr @@ -1,5 +1,5 @@ error: macros cannot have const stability attributes - --> $DIR/const-stability-on-macro.rs:1:1 + --> $DIR/const-stability-on-macro.rs:4:1 | LL | #[rustc_const_stable(feature = "foo", since = "0")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid const stability attribute @@ -8,7 +8,7 @@ LL | macro_rules! foo { | ---------------- const stability attribute affects this macro error: macros cannot have const stability attributes - --> $DIR/const-stability-on-macro.rs:7:1 + --> $DIR/const-stability-on-macro.rs:10:1 | LL | #[rustc_const_unstable(feature = "bar", issue="none")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid const stability attribute diff --git a/src/test/ui/attributes/extented-attribute-macro-error.rs b/src/test/ui/attributes/extented-attribute-macro-error.rs index f5f75f9f4da..492f84f56c3 100644 --- a/src/test/ui/attributes/extented-attribute-macro-error.rs +++ b/src/test/ui/attributes/extented-attribute-macro-error.rs @@ -1,6 +1,5 @@ // normalize-stderr-test: "couldn't read.*" -> "couldn't read the file" -#![feature(extended_key_value_attributes)] #![doc = include_str!("../not_existing_file.md")] struct Documented {} //~^^ ERROR couldn't read diff --git a/src/test/ui/attributes/extented-attribute-macro-error.stderr b/src/test/ui/attributes/extented-attribute-macro-error.stderr index e4deeacd0ff..0fcde9b7cc6 100644 --- a/src/test/ui/attributes/extented-attribute-macro-error.stderr +++ b/src/test/ui/attributes/extented-attribute-macro-error.stderr @@ -1,5 +1,5 @@ error: couldn't read the file - --> $DIR/extented-attribute-macro-error.rs:4:10 + --> $DIR/extented-attribute-macro-error.rs:3:10 | LL | #![doc = include_str!("../not_existing_file.md")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/const-generics/issues/issue-82956.rs b/src/test/ui/const-generics/issues/issue-82956.rs index a3a0d8d06e8..3539e9b966c 100644 --- a/src/test/ui/const-generics/issues/issue-82956.rs +++ b/src/test/ui/const-generics/issues/issue-82956.rs @@ -1,4 +1,4 @@ -#![feature(generic_const_exprs, array_map)] +#![feature(generic_const_exprs)] #![allow(incomplete_features)] pub struct ConstCheck<const CHECK: bool>; diff --git a/src/test/ui/consts/const-array-oob-arith.rs b/src/test/ui/consts/const-array-oob-arith.rs index 2f5661e32a9..9332cbbd4d7 100644 --- a/src/test/ui/consts/const-array-oob-arith.rs +++ b/src/test/ui/consts/const-array-oob-arith.rs @@ -1,5 +1,3 @@ -#![feature(const_indexing)] - const ARR: [i32; 6] = [42, 43, 44, 45, 46, 47]; const IDX: usize = 3; const VAL: i32 = ARR[IDX]; diff --git a/src/test/ui/consts/const-array-oob-arith.stderr b/src/test/ui/consts/const-array-oob-arith.stderr index eae93b72ddc..f7a55d3ca72 100644 --- a/src/test/ui/consts/const-array-oob-arith.stderr +++ b/src/test/ui/consts/const-array-oob-arith.stderr @@ -1,11 +1,11 @@ error[E0308]: mismatched types - --> $DIR/const-array-oob-arith.rs:7:45 + --> $DIR/const-array-oob-arith.rs:5:45 | LL | const BLUB: [i32; (ARR[0] - 40) as usize] = [5]; | ^^^ expected an array with a fixed size of 2 elements, found one with 1 element error[E0308]: mismatched types - --> $DIR/const-array-oob-arith.rs:10:44 + --> $DIR/const-array-oob-arith.rs:8:44 | LL | const BOO: [i32; (ARR[0] - 41) as usize] = [5, 99]; | ^^^^^^^ expected an array with a fixed size of 1 element, found one with 2 elements diff --git a/src/test/ui/consts/const-array-oob.rs b/src/test/ui/consts/const-array-oob.rs index eca2fe18ab9..c747ab50c16 100644 --- a/src/test/ui/consts/const-array-oob.rs +++ b/src/test/ui/consts/const-array-oob.rs @@ -1,5 +1,3 @@ -#![feature(const_indexing)] - const FOO: [usize; 3] = [1, 2, 3]; const BAR: usize = FOO[5]; // no error, because the error below occurs before regular const eval diff --git a/src/test/ui/consts/const-array-oob.stderr b/src/test/ui/consts/const-array-oob.stderr index 1aa3e88e520..f1c5f58af47 100644 --- a/src/test/ui/consts/const-array-oob.stderr +++ b/src/test/ui/consts/const-array-oob.stderr @@ -1,5 +1,5 @@ error[E0080]: evaluation of constant value failed - --> $DIR/const-array-oob.rs:6:19 + --> $DIR/const-array-oob.rs:4:19 | LL | const BLUB: [u32; FOO[4]] = [5, 6]; | ^^^^^^ index out of bounds: the length is 3 but the index is 4 diff --git a/src/test/ui/consts/const-eval/transmute-const-promotion.rs b/src/test/ui/consts/const-eval/transmute-const-promotion.rs index 8bd1b341e6e..1f0240d4b5a 100644 --- a/src/test/ui/consts/const-eval/transmute-const-promotion.rs +++ b/src/test/ui/consts/const-eval/transmute-const-promotion.rs @@ -1,5 +1,3 @@ -#![feature(const_transmute)] - use std::mem; fn main() { diff --git a/src/test/ui/consts/const-eval/transmute-const-promotion.stderr b/src/test/ui/consts/const-eval/transmute-const-promotion.stderr index 5aae8c12d16..15b9b56ea66 100644 --- a/src/test/ui/consts/const-eval/transmute-const-promotion.stderr +++ b/src/test/ui/consts/const-eval/transmute-const-promotion.stderr @@ -1,5 +1,5 @@ error[E0716]: temporary value dropped while borrowed - --> $DIR/transmute-const-promotion.rs:6:37 + --> $DIR/transmute-const-promotion.rs:4:37 | LL | let x: &'static u32 = unsafe { &mem::transmute(3.0f32) }; | ------------ ^^^^^^^^^^^^^^^^^^^^^^ creates a temporary which is freed while still in use diff --git a/src/test/ui/consts/issue-87046.rs b/src/test/ui/consts/issue-87046.rs index 1f147439f8b..4b8f9f53641 100644 --- a/src/test/ui/consts/issue-87046.rs +++ b/src/test/ui/consts/issue-87046.rs @@ -2,7 +2,6 @@ #![crate_type="lib"] #![allow(unreachable_patterns)] -#![feature(const_fn_union)] #[derive(PartialEq, Eq)] #[repr(transparent)] diff --git a/src/test/ui/consts/issue-87046.stderr b/src/test/ui/consts/issue-87046.stderr index 5da7a9e2390..d0dbb21cee0 100644 --- a/src/test/ui/consts/issue-87046.stderr +++ b/src/test/ui/consts/issue-87046.stderr @@ -1,5 +1,5 @@ error: cannot use unsized non-slice type `Username` in constant patterns - --> $DIR/issue-87046.rs:29:13 + --> $DIR/issue-87046.rs:28:13 | LL | ROOT_USER => true, | ^^^^^^^^^ diff --git a/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.rs b/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.rs index 53ade85bfd2..a0870ea6de3 100644 --- a/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.rs +++ b/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.rs @@ -1,5 +1,6 @@ #![feature(rustc_attrs, staged_api, rustc_allow_const_fn_unstable)] #![feature(const_fn_fn_ptr_basics)] +#![stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")] #[rustc_const_stable(since="1.0.0", feature = "mep")] diff --git a/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.stderr b/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.stderr index 6f89225719f..3523cab49fd 100644 --- a/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.stderr +++ b/src/test/ui/consts/min_const_fn/allow_const_fn_ptr.stderr @@ -1,5 +1,5 @@ error: const-stable function cannot use `#[feature(const_fn_fn_ptr_basics)]` - --> $DIR/allow_const_fn_ptr.rs:6:16 + --> $DIR/allow_const_fn_ptr.rs:7:16 | LL | const fn error(_: fn()) {} | ^ diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.rs b/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.rs index 35aa587d3d2..bb240fb4ad6 100644 --- a/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.rs +++ b/src/test/ui/consts/min_const_fn/min_const_fn_libstd_stability.rs @@ -15,7 +15,7 @@ const fn foo() -> u32 { 42 } // can't call non-min_const_fn const fn bar() -> u32 { foo() } //~ ERROR not yet stable as a const fn -#[unstable(feature = "rust1", issue = "none")] +#[unstable(feature = "foo2", issue = "none")] const fn foo2() -> u32 { 42 } #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.rs b/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.rs index 962a57bb8e9..03084c8674d 100644 --- a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.rs +++ b/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability.rs @@ -15,7 +15,7 @@ const unsafe fn foo() -> u32 { 42 } // can't call non-min_const_fn const unsafe fn bar() -> u32 { unsafe { foo() } } //~ ERROR not yet stable as a const fn -#[unstable(feature = "rust1", issue = "none")] +#[unstable(feature = "foo2", issue = "none")] const unsafe fn foo2() -> u32 { 42 } #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.rs b/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.rs index 194f5fc1e54..94b62071362 100644 --- a/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.rs +++ b/src/test/ui/consts/min_const_fn/min_const_unsafe_fn_libstd_stability2.rs @@ -15,7 +15,7 @@ const fn foo() -> u32 { 42 } // can't call non-min_const_fn const unsafe fn bar() -> u32 { foo() } //~ ERROR not yet stable as a const fn -#[unstable(feature = "rust1", issue = "none")] +#[unstable(feature = "foo2", issue = "none")] const fn foo2() -> u32 { 42 } #[stable(feature = "rust1", since = "1.0.0")] diff --git a/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs b/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs index 0f0068ac3bd..2e1d5d26b5c 100644 --- a/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs +++ b/src/test/ui/consts/transmute-size-mismatch-before-typeck.rs @@ -1,5 +1,3 @@ -#![feature(const_transmute)] - // normalize-stderr-64bit "64 bits" -> "word size" // normalize-stderr-32bit "32 bits" -> "word size" // normalize-stderr-64bit "128 bits" -> "2 * word size" diff --git a/src/test/ui/consts/transmute-size-mismatch-before-typeck.stderr b/src/test/ui/consts/transmute-size-mismatch-before-typeck.stderr index 6e93aed70b6..27cc2f5e66a 100644 --- a/src/test/ui/consts/transmute-size-mismatch-before-typeck.stderr +++ b/src/test/ui/consts/transmute-size-mismatch-before-typeck.stderr @@ -1,5 +1,5 @@ error: any use of this value will cause an error - --> $DIR/transmute-size-mismatch-before-typeck.rs:15:29 + --> $DIR/transmute-size-mismatch-before-typeck.rs:13:29 | LL | const ZST: &[u8] = unsafe { std::mem::transmute(1usize) }; | ----------------------------^^^^^^^^^^^^^^^^^^^^^^^^^^^--- @@ -11,13 +11,13 @@ LL | const ZST: &[u8] = unsafe { std::mem::transmute(1usize) }; = note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800> error: could not evaluate constant pattern - --> $DIR/transmute-size-mismatch-before-typeck.rs:10:9 + --> $DIR/transmute-size-mismatch-before-typeck.rs:8:9 | LL | ZST => {} | ^^^ error[E0512]: cannot transmute between types of different sizes, or dependently-sized types - --> $DIR/transmute-size-mismatch-before-typeck.rs:15:29 + --> $DIR/transmute-size-mismatch-before-typeck.rs:13:29 | LL | const ZST: &[u8] = unsafe { std::mem::transmute(1usize) }; | ^^^^^^^^^^^^^^^^^^^ @@ -26,7 +26,7 @@ LL | const ZST: &[u8] = unsafe { std::mem::transmute(1usize) }; = note: target type: `&[u8]` (2 * word size) error: could not evaluate constant pattern - --> $DIR/transmute-size-mismatch-before-typeck.rs:10:9 + --> $DIR/transmute-size-mismatch-before-typeck.rs:8:9 | LL | ZST => {} | ^^^ diff --git a/src/test/ui/consts/unstable-const-fn-in-libcore.rs b/src/test/ui/consts/unstable-const-fn-in-libcore.rs index 2fbbbbffac4..8ee1270805e 100644 --- a/src/test/ui/consts/unstable-const-fn-in-libcore.rs +++ b/src/test/ui/consts/unstable-const-fn-in-libcore.rs @@ -4,7 +4,6 @@ // gate was not enabled in libcore. #![stable(feature = "core", since = "1.6.0")] -#![feature(rustc_const_unstable)] #![feature(staged_api)] #![feature(const_fn_trait_bound)] diff --git a/src/test/ui/consts/unstable-const-fn-in-libcore.stderr b/src/test/ui/consts/unstable-const-fn-in-libcore.stderr index 4ef25bd1334..3ec9971b8e1 100644 --- a/src/test/ui/consts/unstable-const-fn-in-libcore.stderr +++ b/src/test/ui/consts/unstable-const-fn-in-libcore.stderr @@ -1,5 +1,5 @@ error[E0015]: cannot call non-const closure in constant functions - --> $DIR/unstable-const-fn-in-libcore.rs:24:26 + --> $DIR/unstable-const-fn-in-libcore.rs:23:26 | LL | Opt::None => f(), | ^^^ @@ -11,7 +11,7 @@ LL | const fn unwrap_or_else<F: FnOnce() -> T + ~const std::ops::FnOnce<()>> | +++++++++++++++++++++++++++++ error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/unstable-const-fn-in-libcore.rs:19:53 + --> $DIR/unstable-const-fn-in-libcore.rs:18:53 | LL | const fn unwrap_or_else<F: FnOnce() -> T>(self, f: F) -> T { | ^ constant functions cannot evaluate destructors @@ -20,7 +20,7 @@ LL | } | - value is dropped here error[E0493]: destructors cannot be evaluated at compile-time - --> $DIR/unstable-const-fn-in-libcore.rs:19:47 + --> $DIR/unstable-const-fn-in-libcore.rs:18:47 | LL | const fn unwrap_or_else<F: FnOnce() -> T>(self, f: F) -> T { | ^^^^ constant functions cannot evaluate destructors diff --git a/src/test/ui/explore-issue-38412.rs b/src/test/ui/explore-issue-38412.rs index e7bcd7c6bfe..46d952df771 100644 --- a/src/test/ui/explore-issue-38412.rs +++ b/src/test/ui/explore-issue-38412.rs @@ -1,7 +1,5 @@ // aux-build:pub-and-stability.rs -#![feature(unused_feature)] - // A big point of this test is that we *declare* `unstable_declared`, // but do *not* declare `unstable_undeclared`. This way we can check // that the compiler is letting in uses of declared feature-gated diff --git a/src/test/ui/explore-issue-38412.stderr b/src/test/ui/explore-issue-38412.stderr index 2f5dab7eb05..e3f82137ab3 100644 --- a/src/test/ui/explore-issue-38412.stderr +++ b/src/test/ui/explore-issue-38412.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'unstable_undeclared' - --> $DIR/explore-issue-38412.rs:21:63 + --> $DIR/explore-issue-38412.rs:19:63 | LL | let Record { a_stable_pub: _, a_unstable_declared_pub: _, a_unstable_undeclared_pub: _, .. } = | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -8,7 +8,7 @@ LL | let Record { a_stable_pub: _, a_unstable_declared_pub: _, a_unstable_un = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_undeclared' - --> $DIR/explore-issue-38412.rs:30:5 + --> $DIR/explore-issue-38412.rs:28:5 | LL | r.a_unstable_undeclared_pub; | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -17,25 +17,25 @@ LL | r.a_unstable_undeclared_pub; = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable error[E0616]: field `b_crate` of struct `Record` is private - --> $DIR/explore-issue-38412.rs:31:7 + --> $DIR/explore-issue-38412.rs:29:7 | LL | r.b_crate; | ^^^^^^^ private field error[E0616]: field `c_mod` of struct `Record` is private - --> $DIR/explore-issue-38412.rs:32:7 + --> $DIR/explore-issue-38412.rs:30:7 | LL | r.c_mod; | ^^^^^ private field error[E0616]: field `d_priv` of struct `Record` is private - --> $DIR/explore-issue-38412.rs:33:7 + --> $DIR/explore-issue-38412.rs:31:7 | LL | r.d_priv; | ^^^^^^ private field error[E0658]: use of unstable library feature 'unstable_undeclared' - --> $DIR/explore-issue-38412.rs:37:5 + --> $DIR/explore-issue-38412.rs:35:5 | LL | t.2; | ^^^ @@ -44,25 +44,25 @@ LL | t.2; = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable error[E0616]: field `3` of struct `Tuple` is private - --> $DIR/explore-issue-38412.rs:38:7 + --> $DIR/explore-issue-38412.rs:36:7 | LL | t.3; | ^ private field error[E0616]: field `4` of struct `Tuple` is private - --> $DIR/explore-issue-38412.rs:39:7 + --> $DIR/explore-issue-38412.rs:37:7 | LL | t.4; | ^ private field error[E0616]: field `5` of struct `Tuple` is private - --> $DIR/explore-issue-38412.rs:40:7 + --> $DIR/explore-issue-38412.rs:38:7 | LL | t.5; | ^ private field error[E0658]: use of unstable library feature 'unstable_undeclared' - --> $DIR/explore-issue-38412.rs:44:7 + --> $DIR/explore-issue-38412.rs:42:7 | LL | r.unstable_undeclared_trait_method(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | r.unstable_undeclared_trait_method(); = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_undeclared' - --> $DIR/explore-issue-38412.rs:48:7 + --> $DIR/explore-issue-38412.rs:46:7 | LL | r.unstable_undeclared(); | ^^^^^^^^^^^^^^^^^^^ @@ -80,7 +80,7 @@ LL | r.unstable_undeclared(); = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable error[E0624]: associated function `pub_crate` is private - --> $DIR/explore-issue-38412.rs:50:7 + --> $DIR/explore-issue-38412.rs:48:7 | LL | r.pub_crate(); | ^^^^^^^^^ private associated function @@ -91,7 +91,7 @@ LL | pub(crate) fn pub_crate(&self) -> i32 { self.d_priv } | ------------------------------------- private associated function defined here error[E0624]: associated function `pub_mod` is private - --> $DIR/explore-issue-38412.rs:51:7 + --> $DIR/explore-issue-38412.rs:49:7 | LL | r.pub_mod(); | ^^^^^^^ private associated function @@ -102,7 +102,7 @@ LL | pub(in m) fn pub_mod(&self) -> i32 { self.d_priv } | ---------------------------------- private associated function defined here error[E0624]: associated function `private` is private - --> $DIR/explore-issue-38412.rs:52:7 + --> $DIR/explore-issue-38412.rs:50:7 | LL | r.private(); | ^^^^^^^ private associated function @@ -113,7 +113,7 @@ LL | fn private(&self) -> i32 { self.d_priv } | ------------------------ private associated function defined here error[E0658]: use of unstable library feature 'unstable_undeclared' - --> $DIR/explore-issue-38412.rs:57:7 + --> $DIR/explore-issue-38412.rs:55:7 | LL | t.unstable_undeclared_trait_method(); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -122,7 +122,7 @@ LL | t.unstable_undeclared_trait_method(); = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_undeclared' - --> $DIR/explore-issue-38412.rs:61:7 + --> $DIR/explore-issue-38412.rs:59:7 | LL | t.unstable_undeclared(); | ^^^^^^^^^^^^^^^^^^^ @@ -131,7 +131,7 @@ LL | t.unstable_undeclared(); = help: add `#![feature(unstable_undeclared)]` to the crate attributes to enable error[E0624]: associated function `pub_crate` is private - --> $DIR/explore-issue-38412.rs:63:7 + --> $DIR/explore-issue-38412.rs:61:7 | LL | t.pub_crate(); | ^^^^^^^^^ private associated function @@ -142,7 +142,7 @@ LL | pub(crate) fn pub_crate(&self) -> i32 { self.0 } | ------------------------------------- private associated function defined here error[E0624]: associated function `pub_mod` is private - --> $DIR/explore-issue-38412.rs:64:7 + --> $DIR/explore-issue-38412.rs:62:7 | LL | t.pub_mod(); | ^^^^^^^ private associated function @@ -153,7 +153,7 @@ LL | pub(in m) fn pub_mod(&self) -> i32 { self.0 } | ---------------------------------- private associated function defined here error[E0624]: associated function `private` is private - --> $DIR/explore-issue-38412.rs:65:7 + --> $DIR/explore-issue-38412.rs:63:7 | LL | t.private(); | ^^^^^^^ private associated function diff --git a/src/test/ui/feature-gates/gated-bad-feature.rs b/src/test/ui/feature-gates/gated-bad-feature.rs index f8aa23d95e5..51f2db5556e 100644 --- a/src/test/ui/feature-gates/gated-bad-feature.rs +++ b/src/test/ui/feature-gates/gated-bad-feature.rs @@ -1,10 +1,10 @@ #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)] //~^ ERROR malformed `feature` //~| ERROR malformed `feature` - +//~| ERROR unknown feature `foo` +//~| ERROR unknown feature `foo_bar_baz` #![feature] //~ ERROR malformed `feature` attribute #![feature = "foo"] //~ ERROR malformed `feature` attribute - #![feature(test_removed_feature)] //~ ERROR: feature has been removed fn main() {} diff --git a/src/test/ui/feature-gates/gated-bad-feature.stderr b/src/test/ui/feature-gates/gated-bad-feature.stderr index 477bf5e866e..2d01bdf3c1d 100644 --- a/src/test/ui/feature-gates/gated-bad-feature.stderr +++ b/src/test/ui/feature-gates/gated-bad-feature.stderr @@ -17,18 +17,30 @@ LL | #![feature(test_removed_feature)] | ^^^^^^^^^^^^^^^^^^^^ feature has been removed error: malformed `feature` attribute input - --> $DIR/gated-bad-feature.rs:5:1 + --> $DIR/gated-bad-feature.rs:6:1 | LL | #![feature] | ^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name2, ...)]` error: malformed `feature` attribute input - --> $DIR/gated-bad-feature.rs:6:1 + --> $DIR/gated-bad-feature.rs:7:1 | LL | #![feature = "foo"] | ^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#![feature(name1, name2, ...)]` -error: aborting due to 5 previous errors +error[E0635]: unknown feature `foo_bar_baz` + --> $DIR/gated-bad-feature.rs:1:12 + | +LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)] + | ^^^^^^^^^^^ + +error[E0635]: unknown feature `foo` + --> $DIR/gated-bad-feature.rs:1:48 + | +LL | #![feature(foo_bar_baz, foo(bar), foo = "baz", foo)] + | ^^^ + +error: aborting due to 7 previous errors -Some errors have detailed explanations: E0556, E0557. +Some errors have detailed explanations: E0556, E0557, E0635. For more information about an error, try `rustc --explain E0556`. diff --git a/src/test/ui/generator/dropck.rs b/src/test/ui/generator/dropck.rs index da00b230d9f..f82111a76b1 100644 --- a/src/test/ui/generator/dropck.rs +++ b/src/test/ui/generator/dropck.rs @@ -1,4 +1,4 @@ -#![feature(generators, generator_trait, box_leak)] +#![feature(generators, generator_trait)] use std::cell::RefCell; use std::ops::Generator; diff --git a/src/test/ui/impl-trait/issues/universal-issue-48703.rs b/src/test/ui/impl-trait/issues/universal-issue-48703.rs index f661c62c9e4..d1e5aa6c6b9 100644 --- a/src/test/ui/impl-trait/issues/universal-issue-48703.rs +++ b/src/test/ui/impl-trait/issues/universal-issue-48703.rs @@ -1,5 +1,3 @@ -#![feature(universal_impl_trait)] - use std::fmt::Debug; fn foo<T>(x: impl Debug) { } diff --git a/src/test/ui/impl-trait/issues/universal-issue-48703.stderr b/src/test/ui/impl-trait/issues/universal-issue-48703.stderr index 90c252537ef..02c7fe8ff2c 100644 --- a/src/test/ui/impl-trait/issues/universal-issue-48703.stderr +++ b/src/test/ui/impl-trait/issues/universal-issue-48703.stderr @@ -1,5 +1,5 @@ error[E0632]: cannot provide explicit generic arguments when `impl Trait` is used in argument position - --> $DIR/universal-issue-48703.rs:8:11 + --> $DIR/universal-issue-48703.rs:6:11 | LL | foo::<String>('a'); | ^^^^^^ explicit generic argument not allowed diff --git a/src/test/ui/inference/question-mark-type-infer.rs b/src/test/ui/inference/question-mark-type-infer.rs index 2ef8618192f..64333a29313 100644 --- a/src/test/ui/inference/question-mark-type-infer.rs +++ b/src/test/ui/inference/question-mark-type-infer.rs @@ -1,5 +1,3 @@ -#![feature(question_mark, question_mark_carrier)] - // Test that type inference fails where there are multiple possible return types // for the `?` operator. diff --git a/src/test/ui/inference/question-mark-type-infer.stderr b/src/test/ui/inference/question-mark-type-infer.stderr index 86c533d7a59..e7d5fee1812 100644 --- a/src/test/ui/inference/question-mark-type-infer.stderr +++ b/src/test/ui/inference/question-mark-type-infer.stderr @@ -1,5 +1,5 @@ error[E0284]: type annotations needed - --> $DIR/question-mark-type-infer.rs:12:21 + --> $DIR/question-mark-type-infer.rs:10:21 | LL | l.iter().map(f).collect()? | ^^^^^^^ cannot infer type diff --git a/src/test/ui/issues/issue-16538.mir.stderr b/src/test/ui/issues/issue-16538.mir.stderr index 60a2bf1e2d6..7dab7de7619 100644 --- a/src/test/ui/issues/issue-16538.mir.stderr +++ b/src/test/ui/issues/issue-16538.mir.stderr @@ -1,5 +1,5 @@ error[E0015]: cannot call non-const fn `Y::foo` in statics - --> $DIR/issue-16538.rs:15:23 + --> $DIR/issue-16538.rs:14:23 | LL | static foo: &Y::X = &*Y::foo(Y::x as *const Y::X); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | static foo: &Y::X = &*Y::foo(Y::x as *const Y::X); = note: calls in statics are limited to constant functions, tuple structs and tuple variants error[E0133]: use of extern static is unsafe and requires unsafe function or block - --> $DIR/issue-16538.rs:15:30 + --> $DIR/issue-16538.rs:14:30 | LL | static foo: &Y::X = &*Y::foo(Y::x as *const Y::X); | ^^^^ use of extern static @@ -15,7 +15,7 @@ LL | static foo: &Y::X = &*Y::foo(Y::x as *const Y::X); = note: extern statics are not controlled by the Rust type system: invalid data, aliasing violations or data races will cause undefined behavior error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block - --> $DIR/issue-16538.rs:15:21 + --> $DIR/issue-16538.rs:14:21 | LL | static foo: &Y::X = &*Y::foo(Y::x as *const Y::X); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dereference of raw pointer diff --git a/src/test/ui/issues/issue-16538.rs b/src/test/ui/issues/issue-16538.rs index b6891deb937..270fa301414 100644 --- a/src/test/ui/issues/issue-16538.rs +++ b/src/test/ui/issues/issue-16538.rs @@ -1,7 +1,6 @@ // revisions: mir thir // [thir]compile-flags: -Z thir-unsafeck -#![feature(const_raw_ptr_deref)] mod Y { pub type X = usize; extern "C" { diff --git a/src/test/ui/issues/issue-16538.thir.stderr b/src/test/ui/issues/issue-16538.thir.stderr index 2ba9dfa2bc5..a18b0197d87 100644 --- a/src/test/ui/issues/issue-16538.thir.stderr +++ b/src/test/ui/issues/issue-16538.thir.stderr @@ -1,5 +1,5 @@ error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block - --> $DIR/issue-16538.rs:15:22 + --> $DIR/issue-16538.rs:14:22 | LL | static foo: &Y::X = &*Y::foo(Y::x as *const Y::X); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ dereference of raw pointer @@ -7,7 +7,7 @@ LL | static foo: &Y::X = &*Y::foo(Y::x as *const Y::X); = note: raw pointers may be null, dangling or unaligned; they can violate aliasing rules and cause data races: all of these are undefined behavior error[E0133]: use of extern static is unsafe and requires unsafe function or block - --> $DIR/issue-16538.rs:15:30 + --> $DIR/issue-16538.rs:14:30 | LL | static foo: &Y::X = &*Y::foo(Y::x as *const Y::X); | ^^^^ use of extern static @@ -15,7 +15,7 @@ LL | static foo: &Y::X = &*Y::foo(Y::x as *const Y::X); = note: extern statics are not controlled by the Rust type system: invalid data, aliasing violations or data races will cause undefined behavior error[E0015]: cannot call non-const fn `Y::foo` in statics - --> $DIR/issue-16538.rs:15:23 + --> $DIR/issue-16538.rs:14:23 | LL | static foo: &Y::X = &*Y::foo(Y::x as *const Y::X); | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-27078.rs b/src/test/ui/issues/issue-27078.rs index ae6ec62be38..5f09b9587b1 100644 --- a/src/test/ui/issues/issue-27078.rs +++ b/src/test/ui/issues/issue-27078.rs @@ -1,5 +1,3 @@ -#![feature(associated_consts)] - trait Foo { const BAR: i32; fn foo(self) -> &'static i32 { diff --git a/src/test/ui/issues/issue-27078.stderr b/src/test/ui/issues/issue-27078.stderr index 98cec1bfe9d..ced92bbd484 100644 --- a/src/test/ui/issues/issue-27078.stderr +++ b/src/test/ui/issues/issue-27078.stderr @@ -1,5 +1,5 @@ error[E0277]: the size for values of type `Self` cannot be known at compilation time - --> $DIR/issue-27078.rs:5:12 + --> $DIR/issue-27078.rs:3:12 | LL | fn foo(self) -> &'static i32 { | ^^^^ doesn't have a size known at compile-time diff --git a/src/test/ui/issues/issue-39211.rs b/src/test/ui/issues/issue-39211.rs index c7b6f1d58f3..6f3834d51a1 100644 --- a/src/test/ui/issues/issue-39211.rs +++ b/src/test/ui/issues/issue-39211.rs @@ -1,5 +1,3 @@ -#![feature(associated_consts)] - trait VecN { const DIM: usize; } diff --git a/src/test/ui/issues/issue-39211.stderr b/src/test/ui/issues/issue-39211.stderr index c555983ea68..cd2a014bb68 100644 --- a/src/test/ui/issues/issue-39211.stderr +++ b/src/test/ui/issues/issue-39211.stderr @@ -1,5 +1,5 @@ error: constant expression depends on a generic parameter - --> $DIR/issue-39211.rs:11:17 + --> $DIR/issue-39211.rs:9:17 | LL | let a = [3; M::Row::DIM]; | ^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-46101.rs b/src/test/ui/issues/issue-46101.rs index 7c8bf299db5..ab3d30d401f 100644 --- a/src/test/ui/issues/issue-46101.rs +++ b/src/test/ui/issues/issue-46101.rs @@ -1,4 +1,3 @@ -#![feature(use_extern_macros)] trait Foo {} #[derive(Foo::Anything)] //~ ERROR failed to resolve: partially resolved path in a derive macro //~| ERROR failed to resolve: partially resolved path in a derive macro diff --git a/src/test/ui/issues/issue-46101.stderr b/src/test/ui/issues/issue-46101.stderr index 2ffa15264b6..40295b8a115 100644 --- a/src/test/ui/issues/issue-46101.stderr +++ b/src/test/ui/issues/issue-46101.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve: partially resolved path in a derive macro - --> $DIR/issue-46101.rs:3:10 + --> $DIR/issue-46101.rs:2:10 | LL | #[derive(Foo::Anything)] | ^^^^^^^^^^^^^ partially resolved path in a derive macro error[E0433]: failed to resolve: partially resolved path in a derive macro - --> $DIR/issue-46101.rs:3:10 + --> $DIR/issue-46101.rs:2:10 | LL | #[derive(Foo::Anything)] | ^^^^^^^^^^^^^ partially resolved path in a derive macro diff --git a/src/test/ui/issues/issue-6596-2.rs b/src/test/ui/issues/issue-6596-2.rs index 8f7c98d9a67..8401c4a9d6c 100644 --- a/src/test/ui/issues/issue-6596-2.rs +++ b/src/test/ui/issues/issue-6596-2.rs @@ -1,5 +1,3 @@ -#![feature(macro_rules)] - macro_rules! g { ($inp:ident) => ( { $inp $nonexistent } diff --git a/src/test/ui/issues/issue-6596-2.stderr b/src/test/ui/issues/issue-6596-2.stderr index 3fe3d4d9d67..4fa73a464fb 100644 --- a/src/test/ui/issues/issue-6596-2.stderr +++ b/src/test/ui/issues/issue-6596-2.stderr @@ -1,5 +1,5 @@ error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `$` - --> $DIR/issue-6596-2.rs:5:16 + --> $DIR/issue-6596-2.rs:3:16 | LL | { $inp $nonexistent } | ^^^^^^^^^^^^ expected one of 8 possible tokens diff --git a/src/test/ui/issues/issue-75777.rs b/src/test/ui/issues/issue-75777.rs index 291a3db0936..357c07c7cec 100644 --- a/src/test/ui/issues/issue-75777.rs +++ b/src/test/ui/issues/issue-75777.rs @@ -1,8 +1,6 @@ // Regression test for #75777. // Checks that a boxed future can be properly constructed. -#![feature(future_readiness_fns)] - use std::future::{self, Future}; use std::pin::Pin; diff --git a/src/test/ui/issues/issue-75777.stderr b/src/test/ui/issues/issue-75777.stderr index bf271ab78f7..f440d7d1932 100644 --- a/src/test/ui/issues/issue-75777.stderr +++ b/src/test/ui/issues/issue-75777.stderr @@ -1,16 +1,16 @@ error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements - --> $DIR/issue-75777.rs:13:14 + --> $DIR/issue-75777.rs:11:14 | LL | Box::new(move |_| fut) | ^^^^^^^^^^^^ | note: first, the lifetime cannot outlive the lifetime `'a` as defined here... - --> $DIR/issue-75777.rs:11:11 + --> $DIR/issue-75777.rs:9:11 | LL | fn inject<'a, Env: 'a, A: 'a + Send>(v: A) -> Box<dyn FnOnce(&'a Env) -> BoxFuture<'a, A>> { | ^^ note: ...so that the types are compatible - --> $DIR/issue-75777.rs:13:14 + --> $DIR/issue-75777.rs:11:14 | LL | Box::new(move |_| fut) | ^^^^^^^^^^^^ @@ -18,7 +18,7 @@ LL | Box::new(move |_| fut) found `(Pin<Box<(dyn Future<Output = A> + Send + 'a)>>,)` = note: but, the lifetime must be valid for the static lifetime... note: ...so that the types are compatible - --> $DIR/issue-75777.rs:13:5 + --> $DIR/issue-75777.rs:11:5 | LL | Box::new(move |_| fut) | ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/issues/issue-78957.rs b/src/test/ui/issues/issue-78957.rs index 263c69bbc0b..567c59fd560 100644 --- a/src/test/ui/issues/issue-78957.rs +++ b/src/test/ui/issues/issue-78957.rs @@ -1,5 +1,4 @@ #![deny(unused_attributes)] -#![feature(min_const_generics)] use std::marker::PhantomData; diff --git a/src/test/ui/issues/issue-78957.stderr b/src/test/ui/issues/issue-78957.stderr index 26437ee4bef..703d272dc98 100644 --- a/src/test/ui/issues/issue-78957.stderr +++ b/src/test/ui/issues/issue-78957.stderr @@ -1,11 +1,11 @@ error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-78957.rs:6:16 + --> $DIR/issue-78957.rs:5:16 | LL | pub struct Foo<#[inline] const N: usize>; | ^^^^^^^^^ - not a function or closure error: attribute should be applied to a function - --> $DIR/issue-78957.rs:8:16 + --> $DIR/issue-78957.rs:7:16 | LL | pub struct Bar<#[cold] const N: usize>; | ^^^^^^^ - not a function @@ -18,19 +18,19 @@ LL | #![deny(unused_attributes)] = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! error[E0517]: attribute should be applied to a struct, enum, or union - --> $DIR/issue-78957.rs:11:23 + --> $DIR/issue-78957.rs:10:23 | LL | pub struct Baz<#[repr(C)] const N: usize>; | ^ - not a struct, enum, or union error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-78957.rs:14:17 + --> $DIR/issue-78957.rs:13:17 | LL | pub struct Foo2<#[inline] 'a>(PhantomData<&'a ()>); | ^^^^^^^^^ -- not a function or closure error: attribute should be applied to a function - --> $DIR/issue-78957.rs:16:17 + --> $DIR/issue-78957.rs:15:17 | LL | pub struct Bar2<#[cold] 'a>(PhantomData<&'a ()>); | ^^^^^^^ -- not a function @@ -38,19 +38,19 @@ LL | pub struct Bar2<#[cold] 'a>(PhantomData<&'a ()>); = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! error[E0517]: attribute should be applied to a struct, enum, or union - --> $DIR/issue-78957.rs:19:24 + --> $DIR/issue-78957.rs:18:24 | LL | pub struct Baz2<#[repr(C)] 'a>(PhantomData<&'a ()>); | ^ -- not a struct, enum, or union error[E0518]: attribute should be applied to function or closure - --> $DIR/issue-78957.rs:22:17 + --> $DIR/issue-78957.rs:21:17 | LL | pub struct Foo3<#[inline] T>(PhantomData<T>); | ^^^^^^^^^ - not a function or closure error: attribute should be applied to a function - --> $DIR/issue-78957.rs:24:17 + --> $DIR/issue-78957.rs:23:17 | LL | pub struct Bar3<#[cold] T>(PhantomData<T>); | ^^^^^^^ - not a function @@ -58,7 +58,7 @@ LL | pub struct Bar3<#[cold] T>(PhantomData<T>); = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! error[E0517]: attribute should be applied to a struct, enum, or union - --> $DIR/issue-78957.rs:27:24 + --> $DIR/issue-78957.rs:26:24 | LL | pub struct Baz3<#[repr(C)] T>(PhantomData<T>); | ^ - not a struct, enum, or union diff --git a/src/test/ui/macros/macro-non-lifetime.rs b/src/test/ui/macros/macro-non-lifetime.rs index c74aaf42bf2..26e1f2afa91 100644 --- a/src/test/ui/macros/macro-non-lifetime.rs +++ b/src/test/ui/macros/macro-non-lifetime.rs @@ -1,7 +1,5 @@ // Test for issue #50381: non-lifetime passed to :lifetime. -#![feature(macro_lifetime_matcher)] - macro_rules! m { ($x:lifetime) => { } } fn main() { diff --git a/src/test/ui/macros/macro-non-lifetime.stderr b/src/test/ui/macros/macro-non-lifetime.stderr index 2cf1a792f9f..6234735dfc8 100644 --- a/src/test/ui/macros/macro-non-lifetime.stderr +++ b/src/test/ui/macros/macro-non-lifetime.stderr @@ -1,5 +1,5 @@ error: no rules expected the token `a` - --> $DIR/macro-non-lifetime.rs:8:8 + --> $DIR/macro-non-lifetime.rs:6:8 | LL | macro_rules! m { ($x:lifetime) => { } } | -------------- when calling this macro diff --git a/src/test/ui/macros/macro-path-prelude-fail-1.rs b/src/test/ui/macros/macro-path-prelude-fail-1.rs index cd695ca916e..d93792bdfe3 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-1.rs +++ b/src/test/ui/macros/macro-path-prelude-fail-1.rs @@ -1,5 +1,3 @@ -#![feature(extern_prelude)] - mod m { fn check() { Vec::clone!(); //~ ERROR failed to resolve: `Vec` is a struct, not a module diff --git a/src/test/ui/macros/macro-path-prelude-fail-1.stderr b/src/test/ui/macros/macro-path-prelude-fail-1.stderr index b68e89f07f6..f8377ffb355 100644 --- a/src/test/ui/macros/macro-path-prelude-fail-1.stderr +++ b/src/test/ui/macros/macro-path-prelude-fail-1.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve: `Vec` is a struct, not a module - --> $DIR/macro-path-prelude-fail-1.rs:5:9 + --> $DIR/macro-path-prelude-fail-1.rs:3:9 | LL | Vec::clone!(); | ^^^ `Vec` is a struct, not a module error[E0433]: failed to resolve: `u8` is a builtin type, not a module - --> $DIR/macro-path-prelude-fail-1.rs:6:9 + --> $DIR/macro-path-prelude-fail-1.rs:4:9 | LL | u8::clone!(); | ^^ `u8` is a builtin type, not a module diff --git a/src/test/ui/macros/macro-path-prelude-shadowing.rs b/src/test/ui/macros/macro-path-prelude-shadowing.rs index 600b55c64d4..d7181200085 100644 --- a/src/test/ui/macros/macro-path-prelude-shadowing.rs +++ b/src/test/ui/macros/macro-path-prelude-shadowing.rs @@ -1,6 +1,6 @@ // aux-build:macro-in-other-crate.rs -#![feature(decl_macro, extern_prelude)] +#![feature(decl_macro)] macro_rules! add_macro_expanded_things_to_macro_prelude {() => { #[macro_use] diff --git a/src/test/ui/macros/macro-stability.rs b/src/test/ui/macros/macro-stability.rs index e2eff7c1c2d..019f6a874ca 100644 --- a/src/test/ui/macros/macro-stability.rs +++ b/src/test/ui/macros/macro-stability.rs @@ -2,7 +2,10 @@ #![feature(decl_macro)] #![feature(staged_api)] -#[macro_use] extern crate unstable_macros; +#![stable(feature = "rust1", since = "1.0.0")] + +#[macro_use] +extern crate unstable_macros; #[unstable(feature = "local_unstable", issue = "none")] macro_rules! local_unstable { () => () } diff --git a/src/test/ui/macros/macro-stability.stderr b/src/test/ui/macros/macro-stability.stderr index 34b62b4b1c3..75da9f47a35 100644 --- a/src/test/ui/macros/macro-stability.stderr +++ b/src/test/ui/macros/macro-stability.stderr @@ -1,5 +1,5 @@ error[E0658]: use of unstable library feature 'local_unstable' - --> $DIR/macro-stability.rs:19:5 + --> $DIR/macro-stability.rs:22:5 | LL | local_unstable!(); | ^^^^^^^^^^^^^^ @@ -7,7 +7,7 @@ LL | local_unstable!(); = help: add `#![feature(local_unstable)]` to the crate attributes to enable error[E0658]: use of unstable library feature 'local_unstable' - --> $DIR/macro-stability.rs:20:5 + --> $DIR/macro-stability.rs:23:5 | LL | local_unstable_modern!(); | ^^^^^^^^^^^^^^^^^^^^^ @@ -15,7 +15,7 @@ LL | local_unstable_modern!(); = help: add `#![feature(local_unstable)]` to the crate attributes to enable error[E0658]: use of unstable library feature 'unstable_macros' - --> $DIR/macro-stability.rs:21:5 + --> $DIR/macro-stability.rs:24:5 | LL | unstable_macro!(); | ^^^^^^^^^^^^^^ @@ -23,7 +23,7 @@ LL | unstable_macro!(); = help: add `#![feature(unstable_macros)]` to the crate attributes to enable warning: use of deprecated macro `deprecated_macro`: deprecation reason - --> $DIR/macro-stability.rs:24:5 + --> $DIR/macro-stability.rs:27:5 | LL | deprecated_macro!(); | ^^^^^^^^^^^^^^^^ @@ -31,7 +31,7 @@ LL | deprecated_macro!(); = note: `#[warn(deprecated)]` on by default warning: use of deprecated macro `local_deprecated`: local deprecation reason - --> $DIR/macro-stability.rs:26:5 + --> $DIR/macro-stability.rs:29:5 | LL | local_deprecated!(); | ^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/missing/missing-alloc_error_handler.rs b/src/test/ui/missing/missing-alloc_error_handler.rs index ae0c067bb5f..4d378f010ed 100644 --- a/src/test/ui/missing/missing-alloc_error_handler.rs +++ b/src/test/ui/missing/missing-alloc_error_handler.rs @@ -3,7 +3,7 @@ #![no_std] #![crate_type = "staticlib"] -#![feature(panic_handler, alloc_error_handler)] +#![feature(alloc_error_handler)] #[panic_handler] fn panic(_: &core::panic::PanicInfo) -> ! { diff --git a/src/test/ui/missing/missing-allocator.rs b/src/test/ui/missing/missing-allocator.rs index 6d867e2e8b4..2dc509f2c63 100644 --- a/src/test/ui/missing/missing-allocator.rs +++ b/src/test/ui/missing/missing-allocator.rs @@ -3,7 +3,7 @@ #![no_std] #![crate_type = "staticlib"] -#![feature(panic_handler, alloc_error_handler)] +#![feature(alloc_error_handler)] #[panic_handler] fn panic(_: &core::panic::PanicInfo) -> ! { diff --git a/src/test/ui/not-panic/not-panic-safe.rs b/src/test/ui/not-panic/not-panic-safe.rs index 93a8506ab18..4165c5dc13a 100644 --- a/src/test/ui/not-panic/not-panic-safe.rs +++ b/src/test/ui/not-panic/not-panic-safe.rs @@ -1,5 +1,4 @@ #![allow(dead_code)] -#![feature(recover)] use std::panic::UnwindSafe; diff --git a/src/test/ui/not-panic/not-panic-safe.stderr b/src/test/ui/not-panic/not-panic-safe.stderr index b95cd9173e3..3e54df12376 100644 --- a/src/test/ui/not-panic/not-panic-safe.stderr +++ b/src/test/ui/not-panic/not-panic-safe.stderr @@ -1,5 +1,5 @@ error[E0277]: the type `&mut i32` may not be safely transferred across an unwind boundary - --> $DIR/not-panic-safe.rs:9:5 + --> $DIR/not-panic-safe.rs:8:5 | LL | assert::<&mut i32>(); | ^^^^^^^^^^^^^^^^^^ `&mut i32` may not be safely transferred across an unwind boundary @@ -7,7 +7,7 @@ LL | assert::<&mut i32>(); = help: the trait `UnwindSafe` is not implemented for `&mut i32` = note: `UnwindSafe` is implemented for `&i32`, but not for `&mut i32` note: required by a bound in `assert` - --> $DIR/not-panic-safe.rs:6:14 + --> $DIR/not-panic-safe.rs:5:14 | LL | fn assert<T: UnwindSafe + ?Sized>() {} | ^^^^^^^^^^ required by this bound in `assert` diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs index ae2878539cf..dc0b86903c9 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.rs @@ -2,7 +2,6 @@ // through the `MyBox` struct. #![allow(dead_code)] -#![feature(rustc_error)] trait Test { fn foo(&self) { } diff --git a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr index 07c321ed8c3..1649841c186 100644 --- a/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr +++ b/src/test/ui/object-lifetime/object-lifetime-default-from-rptr-struct-error.stderr @@ -1,5 +1,5 @@ error[E0308]: mismatched types - --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:21:12 + --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:20:12 | LL | ss.t = t; | ^ lifetime mismatch @@ -7,7 +7,7 @@ LL | ss.t = t; = note: expected reference `&'a MyBox<(dyn Test + 'static)>` found reference `&'a MyBox<(dyn Test + 'a)>` note: the lifetime `'a` as defined here... - --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:20:6 + --> $DIR/object-lifetime-default-from-rptr-struct-error.rs:19:6 | LL | fn c<'a>(t: &'a MyBox<dyn Test+'a>, mut ss: SomeStruct<'a>) { | ^^ diff --git a/src/test/ui/once-cant-call-twice-on-heap.rs b/src/test/ui/once-cant-call-twice-on-heap.rs index 9aefe1e5a21..3fd8c5cadca 100644 --- a/src/test/ui/once-cant-call-twice-on-heap.rs +++ b/src/test/ui/once-cant-call-twice-on-heap.rs @@ -1,7 +1,6 @@ // Testing guarantees provided by once functions. // This program would segfault if it were legal. -#![feature(once_fns)] use std::sync::Arc; fn foo<F:FnOnce()>(blk: F) { diff --git a/src/test/ui/once-cant-call-twice-on-heap.stderr b/src/test/ui/once-cant-call-twice-on-heap.stderr index dde75724ed7..335ac633822 100644 --- a/src/test/ui/once-cant-call-twice-on-heap.stderr +++ b/src/test/ui/once-cant-call-twice-on-heap.stderr @@ -1,5 +1,5 @@ error[E0382]: use of moved value: `blk` - --> $DIR/once-cant-call-twice-on-heap.rs:9:5 + --> $DIR/once-cant-call-twice-on-heap.rs:8:5 | LL | fn foo<F:FnOnce()>(blk: F) { | --- move occurs because `blk` has type `F`, which does not implement the `Copy` trait @@ -9,7 +9,7 @@ LL | blk(); | ^^^ value used here after move | note: this value implements `FnOnce`, which causes it to be moved when called - --> $DIR/once-cant-call-twice-on-heap.rs:8:5 + --> $DIR/once-cant-call-twice-on-heap.rs:7:5 | LL | blk(); | ^^^ diff --git a/src/test/ui/or-patterns/nested-undelimited-precedence.rs b/src/test/ui/or-patterns/nested-undelimited-precedence.rs index 208662b1c42..04783620357 100644 --- a/src/test/ui/or-patterns/nested-undelimited-precedence.rs +++ b/src/test/ui/or-patterns/nested-undelimited-precedence.rs @@ -5,8 +5,6 @@ // types of patterns that allow undelimited subpatterns that could cause the same ambiguity. // Currently, those should be impossible due to precedence rule. This test enforces that. -#![feature(or_patterns)] - enum E { A, B, diff --git a/src/test/ui/or-patterns/nested-undelimited-precedence.stderr b/src/test/ui/or-patterns/nested-undelimited-precedence.stderr index 1d78d5193cb..2e25d8b3e7b 100644 --- a/src/test/ui/or-patterns/nested-undelimited-precedence.stderr +++ b/src/test/ui/or-patterns/nested-undelimited-precedence.stderr @@ -1,35 +1,35 @@ error: top-level or-patterns are not allowed in `let` bindings - --> $DIR/nested-undelimited-precedence.rs:21:9 + --> $DIR/nested-undelimited-precedence.rs:19:9 | LL | let b @ A | B: E = A; | ^^^^^^^^^ help: wrap the pattern in parentheses: `(b @ A | B)` error: top-level or-patterns are not allowed in `let` bindings - --> $DIR/nested-undelimited-precedence.rs:36:9 + --> $DIR/nested-undelimited-precedence.rs:34:9 | LL | let &A(_) | B(_): F = A(3); | ^^^^^^^^^^^^ help: wrap the pattern in parentheses: `(&A(_) | B(_))` error: top-level or-patterns are not allowed in `let` bindings - --> $DIR/nested-undelimited-precedence.rs:38:9 + --> $DIR/nested-undelimited-precedence.rs:36:9 | LL | let &&A(_) | B(_): F = A(3); | ^^^^^^^^^^^^^ help: wrap the pattern in parentheses: `(&&A(_) | B(_))` error: top-level or-patterns are not allowed in `let` bindings - --> $DIR/nested-undelimited-precedence.rs:40:9 + --> $DIR/nested-undelimited-precedence.rs:38:9 | LL | let &mut A(_) | B(_): F = A(3); | ^^^^^^^^^^^^^^^^ help: wrap the pattern in parentheses: `(&mut A(_) | B(_))` error: top-level or-patterns are not allowed in `let` bindings - --> $DIR/nested-undelimited-precedence.rs:42:9 + --> $DIR/nested-undelimited-precedence.rs:40:9 | LL | let &&mut A(_) | B(_): F = A(3); | ^^^^^^^^^^^^^^^^^ help: wrap the pattern in parentheses: `(&&mut A(_) | B(_))` error[E0408]: variable `b` is not bound in all patterns - --> $DIR/nested-undelimited-precedence.rs:21:17 + --> $DIR/nested-undelimited-precedence.rs:19:17 | LL | let b @ A | B: E = A; | - ^ pattern doesn't bind `b` @@ -37,7 +37,7 @@ LL | let b @ A | B: E = A; | variable not in all patterns error[E0308]: mismatched types - --> $DIR/nested-undelimited-precedence.rs:36:9 + --> $DIR/nested-undelimited-precedence.rs:34:9 | LL | let &A(_) | B(_): F = A(3); | ^^^^^ - expected due to this @@ -48,7 +48,7 @@ LL | let &A(_) | B(_): F = A(3); found reference `&_` error[E0308]: mismatched types - --> $DIR/nested-undelimited-precedence.rs:38:9 + --> $DIR/nested-undelimited-precedence.rs:36:9 | LL | let &&A(_) | B(_): F = A(3); | ^^^^^^ - expected due to this @@ -59,7 +59,7 @@ LL | let &&A(_) | B(_): F = A(3); found reference `&_` error[E0308]: mismatched types - --> $DIR/nested-undelimited-precedence.rs:40:9 + --> $DIR/nested-undelimited-precedence.rs:38:9 | LL | let &mut A(_) | B(_): F = A(3); | ^^^^^^^^^ - expected due to this @@ -70,7 +70,7 @@ LL | let &mut A(_) | B(_): F = A(3); found mutable reference `&mut _` error[E0308]: mismatched types - --> $DIR/nested-undelimited-precedence.rs:42:9 + --> $DIR/nested-undelimited-precedence.rs:40:9 | LL | let &&mut A(_) | B(_): F = A(3); | ^^^^^^^^^^ - expected due to this diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.rs b/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.rs index 9c3c5dd360e..a624cbc899f 100644 --- a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.rs +++ b/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.rs @@ -2,8 +2,6 @@ // edition:2018 -#![feature(or_patterns)] - fn main() {} // Test the `pat` macro fragment parser: diff --git a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr b/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr index 7dbc3087663..001c68a9774 100644 --- a/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr +++ b/src/test/ui/or-patterns/or-patterns-syntactic-fail-2018.stderr @@ -1,5 +1,5 @@ error: no rules expected the token `|` - --> $DIR/or-patterns-syntactic-fail-2018.rs:14:15 + --> $DIR/or-patterns-syntactic-fail-2018.rs:12:15 | LL | macro_rules! accept_pat { | ----------------------- when calling this macro @@ -8,7 +8,7 @@ LL | accept_pat!(p | q); | ^ no rules expected this token in macro call error: no rules expected the token `|` - --> $DIR/or-patterns-syntactic-fail-2018.rs:15:13 + --> $DIR/or-patterns-syntactic-fail-2018.rs:13:13 | LL | macro_rules! accept_pat { | ----------------------- when calling this macro diff --git a/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.rs b/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.rs index ef573db8210..0f5f49c4ca4 100644 --- a/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.rs +++ b/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.rs @@ -1,5 +1,4 @@ #![feature(exclusive_range_pattern)] -#![feature(assoc_char_consts)] #![allow(overlapping_range_endpoints)] #![deny(unreachable_patterns)] diff --git a/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.stderr b/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.stderr index b1440375494..2e0023348e4 100644 --- a/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.stderr +++ b/src/test/ui/pattern/usefulness/integer-ranges/exhaustiveness.stderr @@ -1,5 +1,5 @@ error[E0004]: non-exhaustive patterns: `u8::MAX` not covered - --> $DIR/exhaustiveness.rs:48:8 + --> $DIR/exhaustiveness.rs:47:8 | LL | m!(0u8, 0..255); | ^^^ pattern `u8::MAX` not covered @@ -8,7 +8,7 @@ LL | m!(0u8, 0..255); = note: the matched value is of type `u8` error[E0004]: non-exhaustive patterns: `u8::MAX` not covered - --> $DIR/exhaustiveness.rs:49:8 + --> $DIR/exhaustiveness.rs:48:8 | LL | m!(0u8, 0..=254); | ^^^ pattern `u8::MAX` not covered @@ -17,7 +17,7 @@ LL | m!(0u8, 0..=254); = note: the matched value is of type `u8` error[E0004]: non-exhaustive patterns: `0_u8` not covered - --> $DIR/exhaustiveness.rs:50:8 + --> $DIR/exhaustiveness.rs:49:8 | LL | m!(0u8, 1..=255); | ^^^ pattern `0_u8` not covered @@ -26,7 +26,7 @@ LL | m!(0u8, 1..=255); = note: the matched value is of type `u8` error[E0004]: non-exhaustive patterns: `42_u8` not covered - --> $DIR/exhaustiveness.rs:51:8 + --> $DIR/exhaustiveness.rs:50:8 | LL | m!(0u8, 0..42 | 43..=255); | ^^^ pattern `42_u8` not covered @@ -35,7 +35,7 @@ LL | m!(0u8, 0..42 | 43..=255); = note: the matched value is of type `u8` error[E0004]: non-exhaustive patterns: `i8::MAX` not covered - --> $DIR/exhaustiveness.rs:52:8 + --> $DIR/exhaustiveness.rs:51:8 | LL | m!(0i8, -128..127); | ^^^ pattern `i8::MAX` not covered @@ -44,7 +44,7 @@ LL | m!(0i8, -128..127); = note: the matched value is of type `i8` error[E0004]: non-exhaustive patterns: `i8::MAX` not covered - --> $DIR/exhaustiveness.rs:53:8 + --> $DIR/exhaustiveness.rs:52:8 | LL | m!(0i8, -128..=126); | ^^^ pattern `i8::MAX` not covered @@ -53,7 +53,7 @@ LL | m!(0i8, -128..=126); = note: the matched value is of type `i8` error[E0004]: non-exhaustive patterns: `i8::MIN` not covered - --> $DIR/exhaustiveness.rs:54:8 + --> $DIR/exhaustiveness.rs:53:8 | LL | m!(0i8, -127..=127); | ^^^ pattern `i8::MIN` not covered @@ -62,7 +62,7 @@ LL | m!(0i8, -127..=127); = note: the matched value is of type `i8` error[E0004]: non-exhaustive patterns: `0_i8` not covered - --> $DIR/exhaustiveness.rs:55:11 + --> $DIR/exhaustiveness.rs:54:11 | LL | match 0i8 { | ^^^ pattern `0_i8` not covered @@ -71,7 +71,7 @@ LL | match 0i8 { = note: the matched value is of type `i8` error[E0004]: non-exhaustive patterns: `u128::MAX` not covered - --> $DIR/exhaustiveness.rs:60:8 + --> $DIR/exhaustiveness.rs:59:8 | LL | m!(0u128, 0..=ALMOST_MAX); | ^^^^^ pattern `u128::MAX` not covered @@ -80,7 +80,7 @@ LL | m!(0u128, 0..=ALMOST_MAX); = note: the matched value is of type `u128` error[E0004]: non-exhaustive patterns: `5_u128..=u128::MAX` not covered - --> $DIR/exhaustiveness.rs:61:8 + --> $DIR/exhaustiveness.rs:60:8 | LL | m!(0u128, 0..=4); | ^^^^^ pattern `5_u128..=u128::MAX` not covered @@ -89,7 +89,7 @@ LL | m!(0u128, 0..=4); = note: the matched value is of type `u128` error[E0004]: non-exhaustive patterns: `0_u128` not covered - --> $DIR/exhaustiveness.rs:62:8 + --> $DIR/exhaustiveness.rs:61:8 | LL | m!(0u128, 1..=u128::MAX); | ^^^^^ pattern `0_u128` not covered @@ -98,7 +98,7 @@ LL | m!(0u128, 1..=u128::MAX); = note: the matched value is of type `u128` error[E0004]: non-exhaustive patterns: `(126_u8..=127_u8, false)` not covered - --> $DIR/exhaustiveness.rs:70:11 + --> $DIR/exhaustiveness.rs:69:11 | LL | match (0u8, true) { | ^^^^^^^^^^^ pattern `(126_u8..=127_u8, false)` not covered diff --git a/src/test/ui/pub/pub-restricted-error.rs b/src/test/ui/pub/pub-restricted-error.rs index 30a112d2271..60fce3f51b8 100644 --- a/src/test/ui/pub/pub-restricted-error.rs +++ b/src/test/ui/pub/pub-restricted-error.rs @@ -1,5 +1,3 @@ -#![feature(pub_restricted)] - struct Bar(pub(())); struct Foo { diff --git a/src/test/ui/pub/pub-restricted-error.stderr b/src/test/ui/pub/pub-restricted-error.stderr index d856833d04f..95bf498c7f7 100644 --- a/src/test/ui/pub/pub-restricted-error.stderr +++ b/src/test/ui/pub/pub-restricted-error.stderr @@ -1,5 +1,5 @@ error: expected identifier, found `(` - --> $DIR/pub-restricted-error.rs:6:16 + --> $DIR/pub-restricted-error.rs:4:16 | LL | pub(crate) () foo: usize, | ^ expected identifier diff --git a/src/test/ui/pub/pub-restricted.rs b/src/test/ui/pub/pub-restricted.rs index b4bc4a08c7b..bcd21082f75 100644 --- a/src/test/ui/pub/pub-restricted.rs +++ b/src/test/ui/pub/pub-restricted.rs @@ -1,5 +1,3 @@ -#![feature(pub_restricted)] - mod a {} pub (a) fn afn() {} //~ incorrect visibility restriction diff --git a/src/test/ui/pub/pub-restricted.stderr b/src/test/ui/pub/pub-restricted.stderr index 56ff104b4fe..4694530e548 100644 --- a/src/test/ui/pub/pub-restricted.stderr +++ b/src/test/ui/pub/pub-restricted.stderr @@ -1,5 +1,5 @@ error[E0704]: incorrect visibility restriction - --> $DIR/pub-restricted.rs:5:6 + --> $DIR/pub-restricted.rs:3:6 | LL | pub (a) fn afn() {} | ^ help: make this visible only to module `a` with `in`: `in a` @@ -10,7 +10,7 @@ LL | pub (a) fn afn() {} `pub(in path::to::module)`: visible only on the specified path error[E0704]: incorrect visibility restriction - --> $DIR/pub-restricted.rs:6:6 + --> $DIR/pub-restricted.rs:4:6 | LL | pub (b) fn bfn() {} | ^ help: make this visible only to module `b` with `in`: `in b` @@ -21,7 +21,7 @@ LL | pub (b) fn bfn() {} `pub(in path::to::module)`: visible only on the specified path error[E0704]: incorrect visibility restriction - --> $DIR/pub-restricted.rs:7:6 + --> $DIR/pub-restricted.rs:5:6 | LL | pub (crate::a) fn cfn() {} | ^^^^^^^^ help: make this visible only to module `crate::a` with `in`: `in crate::a` @@ -32,7 +32,7 @@ LL | pub (crate::a) fn cfn() {} `pub(in path::to::module)`: visible only on the specified path error[E0704]: incorrect visibility restriction - --> $DIR/pub-restricted.rs:24:14 + --> $DIR/pub-restricted.rs:22:14 | LL | pub (a) invalid: usize, | ^ help: make this visible only to module `a` with `in`: `in a` @@ -43,7 +43,7 @@ LL | pub (a) invalid: usize, `pub(in path::to::module)`: visible only on the specified path error[E0704]: incorrect visibility restriction - --> $DIR/pub-restricted.rs:33:6 + --> $DIR/pub-restricted.rs:31:6 | LL | pub (xyz) fn xyz() {} | ^^^ help: make this visible only to module `xyz` with `in`: `in xyz` @@ -54,7 +54,7 @@ LL | pub (xyz) fn xyz() {} `pub(in path::to::module)`: visible only on the specified path error[E0742]: visibilities can only be restricted to ancestor modules - --> $DIR/pub-restricted.rs:25:17 + --> $DIR/pub-restricted.rs:23:17 | LL | pub (in x) non_parent_invalid: usize, | ^ diff --git a/src/test/ui/repr/repr-transparent-other-reprs.rs b/src/test/ui/repr/repr-transparent-other-reprs.rs index e3671e7c493..0cd0edf32f2 100644 --- a/src/test/ui/repr/repr-transparent-other-reprs.rs +++ b/src/test/ui/repr/repr-transparent-other-reprs.rs @@ -1,5 +1,3 @@ -#![feature(repr_align)] - // See also repr-transparent.rs #[repr(transparent, C)] //~ ERROR cannot have other repr diff --git a/src/test/ui/repr/repr-transparent-other-reprs.stderr b/src/test/ui/repr/repr-transparent-other-reprs.stderr index 9b48bb3a43d..d92c358110c 100644 --- a/src/test/ui/repr/repr-transparent-other-reprs.stderr +++ b/src/test/ui/repr/repr-transparent-other-reprs.stderr @@ -1,23 +1,23 @@ error[E0692]: transparent struct cannot have other repr hints - --> $DIR/repr-transparent-other-reprs.rs:5:8 + --> $DIR/repr-transparent-other-reprs.rs:3:8 | LL | #[repr(transparent, C)] | ^^^^^^^^^^^ ^ error[E0692]: transparent struct cannot have other repr hints - --> $DIR/repr-transparent-other-reprs.rs:10:8 + --> $DIR/repr-transparent-other-reprs.rs:8:8 | LL | #[repr(transparent, packed)] | ^^^^^^^^^^^ ^^^^^^ error[E0692]: transparent struct cannot have other repr hints - --> $DIR/repr-transparent-other-reprs.rs:13:8 + --> $DIR/repr-transparent-other-reprs.rs:11:8 | LL | #[repr(transparent, align(2))] | ^^^^^^^^^^^ ^^^^^^^^ error[E0692]: transparent struct cannot have other repr hints - --> $DIR/repr-transparent-other-reprs.rs:16:8 + --> $DIR/repr-transparent-other-reprs.rs:14:8 | LL | #[repr(transparent)] | ^^^^^^^^^^^ diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs b/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs index e33d57d642b..419fb0a0e45 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.rs @@ -1,4 +1,3 @@ -#![feature(dyn_trait)] #![feature(rustc_attrs)] trait Trait<'x, T> where T: 'x { diff --git a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr b/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr index adb718ad794..4608962c7c3 100644 --- a/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/explicit-dyn.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/explicit-dyn.rs:8:1 + --> $DIR/explicit-dyn.rs:7:1 | LL | / struct Foo<'a, A> LL | | { diff --git a/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs b/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs index aa1be144ff8..c53d6c18ff6 100644 --- a/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs +++ b/src/test/ui/rfc-2093-infer-outlives/self-dyn.rs @@ -1,4 +1,3 @@ -#![feature(dyn_trait)] #![feature(rustc_attrs)] trait Trait<'x, 's, T> where T: 'x, diff --git a/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr b/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr index 77577fe0945..7836b3f5aab 100644 --- a/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr +++ b/src/test/ui/rfc-2093-infer-outlives/self-dyn.stderr @@ -1,5 +1,5 @@ error: rustc_outlives - --> $DIR/self-dyn.rs:9:1 + --> $DIR/self-dyn.rs:8:1 | LL | / struct Foo<'a, 'b, A> LL | | { diff --git a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs index 8f73d0120a0..79f6b0dfe34 100644 --- a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs +++ b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.rs @@ -1,5 +1,3 @@ -#![feature(crate_in_paths)] - struct S; pub mod m { diff --git a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr index e4c47901455..7e7ee3ce03d 100644 --- a/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr +++ b/src/test/ui/rfc-2126-crate-paths/crate-path-non-absolute.stderr @@ -1,11 +1,11 @@ error[E0433]: failed to resolve: `crate` in paths can only be used in start position - --> $DIR/crate-path-non-absolute.rs:7:22 + --> $DIR/crate-path-non-absolute.rs:5:22 | LL | let s = ::m::crate::S; | ^^^^^ `crate` in paths can only be used in start position error[E0433]: failed to resolve: global paths cannot start with `crate` - --> $DIR/crate-path-non-absolute.rs:8:20 + --> $DIR/crate-path-non-absolute.rs:6:20 | LL | let s1 = ::crate::S; | ^^^^^ global paths cannot start with `crate` diff --git a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs b/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs index d52ac7ec3c3..019ef8e9dad 100644 --- a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs +++ b/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.rs @@ -1,5 +1,3 @@ -#![feature(crate_in_paths)] - fn main() { let crate = 0; //~^ ERROR expected unit struct, unit variant or constant, found module `crate` diff --git a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr b/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr index acbb4cf1a69..c39a70f66a9 100644 --- a/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr +++ b/src/test/ui/rfc-2126-crate-paths/keyword-crate-as-identifier.stderr @@ -1,5 +1,5 @@ error[E0532]: expected unit struct, unit variant or constant, found module `crate` - --> $DIR/keyword-crate-as-identifier.rs:4:9 + --> $DIR/keyword-crate-as-identifier.rs:2:9 | LL | let crate = 0; | ^^^^^ not a unit struct, unit variant or constant diff --git a/src/test/ui/rfc-2632-const-trait-impl/stability.rs b/src/test/ui/rfc-2632-const-trait-impl/stability.rs index 6b54a9eab52..906956f5eba 100644 --- a/src/test/ui/rfc-2632-const-trait-impl/stability.rs +++ b/src/test/ui/rfc-2632-const-trait-impl/stability.rs @@ -2,7 +2,9 @@ #![feature(const_add)] #![feature(const_trait_impl)] #![feature(staged_api)] +#![stable(feature = "rust1", since = "1.0.0")] +#[stable(feature = "rust1", since = "1.0.0")] pub struct Int(i32); #[stable(feature = "rust1", since = "1.0.0")] @@ -16,6 +18,7 @@ impl const std::ops::Sub for Int { } } +#[stable(feature = "rust1", since = "1.0.0")] #[rustc_const_unstable(feature = "const_add", issue = "none")] impl const std::ops::Add for Int { type Output = Self; diff --git a/src/test/ui/rfc-2632-const-trait-impl/stability.stderr b/src/test/ui/rfc-2632-const-trait-impl/stability.stderr index 5649f688fe7..7473b801cce 100644 --- a/src/test/ui/rfc-2632-const-trait-impl/stability.stderr +++ b/src/test/ui/rfc-2632-const-trait-impl/stability.stderr @@ -1,5 +1,5 @@ error: trait methods cannot be stable const fn - --> $DIR/stability.rs:13:5 + --> $DIR/stability.rs:15:5 | LL | / fn sub(self, rhs: Self) -> Self { LL | | @@ -8,7 +8,7 @@ LL | | } | |_____^ error: `<Int as Add>::add` is not yet stable as a const fn - --> $DIR/stability.rs:31:5 + --> $DIR/stability.rs:34:5 | LL | Int(1i32) + Int(2i32) | ^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/rust-2018/uniform-paths/issue-56596.rs b/src/test/ui/rust-2018/uniform-paths/issue-56596.rs index 5c40d78d81c..ec5bb656ad4 100644 --- a/src/test/ui/rust-2018/uniform-paths/issue-56596.rs +++ b/src/test/ui/rust-2018/uniform-paths/issue-56596.rs @@ -2,8 +2,6 @@ // compile-flags: --extern issue_56596 // aux-build:issue-56596.rs -#![feature(uniform_paths)] - mod m { pub mod issue_56596 {} } diff --git a/src/test/ui/rust-2018/uniform-paths/issue-56596.stderr b/src/test/ui/rust-2018/uniform-paths/issue-56596.stderr index d2297385f33..8b8ab26dce2 100644 --- a/src/test/ui/rust-2018/uniform-paths/issue-56596.stderr +++ b/src/test/ui/rust-2018/uniform-paths/issue-56596.stderr @@ -1,5 +1,5 @@ error[E0659]: `issue_56596` is ambiguous - --> $DIR/issue-56596.rs:12:5 + --> $DIR/issue-56596.rs:10:5 | LL | use issue_56596; | ^^^^^^^^^^^ ambiguous name @@ -8,7 +8,7 @@ LL | use issue_56596; = note: `issue_56596` could refer to a crate passed with `--extern` = help: use `::issue_56596` to refer to this crate unambiguously note: `issue_56596` could also refer to the module imported here - --> $DIR/issue-56596.rs:11:5 + --> $DIR/issue-56596.rs:9:5 | LL | use m::*; | ^^^^ diff --git a/src/test/ui/span/issue-23827.rs b/src/test/ui/span/issue-23827.rs index 22b9dde8cbe..6b065bf6cbf 100644 --- a/src/test/ui/span/issue-23827.rs +++ b/src/test/ui/span/issue-23827.rs @@ -1,6 +1,6 @@ // Regression test for #23827 -#![feature(core, fn_traits, unboxed_closures)] +#![feature(fn_traits, unboxed_closures)] pub struct Prototype { pub target: u32 diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity.rs b/src/test/ui/stability-attribute/stability-attribute-sanity.rs index d7cb66d9c84..fe8079dbc37 100644 --- a/src/test/ui/stability-attribute/stability-attribute-sanity.rs +++ b/src/test/ui/stability-attribute/stability-attribute-sanity.rs @@ -65,6 +65,7 @@ fn multiple3() { } pub const fn multiple4() { } #[stable(feature = "a", since = "1.0.0")] //~ ERROR invalid deprecation version found +//~^ ERROR feature `a` is declared stable since 1.0.0 #[rustc_deprecated(since = "invalid", reason = "text")] fn invalid_deprecation_version() {} diff --git a/src/test/ui/stability-attribute/stability-attribute-sanity.stderr b/src/test/ui/stability-attribute/stability-attribute-sanity.stderr index 4dc68662033..b4e8fc78815 100644 --- a/src/test/ui/stability-attribute/stability-attribute-sanity.stderr +++ b/src/test/ui/stability-attribute/stability-attribute-sanity.stderr @@ -110,17 +110,23 @@ error: invalid deprecation version found | LL | #[stable(feature = "a", since = "1.0.0")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid deprecation version -LL | #[rustc_deprecated(since = "invalid", reason = "text")] +... LL | fn invalid_deprecation_version() {} | ----------------------------------- the stability attribute annotates this item error[E0549]: rustc_deprecated attribute must be paired with either stable or unstable attribute - --> $DIR/stability-attribute-sanity.rs:71:1 + --> $DIR/stability-attribute-sanity.rs:72:1 | LL | #[rustc_deprecated(since = "a", reason = "text")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -error: aborting due to 19 previous errors +error[E0711]: feature `a` is declared stable since 1.0.0, but was previously declared stable since b + --> $DIR/stability-attribute-sanity.rs:67:1 + | +LL | #[stable(feature = "a", since = "1.0.0")] + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to 20 previous errors Some errors have detailed explanations: E0539, E0541, E0542, E0543, E0544, E0546, E0547, E0549, E0550. For more information about an error, try `rustc --explain E0539`. diff --git a/src/test/ui/target-feature/invalid-attribute.rs b/src/test/ui/target-feature/invalid-attribute.rs index 5ea78215543..ad1b6e96be6 100644 --- a/src/test/ui/target-feature/invalid-attribute.rs +++ b/src/test/ui/target-feature/invalid-attribute.rs @@ -12,7 +12,6 @@ // ignore-sparc // ignore-sparc64 -#![feature(target_feature)] #![warn(unused_attributes)] #[target_feature = "+sse2"] diff --git a/src/test/ui/target-feature/invalid-attribute.stderr b/src/test/ui/target-feature/invalid-attribute.stderr index 8c8e24ccc55..25a2c1975e7 100644 --- a/src/test/ui/target-feature/invalid-attribute.stderr +++ b/src/test/ui/target-feature/invalid-attribute.stderr @@ -1,29 +1,29 @@ error: malformed `target_feature` attribute input - --> $DIR/invalid-attribute.rs:18:1 + --> $DIR/invalid-attribute.rs:17:1 | LL | #[target_feature = "+sse2"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: must be of the form: `#[target_feature(enable = "name")]` error: the feature named `foo` is not valid for this target - --> $DIR/invalid-attribute.rs:20:18 + --> $DIR/invalid-attribute.rs:19:18 | LL | #[target_feature(enable = "foo")] | ^^^^^^^^^^^^^^ `foo` is not valid for this target error: malformed `target_feature` attribute input - --> $DIR/invalid-attribute.rs:23:18 + --> $DIR/invalid-attribute.rs:22:18 | LL | #[target_feature(bar)] | ^^^ help: must be of the form: `enable = ".."` error: malformed `target_feature` attribute input - --> $DIR/invalid-attribute.rs:25:18 + --> $DIR/invalid-attribute.rs:24:18 | LL | #[target_feature(disable = "baz")] | ^^^^^^^^^^^^^^^ help: must be of the form: `enable = ".."` error[E0658]: `#[target_feature(..)]` can only be applied to `unsafe` functions - --> $DIR/invalid-attribute.rs:29:1 + --> $DIR/invalid-attribute.rs:28:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -35,7 +35,7 @@ LL | fn bar() {} = help: add `#![feature(target_feature_11)]` to the crate attributes to enable error: attribute should be applied to a function - --> $DIR/invalid-attribute.rs:35:1 + --> $DIR/invalid-attribute.rs:34:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -44,7 +44,7 @@ LL | mod another {} | -------------- not a function error: attribute should be applied to a function - --> $DIR/invalid-attribute.rs:40:1 + --> $DIR/invalid-attribute.rs:39:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -53,7 +53,7 @@ LL | const FOO: usize = 7; | --------------------- not a function error: attribute should be applied to a function - --> $DIR/invalid-attribute.rs:45:1 + --> $DIR/invalid-attribute.rs:44:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -62,7 +62,7 @@ LL | struct Foo; | ----------- not a function error: attribute should be applied to a function - --> $DIR/invalid-attribute.rs:50:1 + --> $DIR/invalid-attribute.rs:49:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -71,7 +71,7 @@ LL | enum Bar {} | ----------- not a function error: attribute should be applied to a function - --> $DIR/invalid-attribute.rs:55:1 + --> $DIR/invalid-attribute.rs:54:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -84,7 +84,7 @@ LL | | } | |_- not a function error: attribute should be applied to a function - --> $DIR/invalid-attribute.rs:63:1 + --> $DIR/invalid-attribute.rs:62:1 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -93,13 +93,13 @@ LL | trait Baz {} | ------------ not a function error: cannot use `#[inline(always)]` with `#[target_feature]` - --> $DIR/invalid-attribute.rs:68:1 + --> $DIR/invalid-attribute.rs:67:1 | LL | #[inline(always)] | ^^^^^^^^^^^^^^^^^ error: attribute should be applied to a function - --> $DIR/invalid-attribute.rs:86:5 + --> $DIR/invalid-attribute.rs:85:5 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -111,7 +111,7 @@ LL | | } | |_____- not a function error: attribute should be applied to a function - --> $DIR/invalid-attribute.rs:94:5 + --> $DIR/invalid-attribute.rs:93:5 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -120,7 +120,7 @@ LL | || {}; | ----- not a function error[E0658]: `#[target_feature(..)]` can only be applied to `unsafe` functions - --> $DIR/invalid-attribute.rs:78:5 + --> $DIR/invalid-attribute.rs:77:5 | LL | #[target_feature(enable = "sse2")] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/try-trait/try-on-option-diagnostics.rs b/src/test/ui/try-trait/try-on-option-diagnostics.rs index 63d17414c31..7ffa0de6c0f 100644 --- a/src/test/ui/try-trait/try-on-option-diagnostics.rs +++ b/src/test/ui/try-trait/try-on-option-diagnostics.rs @@ -1,5 +1,5 @@ -#![feature(try_trait)] // edition:2018 + fn main() {} fn a_function() -> u32 { diff --git a/src/test/ui/try-trait/try-on-option.rs b/src/test/ui/try-trait/try-on-option.rs index f2012936a11..8519932a634 100644 --- a/src/test/ui/try-trait/try-on-option.rs +++ b/src/test/ui/try-trait/try-on-option.rs @@ -1,5 +1,3 @@ -#![feature(try_trait)] - fn main() {} fn foo() -> Result<u32, ()> { diff --git a/src/test/ui/try-trait/try-on-option.stderr b/src/test/ui/try-trait/try-on-option.stderr index 27e33bc022e..24db9f52437 100644 --- a/src/test/ui/try-trait/try-on-option.stderr +++ b/src/test/ui/try-trait/try-on-option.stderr @@ -1,5 +1,5 @@ error[E0277]: the `?` operator can only be used on `Result`s, not `Option`s, in a function that returns `Result` - --> $DIR/try-on-option.rs:7:6 + --> $DIR/try-on-option.rs:5:6 | LL | / fn foo() -> Result<u32, ()> { LL | | let x: Option<u32> = None; @@ -12,7 +12,7 @@ LL | | } = help: the trait `FromResidual<Option<Infallible>>` is not implemented for `Result<u32, ()>` error[E0277]: the `?` operator can only be used in a function that returns `Result` or `Option` (or another type that implements `FromResidual`) - --> $DIR/try-on-option.rs:13:6 + --> $DIR/try-on-option.rs:11:6 | LL | / fn bar() -> u32 { LL | | let x: Option<u32> = None; diff --git a/src/test/ui/type-alias-impl-trait/issue-63355.rs b/src/test/ui/type-alias-impl-trait/issue-63355.rs index ff4fd5dcec7..9f617153e3f 100644 --- a/src/test/ui/type-alias-impl-trait/issue-63355.rs +++ b/src/test/ui/type-alias-impl-trait/issue-63355.rs @@ -1,5 +1,4 @@ #![feature(type_alias_impl_trait)] -#![feature(type_alias_impl_trait)] #![allow(incomplete_features)] pub trait Foo {} diff --git a/src/test/ui/type-alias-impl-trait/issue-63355.stderr b/src/test/ui/type-alias-impl-trait/issue-63355.stderr index 6fc6b4bfe1f..2dbd5a55a62 100644 --- a/src/test/ui/type-alias-impl-trait/issue-63355.stderr +++ b/src/test/ui/type-alias-impl-trait/issue-63355.stderr @@ -1,5 +1,5 @@ error[E0271]: type mismatch resolving `<() as Bar>::Foo == ()` - --> $DIR/issue-63355.rs:34:20 + --> $DIR/issue-63355.rs:33:20 | LL | pub type FooImpl = impl Foo; | -------- the found opaque type @@ -7,7 +7,7 @@ LL | pub type BarImpl = impl Bar<Foo = FooImpl>; | ^^^^^^^^^^^^^^^^^^^^^^^ type mismatch resolving `<() as Bar>::Foo == ()` | note: expected this to be `()` - --> $DIR/issue-63355.rs:24:16 + --> $DIR/issue-63355.rs:23:16 | LL | type Foo = FooImpl; | ^^^^^^^ diff --git a/src/test/ui/type-alias-impl-trait/issue-65384.rs b/src/test/ui/type-alias-impl-trait/issue-65384.rs index 273928c4d66..9a119c4d2e0 100644 --- a/src/test/ui/type-alias-impl-trait/issue-65384.rs +++ b/src/test/ui/type-alias-impl-trait/issue-65384.rs @@ -1,5 +1,4 @@ #![feature(type_alias_impl_trait)] -#![feature(type_alias_impl_trait)] #![allow(incomplete_features)] trait MyTrait {} diff --git a/src/test/ui/type-alias-impl-trait/issue-65384.stderr b/src/test/ui/type-alias-impl-trait/issue-65384.stderr index 01d037266ec..27680f0ad75 100644 --- a/src/test/ui/type-alias-impl-trait/issue-65384.stderr +++ b/src/test/ui/type-alias-impl-trait/issue-65384.stderr @@ -1,11 +1,11 @@ error: cannot implement trait on type alias impl trait - --> $DIR/issue-65384.rs:11:1 + --> $DIR/issue-65384.rs:10:1 | LL | impl MyTrait for Bar {} | ^^^^^^^^^^^^^^^^^^^^ | note: type alias impl trait defined here - --> $DIR/issue-65384.rs:9:12 + --> $DIR/issue-65384.rs:8:12 | LL | type Bar = impl MyTrait; | ^^^^^^^^^^^^ diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self.rs b/src/test/ui/type/type-parameter-defaults-referencing-Self.rs index a4c59dced02..e5c81556e26 100644 --- a/src/test/ui/type/type-parameter-defaults-referencing-Self.rs +++ b/src/test/ui/type/type-parameter-defaults-referencing-Self.rs @@ -1,8 +1,6 @@ // Test a default that references `Self` which is then used in an object type. // Issue #18956. -#![feature(default_type_params)] - trait Foo<T=Self> { fn method(&self); } diff --git a/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr b/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr index eafd3cf79db..4fc21bd7af2 100644 --- a/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr +++ b/src/test/ui/type/type-parameter-defaults-referencing-Self.stderr @@ -1,5 +1,5 @@ error[E0393]: the type parameter `T` must be explicitly specified - --> $DIR/type-parameter-defaults-referencing-Self.rs:10:16 + --> $DIR/type-parameter-defaults-referencing-Self.rs:8:16 | LL | / trait Foo<T=Self> { LL | | fn method(&self); diff --git a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs index 9f1c4c1a9e7..867e5fb1de7 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.rs @@ -2,7 +2,6 @@ // Fn to be used where FnMut is implemented. #![feature(fn_traits, unboxed_closures)] -#![feature(overloaded_calls)] use std::ops::{Fn,FnMut,FnOnce}; diff --git a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr index c8ce3091cf6..f379d73eecf 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr +++ b/src/test/ui/unboxed-closures/unboxed-closures-fnmut-as-fn.stderr @@ -1,5 +1,5 @@ error[E0277]: expected a `Fn<(isize,)>` closure, found `S` - --> $DIR/unboxed-closures-fnmut-as-fn.rs:28:21 + --> $DIR/unboxed-closures-fnmut-as-fn.rs:27:21 | LL | let x = call_it(&S, 22); | ------- ^^ expected an `Fn<(isize,)>` closure, found `S` @@ -8,7 +8,7 @@ LL | let x = call_it(&S, 22); | = help: the trait `Fn<(isize,)>` is not implemented for `S` note: required by a bound in `call_it` - --> $DIR/unboxed-closures-fnmut-as-fn.rs:23:14 + --> $DIR/unboxed-closures-fnmut-as-fn.rs:22:14 | LL | fn call_it<F:Fn(isize)->isize>(f: &F, x: isize) -> isize { | ^^^^^^^^^^^^^^^^ required by this bound in `call_it` diff --git a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs index 6a707b2096d..5e354cb6fce 100644 --- a/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs +++ b/src/test/ui/unboxed-closures/unboxed-closures-recursive-fn-using-fn-mut.rs @@ -1,4 +1,4 @@ -#![feature(core, fn_traits, unboxed_closures)] +#![feature(fn_traits, unboxed_closures)] use std::marker::PhantomData; |