diff --git a/.gitmodules b/.gitmodules index 5753e9ed45ed..038237aa179a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ url = https://github.com/rust-lang-nursery/rls.git [submodule "src/libcompiler_builtins"] path = src/libcompiler_builtins - url = https://github.com/rust-lang-nursery/compiler-builtins + url = https://github.com/rust-lang-nursery/compiler-builtins.git [submodule "src/tools/clippy"] path = src/tools/clippy url = https://github.com/rust-lang-nursery/rust-clippy.git @@ -43,24 +43,25 @@ url = https://github.com/alexcrichton/dlmalloc-rs.git [submodule "src/doc/rust-by-example"] path = src/doc/rust-by-example - url = https://github.com/rust-lang/rust-by-example + url = https://github.com/rust-lang/rust-by-example.git [submodule "src/llvm-emscripten"] path = src/llvm-emscripten - url = https://github.com/rust-lang/llvm + url = https://github.com/rust-lang/llvm.git [submodule "src/stdsimd"] path = src/stdsimd - url = https://github.com/rust-lang-nursery/stdsimd + url = https://github.com/rust-lang-nursery/stdsimd.git [submodule "src/tools/lld"] path = src/tools/lld url = https://github.com/rust-lang/lld.git [submodule "src/libbacktrace"] path = src/libbacktrace - url = https://github.com/rust-lang-nursery/libbacktrace + url = https://github.com/rust-lang-nursery/libbacktrace.git [submodule "src/tools/lldb"] path = src/tools/lldb - url = https://github.com/rust-lang-nursery/lldb/ + url = https://github.com/rust-lang-nursery/lldb.git branch = rust-release-80-v1 [submodule "src/tools/clang"] path = src/tools/clang - url = https://github.com/rust-lang-nursery/clang/ + url = https://github.com/rust-lang-nursery/clang.git branch = rust-release-80-v1 + \ No newline at end of file diff --git a/src/Cargo.lock b/src/Cargo.lock index a4f9082c284c..fc2dfcfd8604 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -296,12 +296,14 @@ version = "0.0.212" dependencies = [ "cargo_metadata 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "clippy-mini-macro-test 0.2.0", + "clippy_dev 0.0.1", "clippy_lints 0.0.212", "compiletest_rs 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "derive-new 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-workspace-hack 1.0.0", + "rustc_tools_util 0.1.0", "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.75 (registry+https://github.com/rust-lang/crates.io-index)", @@ -311,6 +313,16 @@ dependencies = [ name = "clippy-mini-macro-test" version = "0.2.0" +[[package]] +name = "clippy_dev" +version = "0.0.1" +dependencies = [ + "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "clippy_lints" version = "0.0.212" @@ -2361,6 +2373,10 @@ dependencies = [ "serialize 0.0.0", ] +[[package]] +name = "rustc_tools_util" +version = "0.1.0" + [[package]] name = "rustc_traits" version = "0.0.0" diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 347c2472c6b9..caf38d766f54 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -239,6 +239,10 @@ impl Step for Llvm { cfg.define("LLVM_NATIVE_BUILD", builder.llvm_out(builder.config.build).join("build")); } + if let Some(ref python) = builder.config.python { + cfg.define("PYTHON_EXECUTABLE", python); + } + configure_cmake(builder, target, &mut cfg, false); // FIXME: we don't actually need to build all LLVM tools and all LLVM diff --git a/src/doc/rustc/src/lints/listing/warn-by-default.md b/src/doc/rustc/src/lints/listing/warn-by-default.md index b49708ff6adc..de76ddf33c17 100644 --- a/src/doc/rustc/src/lints/listing/warn-by-default.md +++ b/src/doc/rustc/src/lints/listing/warn-by-default.md @@ -603,11 +603,11 @@ fn foo() { This will produce: ```text -warning: function cannot return without recurring +warning: function cannot return without recursing --> src/main.rs:1:1 | 1 | fn foo() { - | ^^^^^^^^ cannot return without recurring + | ^^^^^^^^ cannot return without recursing 2 | foo(); | ----- recursive call site | diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index c25f3eb8f175..29ba433bec7f 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -749,6 +749,31 @@ impl AsMut for Box { } } +/* Nota bene + * + * We could have chosen not to add this impl, and instead have written a + * function of Pin> to Pin. Such a function would not be sound, + * because Box implements Unpin even when T does not, as a result of + * this impl. + * + * We chose this API instead of the alternative for a few reasons: + * - Logically, it is helpful to understand pinning in regard to the + * memory region being pointed to. For this reason none of the + * standard library pointer types support projecting through a pin + * (Box is the only pointer type in std for which this would be + * safe.) + * - It is in practice very useful to have Box be unconditionally + * Unpin because of trait objects, for which the structural auto + * trait functionality does not apply (e.g. Box would + * otherwise not be Unpin). + * + * Another type with the same semantics as Box but only a conditional + * implementation of `Unpin` (where `T: Unpin`) would be valid/safe, and + * could have a method to project a Pin from it. + */ +#[unstable(feature = "pin", issue = "49150")] +impl Unpin for Box { } + #[unstable(feature = "generator_trait", issue = "43122")] impl Generator for Box where T: Generator + ?Sized diff --git a/src/liballoc/rc.rs b/src/liballoc/rc.rs index 4860daa11e20..2d65aaecbd0c 100644 --- a/src/liballoc/rc.rs +++ b/src/liballoc/rc.rs @@ -252,7 +252,7 @@ use core::fmt; use core::hash::{Hash, Hasher}; use core::intrinsics::abort; use core::marker; -use core::marker::{Unsize, PhantomData}; +use core::marker::{Unpin, Unsize, PhantomData}; use core::mem::{self, align_of_val, forget, size_of_val}; use core::ops::Deref; use core::ops::CoerceUnsized; @@ -1830,3 +1830,6 @@ impl AsRef for Rc { &**self } } + +#[unstable(feature = "pin", issue = "49150")] +impl Unpin for Rc { } diff --git a/src/liballoc/sync.rs b/src/liballoc/sync.rs index db7a4044b267..ff45daef5143 100644 --- a/src/liballoc/sync.rs +++ b/src/liballoc/sync.rs @@ -27,7 +27,7 @@ use core::mem::{self, align_of_val, size_of_val}; use core::ops::Deref; use core::ops::CoerceUnsized; use core::ptr::{self, NonNull}; -use core::marker::{Unsize, PhantomData}; +use core::marker::{Unpin, Unsize, PhantomData}; use core::hash::{Hash, Hasher}; use core::{isize, usize}; use core::convert::From; @@ -1943,3 +1943,6 @@ impl AsRef for Arc { &**self } } + +#[unstable(feature = "pin", issue = "49150")] +impl Unpin for Arc { } diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index 0032bedc7ed1..a0c87f13e5d5 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -349,6 +349,26 @@ macro_rules! try { /// write!(&mut v, "s = {:?}", s).unwrap(); // uses io::Write::write_fmt /// assert_eq!(v, b"s = \"abc 123\""); /// ``` +/// +/// Note: This macro can be used in `no_std` setups as well +/// In a `no_std` setup you are responsible for the +/// implementation details of the components. +/// +/// ```no_run +/// # extern crate core; +/// use core::fmt::Write; +/// +/// struct Example; +/// +/// impl Write for Example { +/// fn write_str(&mut self, _s: &str) -> core::fmt::Result { +/// unimplemented!(); +/// } +/// } +/// +/// let mut m = Example{}; +/// write!(&mut m, "Hello World").expect("Not written"); +/// ``` #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] macro_rules! write { diff --git a/src/libcore/mem.rs b/src/libcore/mem.rs index e00a22bf8b6c..1803adee3c18 100644 --- a/src/libcore/mem.rs +++ b/src/libcore/mem.rs @@ -971,14 +971,16 @@ impl ManuallyDrop { ManuallyDrop { value } } - /// Extract the value from the ManuallyDrop container. + /// Extract the value from the `ManuallyDrop` container. + /// + /// This allows the value to be dropped again. /// /// # Examples /// /// ```rust /// use std::mem::ManuallyDrop; /// let x = ManuallyDrop::new(Box::new(())); - /// let _: Box<()> = ManuallyDrop::into_inner(x); + /// let _: Box<()> = ManuallyDrop::into_inner(x); // This drops the `Box`. /// ``` #[stable(feature = "manually_drop", since = "1.20.0")] #[inline] @@ -990,11 +992,15 @@ impl ManuallyDrop { impl ManuallyDrop { /// Manually drops the contained value. /// + /// If you have ownership of the value, you can use [`ManuallyDrop::into_inner`] instead. + /// /// # Safety /// /// This function runs the destructor of the contained value and thus the wrapped value /// now represents uninitialized data. It is up to the user of this method to ensure the /// uninitialized data is not actually used. + /// + /// [`ManuallyDrop::into_inner`]: #method.into_inner #[stable(feature = "manually_drop", since = "1.20.0")] #[inline] pub unsafe fn drop(slot: &mut ManuallyDrop) { diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 19d3ad202471..5ae984a4b155 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -192,7 +192,7 @@ mod wrapping; macro_rules! int_impl { ($SelfT:ty, $ActualT:ident, $UnsignedT:ty, $BITS:expr, $Min:expr, $Max:expr, $Feature:expr, $EndFeature:expr, $rot:expr, $rot_op:expr, $rot_result:expr, $swap_op:expr, $swapped:expr, - $reversed:expr) => { + $reversed:expr, $le_bytes:expr, $be_bytes:expr) => { doc_comment! { concat!("Returns the smallest value that can be represented by this integer type. @@ -2063,23 +2063,25 @@ $EndFeature, " self.to_be().to_ne_bytes() } - /// Return the memory representation of this integer as a byte array in - /// big-endian (network) byte order. - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let bytes = 0x12_34_56_78_i32.to_be_bytes(); - /// assert_eq!(bytes, [0x12, 0x34, 0x56, 0x78]); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn to_be_bytes(self) -> [u8; mem::size_of::()] { - self.to_be().to_ne_bytes() + doc_comment! { + concat!("Return the memory representation of this integer as a byte array in +big-endian (network) byte order. + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let bytes = ", $swap_op, stringify!($SelfT), ".to_be_bytes(); +assert_eq!(bytes, ", $be_bytes, "); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn to_be_bytes(self) -> [u8; mem::size_of::()] { + self.to_be().to_ne_bytes() + } } /// no docs here @@ -2090,23 +2092,25 @@ $EndFeature, " self.to_le().to_ne_bytes() } - /// Return the memory representation of this integer as a byte array in - /// little-endian byte order. - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let bytes = 0x12_34_56_78_i32.to_le_bytes(); - /// assert_eq!(bytes, [0x78, 0x56, 0x34, 0x12]); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn to_le_bytes(self) -> [u8; mem::size_of::()] { - self.to_le().to_ne_bytes() +doc_comment! { + concat!("Return the memory representation of this integer as a byte array in +little-endian byte order. + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let bytes = ", $swap_op, stringify!($SelfT), ".to_le_bytes(); +assert_eq!(bytes, ", $le_bytes, "); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn to_le_bytes(self) -> [u8; mem::size_of::()] { + self.to_le().to_ne_bytes() + } } /// no docs here @@ -2117,30 +2121,37 @@ $EndFeature, " unsafe { mem::transmute(self) } } - /// Return the memory representation of this integer as a byte array in - /// native byte order. - /// - /// As the target platform's native endianness is used, portable code - /// should use [`to_be_bytes`] or [`to_le_bytes`], as appropriate, - /// instead. - /// - /// [`to_be_bytes`]: #method.to_be_bytes - /// [`to_le_bytes`]: #method.to_le_bytes - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let bytes = i32::min_value().to_be().to_ne_bytes(); - /// assert_eq!(bytes, [0x80, 0, 0, 0]); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn to_ne_bytes(self) -> [u8; mem::size_of::()] { - unsafe { mem::transmute(self) } + doc_comment! { + concat!(" +Return the memory representation of this integer as a byte array in +native byte order. + +As the target platform's native endianness is used, portable code +should use [`to_be_bytes`] or [`to_le_bytes`], as appropriate, +instead. + +[`to_be_bytes`]: #method.to_be_bytes +[`to_le_bytes`]: #method.to_le_bytes + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let bytes = ", $swap_op, stringify!($SelfT), ".to_ne_bytes(); +assert_eq!(bytes, if cfg!(target_endian = \"big\") { + ", $be_bytes, " + } else { + ", $le_bytes, " + }); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn to_ne_bytes(self) -> [u8; mem::size_of::()] { + unsafe { mem::transmute(self) } + } } /// no docs here @@ -2151,23 +2162,25 @@ $EndFeature, " Self::from_be(Self::from_ne_bytes(bytes)) } - /// Create an integer value from its representation as a byte array in - /// big endian. - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let int = i32::from_be_bytes([0x12, 0x34, 0x56, 0x78]); - /// assert_eq!(int, 0x12_34_56_78); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn from_be_bytes(bytes: [u8; mem::size_of::()]) -> Self { - Self::from_be(Self::from_ne_bytes(bytes)) +doc_comment! { + concat!("Create an integer value from its representation as a byte array in +big endian. + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let value = ", stringify!($SelfT), "::from_be_bytes(", $be_bytes, "); +assert_eq!(value, ", $swap_op, "); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn from_be_bytes(bytes: [u8; mem::size_of::()]) -> Self { + Self::from_be(Self::from_ne_bytes(bytes)) + } } /// no docs here @@ -2178,23 +2191,26 @@ $EndFeature, " Self::from_le(Self::from_ne_bytes(bytes)) } - /// Create an integer value from its representation as a byte array in - /// little endian. - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let int = i32::from_le_bytes([0x12, 0x34, 0x56, 0x78]); - /// assert_eq!(int, 0x78_56_34_12); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn from_le_bytes(bytes: [u8; mem::size_of::()]) -> Self { - Self::from_le(Self::from_ne_bytes(bytes)) +doc_comment! { + concat!(" +Create an integer value from its representation as a byte array in +little endian. + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let value = ", stringify!($SelfT), "::from_le_bytes(", $le_bytes, "); +assert_eq!(value, ", $swap_op, "); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn from_le_bytes(bytes: [u8; mem::size_of::()]) -> Self { + Self::from_le(Self::from_ne_bytes(bytes)) + } } /// no docs here @@ -2205,56 +2221,65 @@ $EndFeature, " unsafe { mem::transmute(bytes) } } - /// Create an integer value from its memory representation as a byte - /// array in native endianness. - /// - /// As the target platform's native endianness is used, portable code - /// likely wants to use [`from_be_bytes`] or [`from_le_bytes`], as - /// appropriate instead. - /// - /// [`from_be_bytes`]: #method.from_be_bytes - /// [`from_le_bytes`]: #method.from_le_bytes - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let int = i32::from_be(i32::from_ne_bytes([0x80, 0, 0, 0])); - /// assert_eq!(int, i32::min_value()); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn from_ne_bytes(bytes: [u8; mem::size_of::()]) -> Self { - unsafe { mem::transmute(bytes) } + doc_comment! { + concat!("Create an integer value from its memory representation as a byte +array in native endianness. + +As the target platform's native endianness is used, portable code +likely wants to use [`from_be_bytes`] or [`from_le_bytes`], as +appropriate instead. + +[`from_be_bytes`]: #method.from_be_bytes +[`from_le_bytes`]: #method.from_le_bytes + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let value = ", stringify!($SelfT), "::from_ne_bytes(if cfg!(target_endian = \"big\") { + ", $be_bytes, " + } else { + ", $le_bytes, " + }); +assert_eq!(value, ", $swap_op, "); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn from_ne_bytes(bytes: [u8; mem::size_of::()]) -> Self { + unsafe { mem::transmute(bytes) } + } } } } #[lang = "i8"] impl i8 { - int_impl! { i8, i8, u8, 8, -128, 127, "", "", 2, "-0x7e", "0xa", "0x12", "0x12", "0x48" } + int_impl! { i8, i8, u8, 8, -128, 127, "", "", 2, "-0x7e", "0xa", "0x12", "0x12", "0x48", + "[0x12]", "[0x12]" } } #[lang = "i16"] impl i16 { int_impl! { i16, i16, u16, 16, -32768, 32767, "", "", 4, "-0x5ffd", "0x3a", "0x1234", "0x3412", - "0x2c48" } + "0x2c48", "[0x34, 0x12]", "[0x12, 0x34]" } } #[lang = "i32"] impl i32 { int_impl! { i32, i32, u32, 32, -2147483648, 2147483647, "", "", 8, "0x10000b3", "0xb301", - "0x12345678", "0x78563412", "0x1e6a2c48" } + "0x12345678", "0x78563412", "0x1e6a2c48", "[0x78, 0x56, 0x34, 0x12]", + "[0x12, 0x34, 0x56, 0x78]" } } #[lang = "i64"] impl i64 { int_impl! { i64, i64, u64, 64, -9223372036854775808, 9223372036854775807, "", "", 12, "0xaa00000000006e1", "0x6e10aa", "0x1234567890123456", "0x5634129078563412", - "0x6a2c48091e6a2c48" } + "0x6a2c48091e6a2c48", "[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]", + "[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]" } } #[lang = "i128"] @@ -2262,22 +2287,26 @@ impl i128 { int_impl! { i128, i128, u128, 128, -170141183460469231731687303715884105728, 170141183460469231731687303715884105727, "", "", 16, "0x13f40000000000000000000000004f76", "0x4f7613f4", "0x12345678901234567890123456789012", - "0x12907856341290785634129078563412", "0x48091e6a2c48091e6a2c48091e6a2c48" - } + "0x12907856341290785634129078563412", "0x48091e6a2c48091e6a2c48091e6a2c48", + "[0x12, 0x90, 0x78, 0x56, 0x34, 0x12, 0x90, 0x78, \ + 0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]", + "[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, \ + 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12]" } } #[cfg(target_pointer_width = "16")] #[lang = "isize"] impl isize { int_impl! { isize, i16, u16, 16, -32768, 32767, "", "", 4, "-0x5ffd", "0x3a", "0x1234", - "0x3412", "0x2c48" } + "0x3412", "0x2c48", "[0x34, 0x12]", "[0x12, 0x34]" } } #[cfg(target_pointer_width = "32")] #[lang = "isize"] impl isize { int_impl! { isize, i32, u32, 32, -2147483648, 2147483647, "", "", 8, "0x10000b3", "0xb301", - "0x12345678", "0x78563412", "0x1e6a2c48" } + "0x12345678", "0x78563412", "0x1e6a2c48", "[0x78, 0x56, 0x34, 0x12]", + "[0x12, 0x34, 0x56, 0x78]" } } #[cfg(target_pointer_width = "64")] @@ -2285,7 +2314,8 @@ impl isize { impl isize { int_impl! { isize, i64, u64, 64, -9223372036854775808, 9223372036854775807, "", "", 12, "0xaa00000000006e1", "0x6e10aa", "0x1234567890123456", "0x5634129078563412", - "0x6a2c48091e6a2c48" } + "0x6a2c48091e6a2c48", "[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]", + "[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]" } } // Emits the correct `cttz` call, depending on the size of the type. @@ -2305,7 +2335,7 @@ macro_rules! uint_cttz_call { macro_rules! uint_impl { ($SelfT:ty, $ActualT:ty, $BITS:expr, $MaxV:expr, $Feature:expr, $EndFeature:expr, $rot:expr, $rot_op:expr, $rot_result:expr, $swap_op:expr, $swapped:expr, - $reversed:expr ) => { + $reversed:expr, $le_bytes:expr, $be_bytes:expr) => { doc_comment! { concat!("Returns the smallest value that can be represented by this integer type. @@ -3960,23 +3990,25 @@ $EndFeature, " self.to_be().to_ne_bytes() } - /// Return the memory representation of this integer as a byte array in - /// big-endian (network) byte order. - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let bytes = 0x12_34_56_78_i32.to_be_bytes(); - /// assert_eq!(bytes, [0x12, 0x34, 0x56, 0x78]); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn to_be_bytes(self) -> [u8; mem::size_of::()] { - self.to_be().to_ne_bytes() + doc_comment! { + concat!("Return the memory representation of this integer as a byte array in +big-endian (network) byte order. + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let bytes = ", $swap_op, stringify!($SelfT), ".to_be_bytes(); +assert_eq!(bytes, ", $be_bytes, "); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn to_be_bytes(self) -> [u8; mem::size_of::()] { + self.to_be().to_ne_bytes() + } } /// no docs here @@ -3987,23 +4019,25 @@ $EndFeature, " self.to_le().to_ne_bytes() } - /// Return the memory representation of this integer as a byte array in - /// little-endian byte order. - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let bytes = 0x12_34_56_78_i32.to_le_bytes(); - /// assert_eq!(bytes, [0x78, 0x56, 0x34, 0x12]); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn to_le_bytes(self) -> [u8; mem::size_of::()] { - self.to_le().to_ne_bytes() + doc_comment! { + concat!("Return the memory representation of this integer as a byte array in +little-endian byte order. + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let bytes = ", $swap_op, stringify!($SelfT), ".to_le_bytes(); +assert_eq!(bytes, ", $le_bytes, "); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn to_le_bytes(self) -> [u8; mem::size_of::()] { + self.to_le().to_ne_bytes() + } } /// no docs here @@ -4014,30 +4048,37 @@ $EndFeature, " unsafe { mem::transmute(self) } } - /// Return the memory representation of this integer as a byte array in - /// native byte order. - /// - /// As the target platform's native endianness is used, portable code - /// should use [`to_be_bytes`] or [`to_le_bytes`], as appropriate, - /// instead. - /// - /// [`to_be_bytes`]: #method.to_be_bytes - /// [`to_le_bytes`]: #method.to_le_bytes - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let bytes = i32::min_value().to_be().to_ne_bytes(); - /// assert_eq!(bytes, [0x80, 0, 0, 0]); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn to_ne_bytes(self) -> [u8; mem::size_of::()] { - unsafe { mem::transmute(self) } + doc_comment! { + concat!(" +Return the memory representation of this integer as a byte array in +native byte order. + +As the target platform's native endianness is used, portable code +should use [`to_be_bytes`] or [`to_le_bytes`], as appropriate, +instead. + +[`to_be_bytes`]: #method.to_be_bytes +[`to_le_bytes`]: #method.to_le_bytes + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let bytes = ", $swap_op, stringify!($SelfT), ".to_ne_bytes(); +assert_eq!(bytes, if cfg!(target_endian = \"big\") { + ", $be_bytes, " + } else { + ", $le_bytes, " + }); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn to_ne_bytes(self) -> [u8; mem::size_of::()] { + unsafe { mem::transmute(self) } + } } /// no docs here @@ -4048,23 +4089,25 @@ $EndFeature, " Self::from_be(Self::from_ne_bytes(bytes)) } - /// Create an integer value from its representation as a byte array in - /// big endian. - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let int = i32::from_be_bytes([0x12, 0x34, 0x56, 0x78]); - /// assert_eq!(int, 0x12_34_56_78); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn from_be_bytes(bytes: [u8; mem::size_of::()]) -> Self { - Self::from_be(Self::from_ne_bytes(bytes)) + doc_comment! { + concat!("Create an integer value from its representation as a byte array in +big endian. + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let value = ", stringify!($SelfT), "::from_be_bytes(", $be_bytes, "); +assert_eq!(value, ", $swap_op, "); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn from_be_bytes(bytes: [u8; mem::size_of::()]) -> Self { + Self::from_be(Self::from_ne_bytes(bytes)) + } } /// no docs here @@ -4075,23 +4118,26 @@ $EndFeature, " Self::from_le(Self::from_ne_bytes(bytes)) } - /// Create an integer value from its representation as a byte array in - /// little endian. - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let int = i32::from_le_bytes([0x12, 0x34, 0x56, 0x78]); - /// assert_eq!(int, 0x78_56_34_12); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn from_le_bytes(bytes: [u8; mem::size_of::()]) -> Self { - Self::from_le(Self::from_ne_bytes(bytes)) + doc_comment! { + concat!(" +Create an integer value from its representation as a byte array in +little endian. + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let value = ", stringify!($SelfT), "::from_le_bytes(", $le_bytes, "); +assert_eq!(value, ", $swap_op, "); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn from_le_bytes(bytes: [u8; mem::size_of::()]) -> Self { + Self::from_le(Self::from_ne_bytes(bytes)) + } } /// no docs here @@ -4102,37 +4148,44 @@ $EndFeature, " unsafe { mem::transmute(bytes) } } - /// Create an integer value from its memory representation as a byte - /// array in native endianness. - /// - /// As the target platform's native endianness is used, portable code - /// likely wants to use [`from_be_bytes`] or [`from_le_bytes`], as - /// appropriate instead. - /// - /// [`from_be_bytes`]: #method.from_be_bytes - /// [`from_le_bytes`]: #method.from_le_bytes - /// - /// # Examples - /// - /// ``` - /// #![feature(int_to_from_bytes)] - /// - /// let int = i32::from_be(i32::from_ne_bytes([0x80, 0, 0, 0])); - /// assert_eq!(int, i32::min_value()); - /// ``` - #[unstable(feature = "int_to_from_bytes", issue = "52963")] - #[rustc_const_unstable(feature = "const_int_conversion")] - #[inline] - #[cfg(not(stage0))] - pub const fn from_ne_bytes(bytes: [u8; mem::size_of::()]) -> Self { - unsafe { mem::transmute(bytes) } + doc_comment! { + concat!("Create an integer value from its memory representation as a byte +array in native endianness. + +As the target platform's native endianness is used, portable code +likely wants to use [`from_be_bytes`] or [`from_le_bytes`], as +appropriate instead. + +[`from_be_bytes`]: #method.from_be_bytes +[`from_le_bytes`]: #method.from_le_bytes + +# Examples + +``` +#![feature(int_to_from_bytes)] + +let value = ", stringify!($SelfT), "::from_ne_bytes(if cfg!(target_endian = \"big\") { + ", $be_bytes, " + } else { + ", $le_bytes, " + }); +assert_eq!(value, ", $swap_op, "); +```"), + #[unstable(feature = "int_to_from_bytes", issue = "52963")] + #[rustc_const_unstable(feature = "const_int_conversion")] + #[inline] + #[cfg(not(stage0))] + pub const fn from_ne_bytes(bytes: [u8; mem::size_of::()]) -> Self { + unsafe { mem::transmute(bytes) } + } } } } #[lang = "u8"] impl u8 { - uint_impl! { u8, u8, 8, 255, "", "", 2, "0x82", "0xa", "0x12", "0x12", "0x48" } + uint_impl! { u8, u8, 8, 255, "", "", 2, "0x82", "0xa", "0x12", "0x12", "0x48", "[0x12]", + "[0x12]" } /// Checks if the value is within the ASCII range. @@ -4658,45 +4711,55 @@ impl u8 { #[lang = "u16"] impl u16 { - uint_impl! { u16, u16, 16, 65535, "", "", 4, "0xa003", "0x3a", "0x1234", "0x3412", "0x2c48" } + uint_impl! { u16, u16, 16, 65535, "", "", 4, "0xa003", "0x3a", "0x1234", "0x3412", "0x2c48", + "[0x34, 0x12]", "[0x12, 0x34]" } } #[lang = "u32"] impl u32 { uint_impl! { u32, u32, 32, 4294967295, "", "", 8, "0x10000b3", "0xb301", "0x12345678", - "0x78563412", "0x1e6a2c48" } + "0x78563412", "0x1e6a2c48", "[0x78, 0x56, 0x34, 0x12]", "[0x12, 0x34, 0x56, 0x78]" } } #[lang = "u64"] impl u64 { uint_impl! { u64, u64, 64, 18446744073709551615, "", "", 12, "0xaa00000000006e1", "0x6e10aa", - "0x1234567890123456", "0x5634129078563412", "0x6a2c48091e6a2c48" } + "0x1234567890123456", "0x5634129078563412", "0x6a2c48091e6a2c48", + "[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]", + "[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]" } } #[lang = "u128"] impl u128 { uint_impl! { u128, u128, 128, 340282366920938463463374607431768211455, "", "", 16, "0x13f40000000000000000000000004f76", "0x4f7613f4", "0x12345678901234567890123456789012", - "0x12907856341290785634129078563412", "0x48091e6a2c48091e6a2c48091e6a2c48" } + "0x12907856341290785634129078563412", "0x48091e6a2c48091e6a2c48091e6a2c48", + "[0x12, 0x90, 0x78, 0x56, 0x34, 0x12, 0x90, 0x78, \ + 0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]", + "[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56, \ + 0x78, 0x90, 0x12, 0x34, 0x56, 0x78, 0x90, 0x12]" } } #[cfg(target_pointer_width = "16")] #[lang = "usize"] impl usize { - uint_impl! { usize, u16, 16, 65536, "", "", 4, "0xa003", "0x3a", "0x1234", "0x3412", "0x2c48" } + uint_impl! { usize, u16, 16, 65536, "", "", 4, "0xa003", "0x3a", "0x1234", "0x3412", "0x2c48", + "[0x34, 0x12]", "[0x12, 0x34]" } } #[cfg(target_pointer_width = "32")] #[lang = "usize"] impl usize { uint_impl! { usize, u32, 32, 4294967295, "", "", 8, "0x10000b3", "0xb301", "0x12345678", - "0x78563412", "0x1e6a2c48" } + "0x78563412", "0x1e6a2c48", "[0x78, 0x56, 0x34, 0x12]", "[0x12, 0x34, 0x56, 0x78]" } } #[cfg(target_pointer_width = "64")] #[lang = "usize"] impl usize { uint_impl! { usize, u64, 64, 18446744073709551615, "", "", 12, "0xaa00000000006e1", "0x6e10aa", - "0x1234567890123456", "0x5634129078563412", "0x6a2c48091e6a2c48" } + "0x1234567890123456", "0x5634129078563412", "0x6a2c48091e6a2c48", + "[0x56, 0x34, 0x12, 0x90, 0x78, 0x56, 0x34, 0x12]", + "[0x12, 0x34, 0x56, 0x78, 0x90, 0x12, 0x34, 0x56]" } } /// A classification of floating point numbers. diff --git a/src/libcore/sync/atomic.rs b/src/libcore/sync/atomic.rs index 617e067e0787..602f8d4ee718 100644 --- a/src/libcore/sync/atomic.rs +++ b/src/libcore/sync/atomic.rs @@ -124,7 +124,6 @@ pub fn spin_loop_hint() { /// [`bool`]: ../../../std/primitive.bool.html #[cfg(target_has_atomic = "8")] #[stable(feature = "rust1", since = "1.0.0")] -#[repr(transparent)] pub struct AtomicBool { v: UnsafeCell, } @@ -148,7 +147,6 @@ unsafe impl Sync for AtomicBool {} /// This type has the same in-memory representation as a `*mut T`. #[cfg(target_has_atomic = "ptr")] #[stable(feature = "rust1", since = "1.0.0")] -#[repr(transparent)] pub struct AtomicPtr { p: UnsafeCell<*mut T>, } @@ -1101,7 +1099,6 @@ macro_rules! atomic_int { /// /// [module-level documentation]: index.html #[$stable] - #[repr(transparent)] pub struct $atomic_type { v: UnsafeCell<$int_type>, } diff --git a/src/librustc_lint/builtin.rs b/src/librustc_lint/builtin.rs index 8ebb181247cf..b662b8250139 100644 --- a/src/librustc_lint/builtin.rs +++ b/src/librustc_lint/builtin.rs @@ -901,7 +901,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnconditionalRecursion { // considers this to be an error for two reasons, (a) it is // easier to implement, and (b) it seems rare to actually want // to have behaviour like the above, rather than - // e.g. accidentally recurring after an assert. + // e.g. accidentally recursing after an assert. let cfg = cfg::CFG::new(cx.tcx, &body); @@ -961,8 +961,8 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnconditionalRecursion { let sp = cx.tcx.sess.source_map().def_span(sp); let mut db = cx.struct_span_lint(UNCONDITIONAL_RECURSION, sp, - "function cannot return without recurring"); - db.span_label(sp, "cannot return without recurring"); + "function cannot return without recursing"); + db.span_label(sp, "cannot return without recursing"); // offer some help to the programmer. for call in &self_call_spans { db.span_label(*call, "recursive call site"); @@ -1090,7 +1090,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnconditionalRecursion { // a default method definition. Ok(Some(traits::VtableParam(_))) => { let on_self = trait_ref.self_ty().is_self(); - // We can only be recurring in a default + // We can only be recursing in a default // method if we're being called literally // on the `Self` type. on_self && callee_id == method.def_id diff --git a/src/librustc_mir/dataflow/graphviz.rs b/src/librustc_mir/dataflow/graphviz.rs index 97d549987712..1d35bb85a21a 100644 --- a/src/librustc_mir/dataflow/graphviz.rs +++ b/src/librustc_mir/dataflow/graphviz.rs @@ -265,15 +265,12 @@ impl<'a, 'tcx, MWF, P> dot::GraphWalk<'a> for Graph<'a, 'tcx, MWF, P> fn edges(&self) -> dot::Edges { let mir = self.mbcx.mir(); - // base initial capacity on assumption every block has at - // least one outgoing edge (Which should be true for all - // blocks but one, the exit-block). - let mut edges = Vec::with_capacity(mir.basic_blocks().len()); - for bb in mir.basic_blocks().indices() { - let outgoing = outgoing(mir, bb); - edges.extend(outgoing.into_iter()); - } - edges.into_cow() + + mir.basic_blocks() + .indices() + .flat_map(|bb| outgoing(mir, bb)) + .collect::>() + .into_cow() } fn source(&self, edge: &Edge) -> Node { diff --git a/src/librustc_mir/dataflow/impls/borrows.rs b/src/librustc_mir/dataflow/impls/borrows.rs index 8f3595b17848..cb551df91062 100644 --- a/src/librustc_mir/dataflow/impls/borrows.rs +++ b/src/librustc_mir/dataflow/impls/borrows.rs @@ -168,9 +168,7 @@ impl<'a, 'gcx, 'tcx> Borrows<'a, 'gcx, 'tcx> { // region, then setting that gen-bit will override any // potential kill introduced here. if let Some(indices) = self.borrows_out_of_scope_at_location.get(&location) { - for index in indices { - sets.kill(&index); - } + sets.kill_all(indices); } } diff --git a/src/librustc_mir/dataflow/mod.rs b/src/librustc_mir/dataflow/mod.rs index bee7d443c854..d6874e290d4f 100644 --- a/src/librustc_mir/dataflow/mod.rs +++ b/src/librustc_mir/dataflow/mod.rs @@ -250,8 +250,7 @@ impl<'b, 'a: 'b, 'tcx: 'a, BD> PropagationContext<'b, 'a, 'tcx, BD> where BD: Bi } } -fn dataflow_path(context: &str, prepost: &str, path: &str) -> PathBuf { - format!("{}_{}", context, prepost); +fn dataflow_path(context: &str, path: &str) -> PathBuf { let mut path = PathBuf::from(path); let new_file_name = { let orig_file_name = path.file_name().unwrap().to_str().unwrap(); @@ -267,7 +266,7 @@ impl<'a, 'tcx: 'a, BD> DataflowBuilder<'a, 'tcx, BD> where BD: BitDenotation where P: Fn(&BD, BD::Idx) -> DebugFormatted { if let Some(ref path_str) = self.print_preflow_to { - let path = dataflow_path(BD::name(), "preflow", path_str); + let path = dataflow_path(BD::name(), path_str); graphviz::print_borrowck_graph_to(self, &path, p) } else { Ok(()) @@ -278,9 +277,9 @@ impl<'a, 'tcx: 'a, BD> DataflowBuilder<'a, 'tcx, BD> where BD: BitDenotation where P: Fn(&BD, BD::Idx) -> DebugFormatted { if let Some(ref path_str) = self.print_postflow_to { - let path = dataflow_path(BD::name(), "postflow", path_str); + let path = dataflow_path(BD::name(), path_str); graphviz::print_borrowck_graph_to(self, &path, p) - } else{ + } else { Ok(()) } } diff --git a/src/librustc_mir/dataflow/move_paths/builder.rs b/src/librustc_mir/dataflow/move_paths/builder.rs index 0162bb84b94b..dde2e819fd20 100644 --- a/src/librustc_mir/dataflow/move_paths/builder.rs +++ b/src/librustc_mir/dataflow/move_paths/builder.rs @@ -201,7 +201,7 @@ impl<'a, 'gcx, 'tcx> MoveDataBuilder<'a, 'gcx, 'tcx> { "done dumping moves" }); - if self.errors.len() > 0 { + if !self.errors.is_empty() { Err((self.data, self.errors)) } else { Ok(self.data) diff --git a/src/librustc_mir/interpret/intrinsics.rs b/src/librustc_mir/interpret/intrinsics.rs index 8cdb0e37f550..48085c214541 100644 --- a/src/librustc_mir/interpret/intrinsics.rs +++ b/src/librustc_mir/interpret/intrinsics.rs @@ -105,8 +105,6 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M> { | "overflowing_add" | "overflowing_sub" | "overflowing_mul" - | "unchecked_shl" - | "unchecked_shr" | "add_with_overflow" | "sub_with_overflow" | "mul_with_overflow" => { @@ -116,8 +114,6 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M> { "overflowing_add" => (BinOp::Add, true), "overflowing_sub" => (BinOp::Sub, true), "overflowing_mul" => (BinOp::Mul, true), - "unchecked_shl" => (BinOp::Shl, true), - "unchecked_shr" => (BinOp::Shr, true), "add_with_overflow" => (BinOp::Add, false), "sub_with_overflow" => (BinOp::Sub, false), "mul_with_overflow" => (BinOp::Mul, false), @@ -129,6 +125,24 @@ impl<'a, 'mir, 'tcx, M: Machine<'mir, 'tcx>> EvalContext<'a, 'mir, 'tcx, M> { self.binop_with_overflow(bin_op, lhs, rhs, dest)?; } } + "unchecked_shl" | "unchecked_shr" => { + let l = self.read_value(args[0])?; + let r = self.read_value(args[1])?; + let bin_op = match intrinsic_name { + "unchecked_shl" => BinOp::Shl, + "unchecked_shr" => BinOp::Shr, + _ => bug!("Already checked for int ops") + }; + let (val, overflowed) = self.binary_op_val(bin_op, l, r)?; + if overflowed { + let layout = self.layout_of(substs.type_at(0))?; + let r_val = r.to_scalar()?.to_bits(layout.size)?; + return err!(Intrinsic( + format!("Overflowing shift by {} in {}", r_val, intrinsic_name), + )); + } + self.write_scalar(val, dest)?; + } "transmute" => { // Go through an allocation, to make sure the completely different layouts // do not pose a problem. (When the user transmutes through a union, diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index e177d4a988ae..f14d55cb2d34 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -1566,6 +1566,12 @@ pub fn rename, Q: AsRef>(from: P, to: Q) -> io::Result<()> /// On success, the total number of bytes copied is returned and it is equal to /// the length of the `to` file as reported by `metadata`. /// +/// If you’re wanting to copy the contents of one file to another and you’re +/// working with [`File`]s, see the [`io::copy`] function. +/// +/// [`io::copy`]: ../io/fn.copy.html +/// [`File`]: ./struct.File.html +/// /// # Platform-specific behavior /// /// This function currently corresponds to the `open` function in Unix diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs index 33f741dbc38f..371e5b21c13b 100644 --- a/src/libstd/io/util.rs +++ b/src/libstd/io/util.rs @@ -23,6 +23,11 @@ use mem; /// On success, the total number of bytes that were copied from /// `reader` to `writer` is returned. /// +/// If you’re wanting to copy the contents of one file to another and you’re +/// working with filesystem paths, see the [`fs::copy`] function. +/// +/// [`fs::copy`]: ../fs/fn.copy.html +/// /// # Errors /// /// This function will return an error immediately if any call to `read` or diff --git a/src/test/ui/borrowck/two-phase-surprise-no-conflict.ast.stderr b/src/test/ui/borrowck/two-phase-surprise-no-conflict.ast.stderr new file mode 100644 index 000000000000..6e7f35d1fda7 --- /dev/null +++ b/src/test/ui/borrowck/two-phase-surprise-no-conflict.ast.stderr @@ -0,0 +1,133 @@ +error[E0503]: cannot use `self.cx` because it was mutably borrowed + --> $DIR/two-phase-surprise-no-conflict.rs:40:13 + | +LL | let _mut_borrow = &mut *self; + | ----- borrow of `*self` occurs here +LL | let _access = self.cx; + | ^^^^^^^ use of borrowed `*self` + +error[E0502]: cannot borrow `*self.cx_mut` as immutable because `*self` is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:79:33 + | +LL | self.hash_expr(&self.cx_mut.body(eid).value); + | ---- ^^^^^^^^^^^ - mutable borrow ends here + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because `*reg` is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:131:52 + | +LL | reg.register_static(Box::new(TrivialPass::new(®.sess_mut))); + | --- ^^^^^^^^^^^^ - mutable borrow ends here + | | | + | mutable borrow occurs here immutable borrow occurs here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because `*reg` is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:135:51 + | +LL | reg.register_bound(Box::new(TrivialPass::new(®.sess_mut))); + | --- ^^^^^^^^^^^^ - mutable borrow ends here + | | | + | mutable borrow occurs here immutable borrow occurs here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because `*reg` is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:139:50 + | +LL | reg.register_univ(Box::new(TrivialPass::new(®.sess_mut))); + | --- ^^^^^^^^^^^^ - mutable borrow ends here + | | | + | mutable borrow occurs here immutable borrow occurs here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because `*reg` is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:143:41 + | +LL | reg.register_ref(&TrivialPass::new(®.sess_mut)); + | --- ^^^^^^^^^^^^ - mutable borrow ends here + | | | + | mutable borrow occurs here immutable borrow occurs here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:151:56 + | +LL | reg.register_static(Box::new(TrivialPass::new(&mut reg.sess_mut))); + | --- ^^^^^^^^^^^^ - first borrow ends here + | | | + | first mutable borrow occurs here second mutable borrow occurs here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:156:59 + | +LL | reg.register_bound(Box::new(TrivialPass::new_mut(&mut reg.sess_mut))); + | --- ^^^^^^^^^^^^ - first borrow ends here + | | | + | first mutable borrow occurs here second mutable borrow occurs here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:161:58 + | +LL | reg.register_univ(Box::new(TrivialPass::new_mut(&mut reg.sess_mut))); + | --- ^^^^^^^^^^^^ - first borrow ends here + | | | + | first mutable borrow occurs here second mutable borrow occurs here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:166:49 + | +LL | reg.register_ref(&TrivialPass::new_mut(&mut reg.sess_mut)); + | --- ^^^^^^^^^^^^ - first borrow ends here + | | | + | first mutable borrow occurs here second mutable borrow occurs here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because `*reg` is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:178:51 + | +LL | reg.register_bound(Box::new(CapturePass::new(®.sess_mut))); + | --- ^^^^^^^^^^^^ - mutable borrow ends here + | | | + | mutable borrow occurs here immutable borrow occurs here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because `*reg` is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:183:50 + | +LL | reg.register_univ(Box::new(CapturePass::new(®.sess_mut))); + | --- ^^^^^^^^^^^^ - mutable borrow ends here + | | | + | mutable borrow occurs here immutable borrow occurs here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because `*reg` is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:188:41 + | +LL | reg.register_ref(&CapturePass::new(®.sess_mut)); + | --- ^^^^^^^^^^^^ - mutable borrow ends here + | | | + | mutable borrow occurs here immutable borrow occurs here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:200:59 + | +LL | reg.register_bound(Box::new(CapturePass::new_mut(&mut reg.sess_mut))); + | --- ^^^^^^^^^^^^ - first borrow ends here + | | | + | first mutable borrow occurs here second mutable borrow occurs here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:206:58 + | +LL | reg.register_univ(Box::new(CapturePass::new_mut(&mut reg.sess_mut))); + | --- ^^^^^^^^^^^^ - first borrow ends here + | | | + | first mutable borrow occurs here second mutable borrow occurs here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:212:49 + | +LL | reg.register_ref(&CapturePass::new_mut(&mut reg.sess_mut)); + | --- ^^^^^^^^^^^^ - first borrow ends here + | | | + | first mutable borrow occurs here second mutable borrow occurs here + +error: aborting due to 16 previous errors + +Some errors occurred: E0499, E0502, E0503. +For more information about an error, try `rustc --explain E0499`. diff --git a/src/test/ui/borrowck/two-phase-surprise-no-conflict.nll.stderr b/src/test/ui/borrowck/two-phase-surprise-no-conflict.nll.stderr new file mode 100644 index 000000000000..1fcd90213411 --- /dev/null +++ b/src/test/ui/borrowck/two-phase-surprise-no-conflict.nll.stderr @@ -0,0 +1,165 @@ +error[E0503]: cannot use `self.cx` because it was mutably borrowed + --> $DIR/two-phase-surprise-no-conflict.rs:40:23 + | +LL | let _mut_borrow = &mut *self; + | ---------- borrow of `*self` occurs here +LL | let _access = self.cx; + | ^^^^^^^ use of borrowed `*self` +... +LL | _mut_borrow; + | ----------- borrow later used here + +error[E0502]: cannot borrow `*self` as mutable because it is also borrowed as immutable + --> $DIR/two-phase-surprise-no-conflict.rs:79:17 + | +LL | self.hash_expr(&self.cx_mut.body(eid).value); + | ^^^^^^^^^^^^^^^^-----------^^^^^^^^^^^^^^^^^ + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:151:51 + | +LL | reg.register_static(Box::new(TrivialPass::new(&mut reg.sess_mut))); + | ----------------------------------------------^^^^^^^^^^^^^^^^^--- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:156:54 + | +LL | reg.register_bound(Box::new(TrivialPass::new_mut(&mut reg.sess_mut))); + | -------------------------------------------------^^^^^^^^^^^^^^^^^--- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:161:53 + | +LL | reg.register_univ(Box::new(TrivialPass::new_mut(&mut reg.sess_mut))); + | ------------------------------------------------^^^^^^^^^^^^^^^^^--- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:166:44 + | +LL | reg.register_ref(&TrivialPass::new_mut(&mut reg.sess_mut)); + | ---------------------------------------^^^^^^^^^^^^^^^^^-- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0502]: cannot borrow `*reg` as mutable because it is also borrowed as immutable + --> $DIR/two-phase-surprise-no-conflict.rs:178:5 + | +LL | reg.register_bound(Box::new(CapturePass::new(®.sess_mut))); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-------------^^^ + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0502]: cannot borrow `*reg` as mutable because it is also borrowed as immutable + --> $DIR/two-phase-surprise-no-conflict.rs:183:5 + | +LL | reg.register_univ(Box::new(CapturePass::new(®.sess_mut))); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-------------^^^ + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 122:21... + --> $DIR/two-phase-surprise-no-conflict.rs:122:21 + | +LL | fn register_plugins<'a>(mk_reg: impl Fn() -> &'a mut Registry<'a>) { + | ^^ + +error[E0502]: cannot borrow `*reg` as mutable because it is also borrowed as immutable + --> $DIR/two-phase-surprise-no-conflict.rs:188:5 + | +LL | reg.register_ref(&CapturePass::new(®.sess_mut)); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-------------^^ + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `*reg` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:200:5 + | +LL | reg.register_bound(Box::new(CapturePass::new_mut(&mut reg.sess_mut))); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-----------------^^^ + | | | + | | first mutable borrow occurs here + | second mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:200:54 + | +LL | reg.register_bound(Box::new(CapturePass::new_mut(&mut reg.sess_mut))); + | -------------------------------------------------^^^^^^^^^^^^^^^^^--- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `*reg` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:206:5 + | +LL | reg.register_univ(Box::new(CapturePass::new_mut(&mut reg.sess_mut))); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-----------------^^^ + | | | + | | first mutable borrow occurs here + | second mutable borrow occurs here + | +note: borrowed value must be valid for the lifetime 'a as defined on the function body at 122:21... + --> $DIR/two-phase-surprise-no-conflict.rs:122:21 + | +LL | fn register_plugins<'a>(mk_reg: impl Fn() -> &'a mut Registry<'a>) { + | ^^ + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:206:53 + | +LL | reg.register_univ(Box::new(CapturePass::new_mut(&mut reg.sess_mut))); + | ------------------------------------------------^^^^^^^^^^^^^^^^^--- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `*reg` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:212:5 + | +LL | reg.register_ref(&CapturePass::new_mut(&mut reg.sess_mut)); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-----------------^^ + | | | + | | first mutable borrow occurs here + | second mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:212:44 + | +LL | reg.register_ref(&CapturePass::new_mut(&mut reg.sess_mut)); + | ---------------------------------------^^^^^^^^^^^^^^^^^-- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error: aborting due to 15 previous errors + +Some errors occurred: E0499, E0502, E0503. +For more information about an error, try `rustc --explain E0499`. diff --git a/src/test/ui/borrowck/two-phase-surprise-no-conflict.no2pb.stderr b/src/test/ui/borrowck/two-phase-surprise-no-conflict.no2pb.stderr new file mode 100644 index 000000000000..f4fc7e54f80e --- /dev/null +++ b/src/test/ui/borrowck/two-phase-surprise-no-conflict.no2pb.stderr @@ -0,0 +1,175 @@ +error[E0503]: cannot use `self.cx` because it was mutably borrowed + --> $DIR/two-phase-surprise-no-conflict.rs:40:23 + | +LL | let _mut_borrow = &mut *self; + | ---------- borrow of `*self` occurs here +LL | let _access = self.cx; + | ^^^^^^^ use of borrowed `*self` +... +LL | _mut_borrow; + | ----------- borrow later used here + +error[E0502]: cannot borrow `*self.cx` as immutable because it is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:64:33 + | +LL | self.hash_expr(&self.cx.body(eid).value); + | ----------------^^^^^^^----------------- + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0502]: cannot borrow `*self.cx_mut` as immutable because it is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:79:33 + | +LL | self.hash_expr(&self.cx_mut.body(eid).value); + | ----------------^^^^^^^^^^^----------------- + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because it is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:131:51 + | +LL | reg.register_static(Box::new(TrivialPass::new(®.sess_mut))); + | ----------------------------------------------^^^^^^^^^^^^^--- + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because it is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:135:50 + | +LL | reg.register_bound(Box::new(TrivialPass::new(®.sess_mut))); + | ---------------------------------------------^^^^^^^^^^^^^--- + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because it is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:139:49 + | +LL | reg.register_univ(Box::new(TrivialPass::new(®.sess_mut))); + | --------------------------------------------^^^^^^^^^^^^^--- + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because it is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:143:40 + | +LL | reg.register_ref(&TrivialPass::new(®.sess_mut)); + | -----------------------------------^^^^^^^^^^^^^-- + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:151:51 + | +LL | reg.register_static(Box::new(TrivialPass::new(&mut reg.sess_mut))); + | ----------------------------------------------^^^^^^^^^^^^^^^^^--- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:156:54 + | +LL | reg.register_bound(Box::new(TrivialPass::new_mut(&mut reg.sess_mut))); + | -------------------------------------------------^^^^^^^^^^^^^^^^^--- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:161:53 + | +LL | reg.register_univ(Box::new(TrivialPass::new_mut(&mut reg.sess_mut))); + | ------------------------------------------------^^^^^^^^^^^^^^^^^--- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:166:44 + | +LL | reg.register_ref(&TrivialPass::new_mut(&mut reg.sess_mut)); + | ---------------------------------------^^^^^^^^^^^^^^^^^-- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because it is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:178:50 + | +LL | reg.register_bound(Box::new(CapturePass::new(®.sess_mut))); + | ---------------------------------------------^^^^^^^^^^^^^--- + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because it is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:183:49 + | +LL | reg.register_univ(Box::new(CapturePass::new(®.sess_mut))); + | --------------------------------------------^^^^^^^^^^^^^--- + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0502]: cannot borrow `reg.sess_mut` as immutable because it is also borrowed as mutable + --> $DIR/two-phase-surprise-no-conflict.rs:188:40 + | +LL | reg.register_ref(&CapturePass::new(®.sess_mut)); + | -----------------------------------^^^^^^^^^^^^^-- + | | | + | | immutable borrow occurs here + | mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:200:54 + | +LL | reg.register_bound(Box::new(CapturePass::new_mut(&mut reg.sess_mut))); + | -------------------------------------------------^^^^^^^^^^^^^^^^^--- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:206:53 + | +LL | reg.register_univ(Box::new(CapturePass::new_mut(&mut reg.sess_mut))); + | ------------------------------------------------^^^^^^^^^^^^^^^^^--- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error[E0499]: cannot borrow `reg.sess_mut` as mutable more than once at a time + --> $DIR/two-phase-surprise-no-conflict.rs:212:44 + | +LL | reg.register_ref(&CapturePass::new_mut(&mut reg.sess_mut)); + | ---------------------------------------^^^^^^^^^^^^^^^^^-- + | | | + | | second mutable borrow occurs here + | first mutable borrow occurs here + | borrow later used here + +error: aborting due to 17 previous errors + +Some errors occurred: E0499, E0502, E0503. +For more information about an error, try `rustc --explain E0499`. diff --git a/src/test/ui/borrowck/two-phase-surprise-no-conflict.rs b/src/test/ui/borrowck/two-phase-surprise-no-conflict.rs new file mode 100644 index 000000000000..36bf44afb15b --- /dev/null +++ b/src/test/ui/borrowck/two-phase-surprise-no-conflict.rs @@ -0,0 +1,219 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +// This is a test adapted from a minimization of the code from +// rust-lang/rust#52934, where an accidental disabling of +// two-phase-borrows (in the initial 2018 edition integration) broke +// Clippy, but the scenarios where it was breaking were subtle enough +// that we decided it warranted its own unit test, and pnkfelix +// decided to use that test as an opportunity to illustrate the cases. + +// revisions: ast no2pb nll +//[ast]compile-flags: -Z borrowck=ast +//[no2pb]compile-flags: -Z borrowck=mir +//[nll]compile-flags: -Z borrowck=mir -Z two-phase-borrows + +// (Since we are manually toggling NLL variations on and off, don't +// bother with compare-mode=nll) +// ignore-compare-mode-nll + +#[derive(Copy, Clone)] +struct BodyId; +enum Expr { Closure(BodyId), Others } +struct Body { value: Expr } + +struct Map { body: Body, } +impl Map { fn body(&self, _: BodyId) -> &Body { unimplemented!() } } + +struct SpanlessHash<'a> { cx: &'a Map, cx_mut: &'a mut Map } + +impl <'a> SpanlessHash<'a> { + fn demo(&mut self) { + let _mut_borrow = &mut *self; + let _access = self.cx; + //[ast]~^ ERROR cannot use `self.cx` because it was mutably borrowed [E0503] + //[no2pb]~^^ ERROR cannot use `self.cx` because it was mutably borrowed [E0503] + //[nll]~^^^ ERROR cannot use `self.cx` because it was mutably borrowed [E0503] + _mut_borrow; + } + + fn hash_expr(&mut self, e: &Expr) { + match *e { + Expr::Closure(eid) => { + // Accepted by AST-borrowck for erroneous reasons + // (rust-lang/rust#38899). + // + // Not okay without two-phase borrows: the implicit + // `&mut self` of the receiver is evaluated first, and + // that conflicts with the `self.cx`` access during + // argument evaluation, as demonstrated in `fn demo` + // above. + // + // Okay if we have two-phase borrows. Note that even + // if `self.cx.body(..)` holds onto a reference into + // `self.cx`, `self.cx` is an immutable-borrow, so + // nothing in the activation for `self.hash_expr(..)` + // can interfere with that immutable borrow. + self.hash_expr(&self.cx.body(eid).value); + //[no2pb]~^ ERROR cannot borrow `*self.cx` + }, + _ => {} + } + } + + fn hash_expr_mut(&mut self, e: &Expr) { + match *e { + Expr::Closure(eid) => { + // Not okay: the call to `self.cx_mut.body(eid)` might + // hold on to some mutably borrowed state in + // `self.cx_mut`, which would then interfere with the + // eventual activation of the `self` mutable borrow + // for `self.hash_expr(..)` + self.hash_expr(&self.cx_mut.body(eid).value); + //[ast]~^ ERROR cannot borrow `*self.cx_mut` + //[no2pb]~^^ ERROR cannot borrow `*self.cx_mut` + //[nll]~^^^ ERROR cannot borrow `*self` + }, + _ => {} + } + } +} + +struct Session; +struct Config; +trait LateLintPass<'a> { } + +struct TrivialPass; +impl TrivialPass { + fn new(_: &Session) -> Self { TrivialPass } + fn new_mut(_: &mut Session) -> Self { TrivialPass } +} + +struct CapturePass<'a> { s: &'a Session } +impl<'a> CapturePass<'a> { + fn new(s: &'a Session) -> Self { CapturePass { s } } + fn new_mut(s: &'a mut Session) -> Self { CapturePass { s } } +} + +impl<'a> LateLintPass<'a> for TrivialPass { } +impl<'a, 'b> LateLintPass<'a> for CapturePass<'b> { } + +struct Registry<'a> { sess_mut: &'a mut Session } +impl<'a> Registry<'a> { + fn register_static(&mut self, _: Box) { } + + // Note: there isn't an interesting distinction between these + // different methods explored by any of the cases in the test + // below. pnkfelix just happened to write these cases out while + // exploring variations on `dyn for <'a> Trait<'a> + 'static`, and + // then decided to keep these particular ones in. + fn register_bound(&mut self, _: Box) { } + fn register_univ(&mut self, _: Box LateLintPass<'b> + 'a>) { } + fn register_ref(&mut self, _: &dyn LateLintPass) { } +} + +fn register_plugins<'a>(mk_reg: impl Fn() -> &'a mut Registry<'a>) { + // Not okay without two-phase borrows: The implicit `&mut reg` of + // the receiver is evaluaated first, and that conflicts with the + // `reg.sess_mut` access during argument evaluation. + // + // Okay if we have two-phase borrows: inner borrows do not survive + // to the actual method invocation, because `TrivialPass::new` + // cannot (according to its type) keep them alive. + let reg = mk_reg(); + reg.register_static(Box::new(TrivialPass::new(®.sess_mut))); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + let reg = mk_reg(); + reg.register_bound(Box::new(TrivialPass::new(®.sess_mut))); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + let reg = mk_reg(); + reg.register_univ(Box::new(TrivialPass::new(®.sess_mut))); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + let reg = mk_reg(); + reg.register_ref(&TrivialPass::new(®.sess_mut)); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + + // These are not okay: the inner mutable borrows immediately + // conflict with the outer borrow/reservation, even with support + // for two-phase borrows. + let reg = mk_reg(); + reg.register_static(Box::new(TrivialPass::new(&mut reg.sess_mut))); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + //[nll]~^^^ ERROR cannot borrow `reg.sess_mut` + let reg = mk_reg(); + reg.register_bound(Box::new(TrivialPass::new_mut(&mut reg.sess_mut))); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + //[nll]~^^^ ERROR cannot borrow `reg.sess_mut` + let reg = mk_reg(); + reg.register_univ(Box::new(TrivialPass::new_mut(&mut reg.sess_mut))); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + //[nll]~^^^ ERROR cannot borrow `reg.sess_mut` + let reg = mk_reg(); + reg.register_ref(&TrivialPass::new_mut(&mut reg.sess_mut)); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + //[nll]~^^^ ERROR cannot borrow `reg.sess_mut` + + // These are not okay: the inner borrows may reach the actual + // method invocation, because `CapturePass::new` might (according + // to its type) keep them alive. + // + // (Also, we don't test `register_static` on CapturePass because + // that will fail to get past lifetime inference.) + let reg = mk_reg(); + reg.register_bound(Box::new(CapturePass::new(®.sess_mut))); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + //[nll]~^^^ ERROR cannot borrow `*reg` as mutable + let reg = mk_reg(); + reg.register_univ(Box::new(CapturePass::new(®.sess_mut))); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + //[nll]~^^^ ERROR cannot borrow `*reg` as mutable + let reg = mk_reg(); + reg.register_ref(&CapturePass::new(®.sess_mut)); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + //[nll]~^^^ ERROR cannot borrow `*reg` as mutable + + // These are not okay: the inner mutable borrows immediately + // conflict with the outer borrow/reservation, even with support + // for two-phase borrows. + // + // (Again, we don't test `register_static` on CapturePass because + // that will fail to get past lifetime inference.) + let reg = mk_reg(); + reg.register_bound(Box::new(CapturePass::new_mut(&mut reg.sess_mut))); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + //[nll]~^^^ ERROR cannot borrow `reg.sess_mut` as mutable more than once at a time + //[nll]~^^^^ ERROR cannot borrow `*reg` as mutable more than once at a time + let reg = mk_reg(); + reg.register_univ(Box::new(CapturePass::new_mut(&mut reg.sess_mut))); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + //[nll]~^^^ ERROR cannot borrow `reg.sess_mut` as mutable more than once at a time + //[nll]~^^^^ ERROR cannot borrow `*reg` as mutable more than once at a time + let reg = mk_reg(); + reg.register_ref(&CapturePass::new_mut(&mut reg.sess_mut)); + //[ast]~^ ERROR cannot borrow `reg.sess_mut` + //[no2pb]~^^ ERROR cannot borrow `reg.sess_mut` + //[nll]~^^^ ERROR cannot borrow `reg.sess_mut` as mutable more than once at a time + //[nll]~^^^^ ERROR cannot borrow `*reg` as mutable more than once at a time +} + +fn main() { } diff --git a/src/test/ui/consts/const-int-unchecked.rs b/src/test/ui/consts/const-int-unchecked.rs new file mode 100644 index 000000000000..cbf855633fd2 --- /dev/null +++ b/src/test/ui/consts/const-int-unchecked.rs @@ -0,0 +1,21 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(core_intrinsics)] + +use std::intrinsics; + +const SHR: u8 = unsafe { intrinsics::unchecked_shr(5_u8, 8) }; +//^~ ERROR: Overflowing shift by 8 in unchecked_shr +const SHL: u8 = unsafe { intrinsics::unchecked_shl(5_u8, 8) }; +//^~ ERROR: Overflowing shift by 8 in unchecked_shl + +fn main() { +} diff --git a/src/test/ui/consts/const-int-unchecked.stderr b/src/test/ui/consts/const-int-unchecked.stderr new file mode 100644 index 000000000000..b8fd0facbc1a --- /dev/null +++ b/src/test/ui/consts/const-int-unchecked.stderr @@ -0,0 +1,20 @@ +error: this constant cannot be used + --> $DIR/const-int-unchecked.rs:15:1 + | +LL | const SHR: u8 = unsafe { intrinsics::unchecked_shr(5_u8, 8) }; + | ^^^^^^^^^^^^^^^^^^^^^^^^^----------------------------------^^^ + | | + | Overflowing shift by 8 in unchecked_shr + | + = note: #[deny(const_err)] on by default + +error: this constant cannot be used + --> $DIR/const-int-unchecked.rs:17:1 + | +LL | const SHL: u8 = unsafe { intrinsics::unchecked_shl(5_u8, 8) }; + | ^^^^^^^^^^^^^^^^^^^^^^^^^----------------------------------^^^ + | | + | Overflowing shift by 8 in unchecked_shl + +error: aborting due to 2 previous errors + diff --git a/src/test/ui/issues/issue-8727.rs b/src/test/ui/issues/issue-8727.rs index fc88a2c81b4e..01c02ff8a48d 100644 --- a/src/test/ui/issues/issue-8727.rs +++ b/src/test/ui/issues/issue-8727.rs @@ -15,7 +15,7 @@ fn generic() { generic::>(); } //~^^^ ERROR reached the recursion limit while instantiating `generic:: $DIR/issue-8727.rs:14:1 | LL | fn generic() { - | ^^^^^^^^^^^^^^^ cannot return without recurring + | ^^^^^^^^^^^^^^^ cannot return without recursing LL | generic::>(); | ---------------------- recursive call site | diff --git a/src/test/ui/lint/lint-unconditional-recursion.rs b/src/test/ui/lint/lint-unconditional-recursion.rs index bfc144615a2d..7ca9b6874e76 100644 --- a/src/test/ui/lint/lint-unconditional-recursion.rs +++ b/src/test/ui/lint/lint-unconditional-recursion.rs @@ -11,7 +11,7 @@ #![deny(unconditional_recursion)] #![allow(dead_code)] -fn foo() { //~ ERROR function cannot return without recurring +fn foo() { //~ ERROR function cannot return without recursing foo(); } @@ -21,7 +21,7 @@ fn bar() { } } -fn baz() { //~ ERROR function cannot return without recurring +fn baz() { //~ ERROR function cannot return without recursing if true { baz() } else { @@ -33,7 +33,7 @@ fn qux() { loop {} } -fn quz() -> bool { //~ ERROR function cannot return without recurring +fn quz() -> bool { //~ ERROR function cannot return without recursing if true { while quz() {} true @@ -44,13 +44,13 @@ fn quz() -> bool { //~ ERROR function cannot return without recurring // Trait method calls. trait Foo { - fn bar(&self) { //~ ERROR function cannot return without recurring + fn bar(&self) { //~ ERROR function cannot return without recursing self.bar() } } impl Foo for Box { - fn bar(&self) { //~ ERROR function cannot return without recurring + fn bar(&self) { //~ ERROR function cannot return without recursing loop { self.bar() } @@ -59,7 +59,7 @@ impl Foo for Box { // Trait method call with integer fallback after method resolution. impl Foo for i32 { - fn bar(&self) { //~ ERROR function cannot return without recurring + fn bar(&self) { //~ ERROR function cannot return without recursing 0.bar() } } @@ -72,13 +72,13 @@ impl Foo for u32 { // Trait method calls via paths. trait Foo2 { - fn bar(&self) { //~ ERROR function cannot return without recurring + fn bar(&self) { //~ ERROR function cannot return without recursing Foo2::bar(self) } } impl Foo2 for Box { - fn bar(&self) { //~ ERROR function cannot return without recurring + fn bar(&self) { //~ ERROR function cannot return without recursing loop { Foo2::bar(self) } @@ -88,19 +88,19 @@ impl Foo2 for Box { struct Baz; impl Baz { // Inherent method call. - fn qux(&self) { //~ ERROR function cannot return without recurring + fn qux(&self) { //~ ERROR function cannot return without recursing self.qux(); } // Inherent method call via path. - fn as_ref(&self) -> &Self { //~ ERROR function cannot return without recurring + fn as_ref(&self) -> &Self { //~ ERROR function cannot return without recursing Baz::as_ref(self) } } // Trait method calls to impls via paths. impl Default for Baz { - fn default() -> Baz { //~ ERROR function cannot return without recurring + fn default() -> Baz { //~ ERROR function cannot return without recursing let x = Default::default(); x } @@ -109,14 +109,14 @@ impl Default for Baz { // Overloaded operators. impl std::ops::Deref for Baz { type Target = (); - fn deref(&self) -> &() { //~ ERROR function cannot return without recurring + fn deref(&self) -> &() { //~ ERROR function cannot return without recursing &**self } } impl std::ops::Index for Baz { type Output = Baz; - fn index(&self, x: usize) -> &Baz { //~ ERROR function cannot return without recurring + fn index(&self, x: usize) -> &Baz { //~ ERROR function cannot return without recursing &self[x] } } @@ -125,7 +125,7 @@ impl std::ops::Index for Baz { struct Quux; impl std::ops::Deref for Quux { type Target = Baz; - fn deref(&self) -> &Baz { //~ ERROR function cannot return without recurring + fn deref(&self) -> &Baz { //~ ERROR function cannot return without recursing self.as_ref() } } diff --git a/src/test/ui/lint/lint-unconditional-recursion.stderr b/src/test/ui/lint/lint-unconditional-recursion.stderr index 933c191551da..d0fbdd18ed39 100644 --- a/src/test/ui/lint/lint-unconditional-recursion.stderr +++ b/src/test/ui/lint/lint-unconditional-recursion.stderr @@ -1,8 +1,8 @@ -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:14:1 | -LL | fn foo() { //~ ERROR function cannot return without recurring - | ^^^^^^^^ cannot return without recurring +LL | fn foo() { //~ ERROR function cannot return without recursing + | ^^^^^^^^ cannot return without recursing LL | foo(); | ----- recursive call site | @@ -13,11 +13,11 @@ LL | #![deny(unconditional_recursion)] | ^^^^^^^^^^^^^^^^^^^^^^^ = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:24:1 | -LL | fn baz() { //~ ERROR function cannot return without recurring - | ^^^^^^^^ cannot return without recurring +LL | fn baz() { //~ ERROR function cannot return without recursing + | ^^^^^^^^ cannot return without recursing LL | if true { LL | baz() | ----- recursive call site @@ -27,11 +27,11 @@ LL | baz() | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:36:1 | -LL | fn quz() -> bool { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^^^^ cannot return without recurring +LL | fn quz() -> bool { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^^^^ cannot return without recursing LL | if true { LL | while quz() {} | ----- recursive call site @@ -41,113 +41,113 @@ LL | loop { quz(); } | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:47:5 | -LL | fn bar(&self) { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^ cannot return without recurring +LL | fn bar(&self) { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^ cannot return without recursing LL | self.bar() | ---------- recursive call site | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:53:5 | -LL | fn bar(&self) { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^ cannot return without recurring +LL | fn bar(&self) { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^ cannot return without recursing LL | loop { LL | self.bar() | ---------- recursive call site | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:62:5 | -LL | fn bar(&self) { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^ cannot return without recurring +LL | fn bar(&self) { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^ cannot return without recursing LL | 0.bar() | ------- recursive call site | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:75:5 | -LL | fn bar(&self) { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^ cannot return without recurring +LL | fn bar(&self) { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^ cannot return without recursing LL | Foo2::bar(self) | --------------- recursive call site | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:81:5 | -LL | fn bar(&self) { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^ cannot return without recurring +LL | fn bar(&self) { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^ cannot return without recursing LL | loop { LL | Foo2::bar(self) | --------------- recursive call site | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:91:5 | -LL | fn qux(&self) { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^ cannot return without recurring +LL | fn qux(&self) { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^ cannot return without recursing LL | self.qux(); | ---------- recursive call site | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:96:5 | -LL | fn as_ref(&self) -> &Self { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recurring +LL | fn as_ref(&self) -> &Self { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recursing LL | Baz::as_ref(self) | ----------------- recursive call site | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:103:5 | -LL | fn default() -> Baz { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^^^^^^^ cannot return without recurring +LL | fn default() -> Baz { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^^^^^^^ cannot return without recursing LL | let x = Default::default(); | ------------------ recursive call site | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:112:5 | -LL | fn deref(&self) -> &() { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^^^^^^^^^^ cannot return without recurring +LL | fn deref(&self) -> &() { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^^^^^^^^^^ cannot return without recursing LL | &**self | ------ recursive call site | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:119:5 | -LL | fn index(&self, x: usize) -> &Baz { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recurring +LL | fn index(&self, x: usize) -> &Baz { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recursing LL | &self[x] | ------- recursive call site | = help: a `loop` may express intention better if this is on purpose -error: function cannot return without recurring +error: function cannot return without recursing --> $DIR/lint-unconditional-recursion.rs:128:5 | -LL | fn deref(&self) -> &Baz { //~ ERROR function cannot return without recurring - | ^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recurring +LL | fn deref(&self) -> &Baz { //~ ERROR function cannot return without recursing + | ^^^^^^^^^^^^^^^^^^^^^^^ cannot return without recursing LL | self.as_ref() | ---- recursive call site | diff --git a/src/test/run-pass/allocator/auxiliary/custom-as-global.rs b/src/test/ui/run-pass/allocator/auxiliary/custom-as-global.rs similarity index 100% rename from src/test/run-pass/allocator/auxiliary/custom-as-global.rs rename to src/test/ui/run-pass/allocator/auxiliary/custom-as-global.rs diff --git a/src/test/run-pass/allocator/auxiliary/custom.rs b/src/test/ui/run-pass/allocator/auxiliary/custom.rs similarity index 100% rename from src/test/run-pass/allocator/auxiliary/custom.rs rename to src/test/ui/run-pass/allocator/auxiliary/custom.rs diff --git a/src/test/run-pass/allocator/auxiliary/helper.rs b/src/test/ui/run-pass/allocator/auxiliary/helper.rs similarity index 100% rename from src/test/run-pass/allocator/auxiliary/helper.rs rename to src/test/ui/run-pass/allocator/auxiliary/helper.rs diff --git a/src/test/run-pass/allocator/custom.rs b/src/test/ui/run-pass/allocator/custom.rs similarity index 99% rename from src/test/run-pass/allocator/custom.rs rename to src/test/ui/run-pass/allocator/custom.rs index 3a7f8fa86209..9617f7d4685d 100644 --- a/src/test/run-pass/allocator/custom.rs +++ b/src/test/ui/run-pass/allocator/custom.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:helper.rs // no-prefer-dynamic diff --git a/src/test/run-pass/allocator/xcrate-use.rs b/src/test/ui/run-pass/allocator/xcrate-use.rs similarity index 99% rename from src/test/run-pass/allocator/xcrate-use.rs rename to src/test/ui/run-pass/allocator/xcrate-use.rs index 482e3b04aae2..8b9e1e329f7b 100644 --- a/src/test/run-pass/allocator/xcrate-use.rs +++ b/src/test/ui/run-pass/allocator/xcrate-use.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:custom.rs // aux-build:helper.rs // no-prefer-dynamic diff --git a/src/test/run-pass/allocator/xcrate-use2.rs b/src/test/ui/run-pass/allocator/xcrate-use2.rs similarity index 99% rename from src/test/run-pass/allocator/xcrate-use2.rs rename to src/test/ui/run-pass/allocator/xcrate-use2.rs index 7a45fd28bdbc..2e52f28d3117 100644 --- a/src/test/run-pass/allocator/xcrate-use2.rs +++ b/src/test/ui/run-pass/allocator/xcrate-use2.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:custom.rs // aux-build:custom-as-global.rs // aux-build:helper.rs diff --git a/src/test/run-pass/arr_cycle.rs b/src/test/ui/run-pass/array-slice-vec/arr_cycle.rs similarity index 98% rename from src/test/run-pass/arr_cycle.rs rename to src/test/ui/run-pass/array-slice-vec/arr_cycle.rs index 400458b614b3..4029a270c8d1 100644 --- a/src/test/run-pass/arr_cycle.rs +++ b/src/test/ui/run-pass/array-slice-vec/arr_cycle.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::cell::Cell; #[derive(Debug)] diff --git a/src/test/run-pass/array_const_index-1.rs b/src/test/ui/run-pass/array-slice-vec/array_const_index-1.rs similarity index 94% rename from src/test/run-pass/array_const_index-1.rs rename to src/test/ui/run-pass/array-slice-vec/array_const_index-1.rs index 3e4504eb1957..c026a47c4f9e 100644 --- a/src/test/run-pass/array_const_index-1.rs +++ b/src/test/ui/run-pass/array-slice-vec/array_const_index-1.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + #![feature(const_indexing)] fn main() { diff --git a/src/test/run-pass/box-of-array-of-drop-1.rs b/src/test/ui/run-pass/array-slice-vec/box-of-array-of-drop-1.rs similarity index 97% rename from src/test/run-pass/box-of-array-of-drop-1.rs rename to src/test/ui/run-pass/array-slice-vec/box-of-array-of-drop-1.rs index db055e6886a8..5d6cc5f686e7 100644 --- a/src/test/run-pass/box-of-array-of-drop-1.rs +++ b/src/test/ui/run-pass/array-slice-vec/box-of-array-of-drop-1.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(overflowing_literals)] + // Test that we cleanup a fixed size Box<[D; k]> properly when D has a // destructor. diff --git a/src/test/run-pass/box-of-array-of-drop-2.rs b/src/test/ui/run-pass/array-slice-vec/box-of-array-of-drop-2.rs similarity index 97% rename from src/test/run-pass/box-of-array-of-drop-2.rs rename to src/test/ui/run-pass/array-slice-vec/box-of-array-of-drop-2.rs index 9dde53bb31dc..d2dedc4602aa 100644 --- a/src/test/run-pass/box-of-array-of-drop-2.rs +++ b/src/test/ui/run-pass/array-slice-vec/box-of-array-of-drop-2.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(overflowing_literals)] + // Test that we cleanup dynamic sized Box<[D]> properly when D has a // destructor. diff --git a/src/test/run-pass/cast-in-array-size.rs b/src/test/ui/run-pass/array-slice-vec/cast-in-array-size.rs similarity index 98% rename from src/test/run-pass/cast-in-array-size.rs rename to src/test/ui/run-pass/array-slice-vec/cast-in-array-size.rs index 6f1fafba563a..d78bc0b0072d 100644 --- a/src/test/run-pass/cast-in-array-size.rs +++ b/src/test/ui/run-pass/array-slice-vec/cast-in-array-size.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // issues #10618 and #16382 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/check-static-mut-slices.rs b/src/test/ui/run-pass/array-slice-vec/check-static-mut-slices.rs similarity index 98% rename from src/test/run-pass/check-static-mut-slices.rs rename to src/test/ui/run-pass/array-slice-vec/check-static-mut-slices.rs index 1cfe5bdaebb7..3d2fc8195eb2 100644 --- a/src/test/run-pass/check-static-mut-slices.rs +++ b/src/test/ui/run-pass/array-slice-vec/check-static-mut-slices.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Checks that mutable static items can have mutable slices diff --git a/src/test/run-pass/check-static-slice.rs b/src/test/ui/run-pass/array-slice-vec/check-static-slice.rs similarity index 98% rename from src/test/run-pass/check-static-slice.rs rename to src/test/ui/run-pass/array-slice-vec/check-static-slice.rs index b5f2bea5a388..6627095c32bc 100644 --- a/src/test/run-pass/check-static-slice.rs +++ b/src/test/ui/run-pass/array-slice-vec/check-static-slice.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Check that the various ways of getting to a reference to a vec (both sized // and unsized) work properly. diff --git a/src/test/run-pass/copy-out-of-array-1.rs b/src/test/ui/run-pass/array-slice-vec/copy-out-of-array-1.rs similarity index 98% rename from src/test/run-pass/copy-out-of-array-1.rs rename to src/test/ui/run-pass/array-slice-vec/copy-out-of-array-1.rs index 54147c73ff0f..917683e4eeb9 100644 --- a/src/test/run-pass/copy-out-of-array-1.rs +++ b/src/test/ui/run-pass/array-slice-vec/copy-out-of-array-1.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Ensure that we can copy out of a fixed-size array. // // (Compare with compile-fail/move-out-of-array-1.rs) diff --git a/src/test/run-pass/destructure-array-1.rs b/src/test/ui/run-pass/array-slice-vec/destructure-array-1.rs similarity index 98% rename from src/test/run-pass/destructure-array-1.rs rename to src/test/ui/run-pass/array-slice-vec/destructure-array-1.rs index 43271162c181..17620f62be6a 100644 --- a/src/test/run-pass/destructure-array-1.rs +++ b/src/test/ui/run-pass/array-slice-vec/destructure-array-1.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Ensure that we can do a destructuring bind of a fixed-size array, // even when the element type has a destructor. diff --git a/src/test/run-pass/empty-mutable-vec.rs b/src/test/ui/run-pass/array-slice-vec/empty-mutable-vec.rs similarity index 97% rename from src/test/run-pass/empty-mutable-vec.rs rename to src/test/ui/run-pass/array-slice-vec/empty-mutable-vec.rs index 757579faa17c..7411d5743212 100644 --- a/src/test/run-pass/empty-mutable-vec.rs +++ b/src/test/ui/run-pass/array-slice-vec/empty-mutable-vec.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // pretty-expanded FIXME #23616 #![allow(unused_mut)] diff --git a/src/test/run-pass/estr-slice.rs b/src/test/ui/run-pass/array-slice-vec/estr-slice.rs similarity index 98% rename from src/test/run-pass/estr-slice.rs rename to src/test/ui/run-pass/array-slice-vec/estr-slice.rs index 5364cdc627f5..768229aafbf5 100644 --- a/src/test/run-pass/estr-slice.rs +++ b/src/test/ui/run-pass/array-slice-vec/estr-slice.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { let x = "hello"; diff --git a/src/test/run-pass/evec-slice.rs b/src/test/ui/run-pass/array-slice-vec/evec-slice.rs similarity index 97% rename from src/test/run-pass/evec-slice.rs rename to src/test/ui/run-pass/array-slice-vec/evec-slice.rs index 52ccbe52d460..7f54801910b7 100644 --- a/src/test/run-pass/evec-slice.rs +++ b/src/test/ui/run-pass/array-slice-vec/evec-slice.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![allow(dead_assignment)] +// run-pass pub fn main() { let x : &[isize] = &[1,2,3,4,5]; diff --git a/src/test/run-pass/fixed_length_copy.rs b/src/test/ui/run-pass/array-slice-vec/fixed_length_copy.rs similarity index 97% rename from src/test/run-pass/fixed_length_copy.rs rename to src/test/ui/run-pass/array-slice-vec/fixed_length_copy.rs index eefd94475358..09492e37e28b 100644 --- a/src/test/run-pass/fixed_length_copy.rs +++ b/src/test/ui/run-pass/array-slice-vec/fixed_length_copy.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { let arr = [1,2,3]; diff --git a/src/test/run-pass/huge-largest-array.rs b/src/test/ui/run-pass/array-slice-vec/huge-largest-array.rs similarity index 98% rename from src/test/run-pass/huge-largest-array.rs rename to src/test/ui/run-pass/array-slice-vec/huge-largest-array.rs index f0bb31b8470f..27b4e68e771c 100644 --- a/src/test/run-pass/huge-largest-array.rs +++ b/src/test/ui/run-pass/array-slice-vec/huge-largest-array.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::mem::size_of; diff --git a/src/test/run-pass/ivec-pass-by-value.rs b/src/test/ui/run-pass/array-slice-vec/ivec-pass-by-value.rs similarity index 97% rename from src/test/run-pass/ivec-pass-by-value.rs rename to src/test/ui/run-pass/array-slice-vec/ivec-pass-by-value.rs index e3b42e60645a..2f3efef56369 100644 --- a/src/test/run-pass/ivec-pass-by-value.rs +++ b/src/test/ui/run-pass/array-slice-vec/ivec-pass-by-value.rs @@ -8,5 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + fn f(_a: Vec ) { } pub fn main() { f(vec![1, 2, 3, 4, 5]); } diff --git a/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs b/src/test/ui/run-pass/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs similarity index 98% rename from src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs rename to src/test/ui/run-pass/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs index 8b5b290aa6fb..49dc348952ba 100644 --- a/src/test/run-pass/mutability-inherits-through-fixed-length-vec.rs +++ b/src/test/ui/run-pass/array-slice-vec/mutability-inherits-through-fixed-length-vec.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + fn test1() { let mut ints = [0; 32]; diff --git a/src/test/run-pass/mutable-alias-vec.rs b/src/test/ui/run-pass/array-slice-vec/mutable-alias-vec.rs similarity index 98% rename from src/test/run-pass/mutable-alias-vec.rs rename to src/test/ui/run-pass/array-slice-vec/mutable-alias-vec.rs index 3f90cedca9b5..dc2548ad53c4 100644 --- a/src/test/run-pass/mutable-alias-vec.rs +++ b/src/test/ui/run-pass/array-slice-vec/mutable-alias-vec.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + fn grow(v: &mut Vec ) { v.push(1); } diff --git a/src/test/run-pass/nested-vec-1.rs b/src/test/ui/run-pass/array-slice-vec/nested-vec-1.rs similarity index 97% rename from src/test/run-pass/nested-vec-1.rs rename to src/test/ui/run-pass/array-slice-vec/nested-vec-1.rs index 2b92ed38eab8..62bcc5f72543 100644 --- a/src/test/run-pass/nested-vec-1.rs +++ b/src/test/ui/run-pass/array-slice-vec/nested-vec-1.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that using the `vec!` macro nested within itself works fn main() { diff --git a/src/test/run-pass/nested-vec-2.rs b/src/test/ui/run-pass/array-slice-vec/nested-vec-2.rs similarity index 98% rename from src/test/run-pass/nested-vec-2.rs rename to src/test/ui/run-pass/array-slice-vec/nested-vec-2.rs index 669f9e4f4bb7..4af2350cc369 100644 --- a/src/test/run-pass/nested-vec-2.rs +++ b/src/test/ui/run-pass/array-slice-vec/nested-vec-2.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that using the `vec!` macro nested within itself works // when the contents implement Drop diff --git a/src/test/run-pass/nested-vec-3.rs b/src/test/ui/run-pass/array-slice-vec/nested-vec-3.rs similarity index 98% rename from src/test/run-pass/nested-vec-3.rs rename to src/test/ui/run-pass/array-slice-vec/nested-vec-3.rs index d1a63b443927..dc3146a2b351 100644 --- a/src/test/run-pass/nested-vec-3.rs +++ b/src/test/ui/run-pass/array-slice-vec/nested-vec-3.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(overflowing_literals)] + // ignore-emscripten no threads support // Test that using the `vec!` macro nested within itself works when diff --git a/src/test/run-pass/new-style-fixed-length-vec.rs b/src/test/ui/run-pass/array-slice-vec/new-style-fixed-length-vec.rs similarity index 97% rename from src/test/run-pass/new-style-fixed-length-vec.rs rename to src/test/ui/run-pass/array-slice-vec/new-style-fixed-length-vec.rs index 4d9f0394eb44..268fa5c4b59a 100644 --- a/src/test/run-pass/new-style-fixed-length-vec.rs +++ b/src/test/ui/run-pass/array-slice-vec/new-style-fixed-length-vec.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + static FOO: [isize; 3] = [1, 2, 3]; pub fn main() { diff --git a/src/test/run-pass/rcvr-borrowed-to-slice.rs b/src/test/ui/run-pass/array-slice-vec/rcvr-borrowed-to-slice.rs similarity index 95% rename from src/test/run-pass/rcvr-borrowed-to-slice.rs rename to src/test/ui/run-pass/array-slice-vec/rcvr-borrowed-to-slice.rs index efa73ad92ce8..76302b92ed03 100644 --- a/src/test/run-pass/rcvr-borrowed-to-slice.rs +++ b/src/test/ui/run-pass/array-slice-vec/rcvr-borrowed-to-slice.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + +#![allow(non_camel_case_types)] trait sum { fn sum_(self) -> isize; diff --git a/src/test/run-pass/repeated-vector-syntax.rs b/src/test/ui/run-pass/array-slice-vec/repeated-vector-syntax.rs similarity index 98% rename from src/test/run-pass/repeated-vector-syntax.rs rename to src/test/ui/run-pass/array-slice-vec/repeated-vector-syntax.rs index 6d72e9774dca..d706be4c3367 100644 --- a/src/test/run-pass/repeated-vector-syntax.rs +++ b/src/test/ui/run-pass/array-slice-vec/repeated-vector-syntax.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { let x = [ [true]; 512 ]; let y = [ 0; 1 ]; diff --git a/src/test/run-pass/show-boxed-slice.rs b/src/test/ui/run-pass/array-slice-vec/show-boxed-slice.rs similarity index 97% rename from src/test/run-pass/show-boxed-slice.rs rename to src/test/ui/run-pass/array-slice-vec/show-boxed-slice.rs index 47d0737dfc45..dda4ce9f227b 100644 --- a/src/test/run-pass/show-boxed-slice.rs +++ b/src/test/ui/run-pass/array-slice-vec/show-boxed-slice.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #[derive(Debug)] struct Foo(Box<[u8]>); diff --git a/src/test/run-pass/slice-2.rs b/src/test/ui/run-pass/array-slice-vec/slice-2.rs similarity index 99% rename from src/test/run-pass/slice-2.rs rename to src/test/ui/run-pass/array-slice-vec/slice-2.rs index 3a99fd9af932..1f71ceac04f9 100644 --- a/src/test/run-pass/slice-2.rs +++ b/src/test/ui/run-pass/array-slice-vec/slice-2.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test slicing expressions on slices and Vecs. diff --git a/src/test/run-pass/slice-of-zero-size-elements.rs b/src/test/ui/run-pass/array-slice-vec/slice-of-zero-size-elements.rs similarity index 97% rename from src/test/run-pass/slice-of-zero-size-elements.rs rename to src/test/ui/run-pass/array-slice-vec/slice-of-zero-size-elements.rs index ab22b820503a..671246f6a63a 100644 --- a/src/test/run-pass/slice-of-zero-size-elements.rs +++ b/src/test/ui/run-pass/array-slice-vec/slice-of-zero-size-elements.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // compile-flags: -C debug-assertions #![feature(iter_to_slice)] diff --git a/src/test/run-pass/slice-panic-1.rs b/src/test/ui/run-pass/array-slice-vec/slice-panic-1.rs similarity index 98% rename from src/test/run-pass/slice-panic-1.rs rename to src/test/ui/run-pass/array-slice-vec/slice-panic-1.rs index afec06adc864..b9d816acaa22 100644 --- a/src/test/run-pass/slice-panic-1.rs +++ b/src/test/ui/run-pass/array-slice-vec/slice-panic-1.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // ignore-emscripten no threads support // Test that if a slicing expr[..] fails, the correct cleanups happen. diff --git a/src/test/run-pass/slice-panic-2.rs b/src/test/ui/run-pass/array-slice-vec/slice-panic-2.rs similarity index 98% rename from src/test/run-pass/slice-panic-2.rs rename to src/test/ui/run-pass/array-slice-vec/slice-panic-2.rs index 2932b585b880..787d10b042f8 100644 --- a/src/test/run-pass/slice-panic-2.rs +++ b/src/test/ui/run-pass/array-slice-vec/slice-panic-2.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // ignore-emscripten no threads support // Test that if a slicing expr[..] fails, the correct cleanups happen. diff --git a/src/test/run-pass/slice.rs b/src/test/ui/run-pass/array-slice-vec/slice.rs similarity index 99% rename from src/test/run-pass/slice.rs rename to src/test/ui/run-pass/array-slice-vec/slice.rs index dfd7b947c57e..6c43d8832302 100644 --- a/src/test/run-pass/slice.rs +++ b/src/test/ui/run-pass/array-slice-vec/slice.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test slicing sugar. extern crate core; diff --git a/src/test/run-pass/slice_binary_search.rs b/src/test/ui/run-pass/array-slice-vec/slice_binary_search.rs similarity index 98% rename from src/test/run-pass/slice_binary_search.rs rename to src/test/ui/run-pass/array-slice-vec/slice_binary_search.rs index 80b370d58fc5..081b06bea5c1 100644 --- a/src/test/run-pass/slice_binary_search.rs +++ b/src/test/ui/run-pass/array-slice-vec/slice_binary_search.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test binary_search_by_key lifetime. Issue #34683 #[derive(Debug)] diff --git a/src/test/run-pass/variance-vec-covariant.rs b/src/test/ui/run-pass/array-slice-vec/variance-vec-covariant.rs similarity index 98% rename from src/test/run-pass/variance-vec-covariant.rs rename to src/test/ui/run-pass/array-slice-vec/variance-vec-covariant.rs index caec6df5a4d8..5cf52006f3c2 100644 --- a/src/test/run-pass/variance-vec-covariant.rs +++ b/src/test/ui/run-pass/array-slice-vec/variance-vec-covariant.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that vec is now covariant in its argument type. #![allow(dead_code)] diff --git a/src/test/run-pass/vec-concat.rs b/src/test/ui/run-pass/array-slice-vec/vec-concat.rs similarity index 98% rename from src/test/run-pass/vec-concat.rs rename to src/test/ui/run-pass/array-slice-vec/vec-concat.rs index 8ba8df57e542..7c734d8d6a2b 100644 --- a/src/test/run-pass/vec-concat.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-concat.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::vec; pub fn main() { diff --git a/src/test/run-pass/vec-dst.rs b/src/test/ui/run-pass/array-slice-vec/vec-dst.rs similarity index 98% rename from src/test/run-pass/vec-dst.rs rename to src/test/ui/run-pass/array-slice-vec/vec-dst.rs index cf4222b405e8..6421b69d22e3 100644 --- a/src/test/run-pass/vec-dst.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-dst.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/vec-fixed-length.rs b/src/test/ui/run-pass/array-slice-vec/vec-fixed-length.rs similarity index 98% rename from src/test/run-pass/vec-fixed-length.rs rename to src/test/ui/run-pass/array-slice-vec/vec-fixed-length.rs index befb27e6ccb0..a7b867941323 100644 --- a/src/test/run-pass/vec-fixed-length.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-fixed-length.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::mem::size_of; diff --git a/src/test/run-pass/vec-growth.rs b/src/test/ui/run-pass/array-slice-vec/vec-growth.rs similarity index 98% rename from src/test/run-pass/vec-growth.rs rename to src/test/ui/run-pass/array-slice-vec/vec-growth.rs index 5bf6a457df9b..e783a799c056 100644 --- a/src/test/run-pass/vec-growth.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-growth.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { diff --git a/src/test/run-pass/vec-late-init.rs b/src/test/ui/run-pass/array-slice-vec/vec-late-init.rs similarity index 97% rename from src/test/run-pass/vec-late-init.rs rename to src/test/ui/run-pass/array-slice-vec/vec-late-init.rs index 420f6a429f1f..dc7241a0e05c 100644 --- a/src/test/run-pass/vec-late-init.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-late-init.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { let mut later: Vec ; diff --git a/src/test/run-pass/vec-macro-no-std.rs b/src/test/ui/run-pass/array-slice-vec/vec-macro-no-std.rs similarity index 98% rename from src/test/run-pass/vec-macro-no-std.rs rename to src/test/ui/run-pass/array-slice-vec/vec-macro-no-std.rs index 56ff9cb24774..509167413b6f 100644 --- a/src/test/run-pass/vec-macro-no-std.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-macro-no-std.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // ignore-emscripten no no_std executables #![feature(lang_items, start, libc, alloc)] diff --git a/src/test/run-pass/vec-macro-repeat.rs b/src/test/ui/run-pass/array-slice-vec/vec-macro-repeat.rs similarity index 98% rename from src/test/run-pass/vec-macro-repeat.rs rename to src/test/ui/run-pass/array-slice-vec/vec-macro-repeat.rs index d178041b85e1..36c8b7cffabe 100644 --- a/src/test/run-pass/vec-macro-repeat.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-macro-repeat.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { diff --git a/src/test/run-pass/vec-macro-rvalue-scope.rs b/src/test/ui/run-pass/array-slice-vec/vec-macro-rvalue-scope.rs similarity index 98% rename from src/test/run-pass/vec-macro-rvalue-scope.rs rename to src/test/ui/run-pass/array-slice-vec/vec-macro-rvalue-scope.rs index 305755347d04..8ccf22e62887 100644 --- a/src/test/run-pass/vec-macro-rvalue-scope.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-macro-rvalue-scope.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + fn one() -> i32 { 1 } diff --git a/src/test/run-pass/vec-macro-with-brackets.rs b/src/test/ui/run-pass/array-slice-vec/vec-macro-with-brackets.rs similarity index 98% rename from src/test/run-pass/vec-macro-with-brackets.rs rename to src/test/ui/run-pass/array-slice-vec/vec-macro-with-brackets.rs index cccf807572a4..b5d1459300ae 100644 --- a/src/test/run-pass/vec-macro-with-brackets.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-macro-with-brackets.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // pretty-expanded FIXME #23616 macro_rules! vec [ diff --git a/src/test/run-pass/vec-macro-with-trailing-comma.rs b/src/test/ui/run-pass/array-slice-vec/vec-macro-with-trailing-comma.rs similarity index 97% rename from src/test/run-pass/vec-macro-with-trailing-comma.rs rename to src/test/ui/run-pass/array-slice-vec/vec-macro-with-trailing-comma.rs index 135ecb474984..046d634b19d4 100644 --- a/src/test/run-pass/vec-macro-with-trailing-comma.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-macro-with-trailing-comma.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { diff --git a/src/test/run-pass/vec-matching-autoslice.rs b/src/test/ui/run-pass/array-slice-vec/vec-matching-autoslice.rs similarity index 92% rename from src/test/run-pass/vec-matching-autoslice.rs rename to src/test/ui/run-pass/array-slice-vec/vec-matching-autoslice.rs index 7268536a51fa..b5cefb48ce79 100644 --- a/src/test/run-pass/vec-matching-autoslice.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-matching-autoslice.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(illegal_floating_point_literal_pattern)] // FIXME #41620 + pub fn main() { let x = [1, 2, 3]; match x { diff --git a/src/test/run-pass/vec-matching-fixed.rs b/src/test/ui/run-pass/array-slice-vec/vec-matching-fixed.rs similarity index 98% rename from src/test/run-pass/vec-matching-fixed.rs rename to src/test/ui/run-pass/array-slice-vec/vec-matching-fixed.rs index 060d152488a9..7bfecdd2c7f3 100644 --- a/src/test/run-pass/vec-matching-fixed.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-matching-fixed.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(slice_patterns)] fn a() { diff --git a/src/test/run-pass/vec-matching-fold.rs b/src/test/ui/run-pass/array-slice-vec/vec-matching-fold.rs similarity index 99% rename from src/test/run-pass/vec-matching-fold.rs rename to src/test/ui/run-pass/array-slice-vec/vec-matching-fold.rs index 1a30f875580c..b1aa7f1b70c8 100644 --- a/src/test/run-pass/vec-matching-fold.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-matching-fold.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(slice_patterns)] use std::fmt::Debug; diff --git a/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs b/src/test/ui/run-pass/array-slice-vec/vec-matching-legal-tail-element-borrow.rs similarity index 98% rename from src/test/run-pass/vec-matching-legal-tail-element-borrow.rs rename to src/test/ui/run-pass/array-slice-vec/vec-matching-legal-tail-element-borrow.rs index eecc3e7afdbb..e727e56c0f8e 100644 --- a/src/test/run-pass/vec-matching-legal-tail-element-borrow.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-matching-legal-tail-element-borrow.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(slice_patterns)] pub fn main() { diff --git a/src/test/run-pass/vec-matching.rs b/src/test/ui/run-pass/array-slice-vec/vec-matching.rs similarity index 99% rename from src/test/run-pass/vec-matching.rs rename to src/test/ui/run-pass/array-slice-vec/vec-matching.rs index ace418f21606..8d1ef6f755a3 100644 --- a/src/test/run-pass/vec-matching.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-matching.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(slice_patterns)] fn a() { diff --git a/src/test/run-pass/vec-push.rs b/src/test/ui/run-pass/array-slice-vec/vec-push.rs similarity index 97% rename from src/test/run-pass/vec-push.rs rename to src/test/ui/run-pass/array-slice-vec/vec-push.rs index 14a52cc4b5c5..360568048c08 100644 --- a/src/test/run-pass/vec-push.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-push.rs @@ -8,4 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { let mut v = vec![1, 2, 3]; v.push(1); } diff --git a/src/test/run-pass/vec-repeat-with-cast.rs b/src/test/ui/run-pass/array-slice-vec/vec-repeat-with-cast.rs similarity index 97% rename from src/test/run-pass/vec-repeat-with-cast.rs rename to src/test/ui/run-pass/array-slice-vec/vec-repeat-with-cast.rs index a6ca02d4fa90..650de32fe614 100644 --- a/src/test/run-pass/vec-repeat-with-cast.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-repeat-with-cast.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // pretty-expanded FIXME #23616 pub fn main() { let _a = [0; 1 as usize]; } diff --git a/src/test/run-pass/vec-slice-drop.rs b/src/test/ui/run-pass/array-slice-vec/vec-slice-drop.rs similarity index 95% rename from src/test/run-pass/vec-slice-drop.rs rename to src/test/ui/run-pass/array-slice-vec/vec-slice-drop.rs index 86d34d38f744..189d5a38ae3c 100644 --- a/src/test/run-pass/vec-slice-drop.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-slice-drop.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + +#![allow(non_camel_case_types)] + use std::cell::Cell; // Make sure that destructors get run on slice literals diff --git a/src/test/run-pass/vec-slice.rs b/src/test/ui/run-pass/array-slice-vec/vec-slice.rs similarity index 97% rename from src/test/run-pass/vec-slice.rs rename to src/test/ui/run-pass/array-slice-vec/vec-slice.rs index a7e6cae93b34..8ad662f0c634 100644 --- a/src/test/run-pass/vec-slice.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-slice.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { let v = vec![1,2,3,4,5]; diff --git a/src/test/run-pass/vec-tail-matching.rs b/src/test/ui/run-pass/array-slice-vec/vec-tail-matching.rs similarity index 99% rename from src/test/run-pass/vec-tail-matching.rs rename to src/test/ui/run-pass/array-slice-vec/vec-tail-matching.rs index 4f31405ead50..46a882a2ae1b 100644 --- a/src/test/run-pass/vec-tail-matching.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-tail-matching.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(slice_patterns)] struct Foo { diff --git a/src/test/run-pass/vec-to_str.rs b/src/test/ui/run-pass/array-slice-vec/vec-to_str.rs similarity index 98% rename from src/test/run-pass/vec-to_str.rs rename to src/test/ui/run-pass/array-slice-vec/vec-to_str.rs index 1fed6a0be486..4facc0e6892e 100644 --- a/src/test/run-pass/vec-to_str.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec-to_str.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { assert_eq!(format!("{:?}", vec![0, 1]), "[0, 1]".to_string()); diff --git a/src/test/run-pass/vec.rs b/src/test/ui/run-pass/array-slice-vec/vec.rs similarity index 98% rename from src/test/run-pass/vec.rs rename to src/test/ui/run-pass/array-slice-vec/vec.rs index 9cacb9db20ea..34a8e125a5ce 100644 --- a/src/test/run-pass/vec.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub fn main() { diff --git a/src/test/run-pass/vec_cycle.rs b/src/test/ui/run-pass/array-slice-vec/vec_cycle.rs similarity index 98% rename from src/test/run-pass/vec_cycle.rs rename to src/test/ui/run-pass/array-slice-vec/vec_cycle.rs index d5da8b35b6db..3222b0e789d0 100644 --- a/src/test/run-pass/vec_cycle.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec_cycle.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::cell::Cell; #[derive(Debug)] diff --git a/src/test/run-pass/vec_cycle_wrapped.rs b/src/test/ui/run-pass/array-slice-vec/vec_cycle_wrapped.rs similarity index 99% rename from src/test/run-pass/vec_cycle_wrapped.rs rename to src/test/ui/run-pass/array-slice-vec/vec_cycle_wrapped.rs index 56480268a01b..355f9d3e40ed 100644 --- a/src/test/run-pass/vec_cycle_wrapped.rs +++ b/src/test/ui/run-pass/array-slice-vec/vec_cycle_wrapped.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::cell::Cell; #[derive(Debug)] diff --git a/src/test/run-pass/vector-no-ann-2.rs b/src/test/ui/run-pass/array-slice-vec/vector-no-ann-2.rs similarity index 97% rename from src/test/run-pass/vector-no-ann-2.rs rename to src/test/ui/run-pass/array-slice-vec/vector-no-ann-2.rs index 09e70cf03cad..0b09545c0aa6 100644 --- a/src/test/run-pass/vector-no-ann-2.rs +++ b/src/test/ui/run-pass/array-slice-vec/vector-no-ann-2.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/associated-const-const-eval.rs b/src/test/ui/run-pass/associated-consts/associated-const-const-eval.rs similarity index 98% rename from src/test/run-pass/associated-const-const-eval.rs rename to src/test/ui/run-pass/associated-consts/associated-const-const-eval.rs index 9c36a42527f1..3ef8e6c2478c 100644 --- a/src/test/run-pass/associated-const-const-eval.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-const-eval.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { const NUM: usize; diff --git a/src/test/run-pass/associated-const-cross-crate-const-eval.rs b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate-const-eval.rs similarity index 98% rename from src/test/run-pass/associated-const-cross-crate-const-eval.rs rename to src/test/ui/run-pass/associated-consts/associated-const-cross-crate-const-eval.rs index c2758b1aed77..c0f1d93c2539 100644 --- a/src/test/run-pass/associated-const-cross-crate-const-eval.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate-const-eval.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:associated-const-cc-lib.rs diff --git a/src/test/run-pass/associated-const-cross-crate-defaults.rs b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate-defaults.rs similarity index 98% rename from src/test/run-pass/associated-const-cross-crate-defaults.rs rename to src/test/ui/run-pass/associated-consts/associated-const-cross-crate-defaults.rs index 084c448ba2ab..7d85c7021ab6 100644 --- a/src/test/run-pass/associated-const-cross-crate-defaults.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate-defaults.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:associated-const-cc-lib.rs diff --git a/src/test/run-pass/associated-const-cross-crate.rs b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate.rs similarity index 98% rename from src/test/run-pass/associated-const-cross-crate.rs rename to src/test/ui/run-pass/associated-consts/associated-const-cross-crate.rs index a882d6ae23d8..0f1bde4b4db7 100644 --- a/src/test/run-pass/associated-const-cross-crate.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:associated-const-cc-lib.rs diff --git a/src/test/run-pass/associated-const-in-global-const.rs b/src/test/ui/run-pass/associated-consts/associated-const-in-global-const.rs similarity index 98% rename from src/test/run-pass/associated-const-in-global-const.rs rename to src/test/ui/run-pass/associated-consts/associated-const-in-global-const.rs index b7fb4d73259b..089bf07b9c78 100644 --- a/src/test/run-pass/associated-const-in-global-const.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-in-global-const.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo; diff --git a/src/test/run-pass/associated-const-inherent-impl.rs b/src/test/ui/run-pass/associated-consts/associated-const-inherent-impl.rs similarity index 97% rename from src/test/run-pass/associated-const-inherent-impl.rs rename to src/test/ui/run-pass/associated-consts/associated-const-inherent-impl.rs index 86454a4a0911..60b794015f9c 100644 --- a/src/test/run-pass/associated-const-inherent-impl.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-inherent-impl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo; diff --git a/src/test/run-pass/associated-const-marks-live-code.rs b/src/test/ui/run-pass/associated-consts/associated-const-marks-live-code.rs similarity index 98% rename from src/test/run-pass/associated-const-marks-live-code.rs rename to src/test/ui/run-pass/associated-consts/associated-const-marks-live-code.rs index bfeb78ddfe5c..de9edfc679e9 100644 --- a/src/test/run-pass/associated-const-marks-live-code.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-marks-live-code.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(dead_code)] diff --git a/src/test/run-pass/associated-const-match-patterns.rs b/src/test/ui/run-pass/associated-consts/associated-const-match-patterns.rs similarity index 99% rename from src/test/run-pass/associated-const-match-patterns.rs rename to src/test/ui/run-pass/associated-consts/associated-const-match-patterns.rs index 54603e6e0d9a..9fbce1cebf31 100644 --- a/src/test/run-pass/associated-const-match-patterns.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-match-patterns.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:empty-struct.rs diff --git a/src/test/run-pass/associated-const-outer-ty-refs.rs b/src/test/ui/run-pass/associated-consts/associated-const-outer-ty-refs.rs similarity index 98% rename from src/test/run-pass/associated-const-outer-ty-refs.rs rename to src/test/ui/run-pass/associated-consts/associated-const-outer-ty-refs.rs index 987c64dbff56..c62e073a6a71 100644 --- a/src/test/run-pass/associated-const-outer-ty-refs.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-outer-ty-refs.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Lattice { const BOTTOM: Self; } diff --git a/src/test/run-pass/associated-const-overwrite-default.rs b/src/test/ui/run-pass/associated-consts/associated-const-overwrite-default.rs similarity index 98% rename from src/test/run-pass/associated-const-overwrite-default.rs rename to src/test/ui/run-pass/associated-consts/associated-const-overwrite-default.rs index bb594cfa0f97..0e225d7117e6 100644 --- a/src/test/run-pass/associated-const-overwrite-default.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-overwrite-default.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { const ID: i32 = 2; diff --git a/src/test/run-pass/associated-const-public-impl.rs b/src/test/ui/run-pass/associated-consts/associated-const-public-impl.rs similarity index 98% rename from src/test/run-pass/associated-const-public-impl.rs rename to src/test/ui/run-pass/associated-consts/associated-const-public-impl.rs index 5ff363844a12..8c11ae69ded7 100644 --- a/src/test/run-pass/associated-const-public-impl.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-public-impl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod bar1 { pub use self::bar2::Foo; diff --git a/src/test/run-pass/associated-const-range-match-patterns.rs b/src/test/ui/run-pass/associated-consts/associated-const-range-match-patterns.rs similarity index 98% rename from src/test/run-pass/associated-const-range-match-patterns.rs rename to src/test/ui/run-pass/associated-consts/associated-const-range-match-patterns.rs index d72e1efc4d74..eeff27753235 100644 --- a/src/test/run-pass/associated-const-range-match-patterns.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-range-match-patterns.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo; diff --git a/src/test/run-pass/associated-const-resolution-order.rs b/src/test/ui/run-pass/associated-consts/associated-const-resolution-order.rs similarity index 98% rename from src/test/run-pass/associated-const-resolution-order.rs rename to src/test/ui/run-pass/associated-consts/associated-const-resolution-order.rs index 5fa49b48200d..ed02644c6a11 100644 --- a/src/test/run-pass/associated-const-resolution-order.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-resolution-order.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct MyType; diff --git a/src/test/run-pass/associated-const-self-type.rs b/src/test/ui/run-pass/associated-consts/associated-const-self-type.rs similarity index 98% rename from src/test/run-pass/associated-const-self-type.rs rename to src/test/ui/run-pass/associated-consts/associated-const-self-type.rs index 16ccb5b39552..52d9574edde2 100644 --- a/src/test/run-pass/associated-const-self-type.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-self-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait MyInt { const ONE: Self; diff --git a/src/test/run-pass/associated-const-type-parameters.rs b/src/test/ui/run-pass/associated-consts/associated-const-type-parameters.rs similarity index 99% rename from src/test/run-pass/associated-const-type-parameters.rs rename to src/test/ui/run-pass/associated-consts/associated-const-type-parameters.rs index 7859a87e014b..37407b6bf9f9 100644 --- a/src/test/run-pass/associated-const-type-parameters.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-type-parameters.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { const X: i32; diff --git a/src/test/run-pass/associated-const-ufcs-infer-trait.rs b/src/test/ui/run-pass/associated-consts/associated-const-ufcs-infer-trait.rs similarity index 98% rename from src/test/run-pass/associated-const-ufcs-infer-trait.rs rename to src/test/ui/run-pass/associated-consts/associated-const-ufcs-infer-trait.rs index b22630678249..6269222fb8e9 100644 --- a/src/test/run-pass/associated-const-ufcs-infer-trait.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-ufcs-infer-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { const ID: i32; diff --git a/src/test/run-pass/associated-const-use-default.rs b/src/test/ui/run-pass/associated-consts/associated-const-use-default.rs similarity index 97% rename from src/test/run-pass/associated-const-use-default.rs rename to src/test/ui/run-pass/associated-consts/associated-const-use-default.rs index 5ed9a6dea3dd..623949b2418c 100644 --- a/src/test/run-pass/associated-const-use-default.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-use-default.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { const ID: i32 = 1; diff --git a/src/test/run-pass/associated-const-use-impl-of-same-trait.rs b/src/test/ui/run-pass/associated-consts/associated-const-use-impl-of-same-trait.rs similarity index 98% rename from src/test/run-pass/associated-const-use-impl-of-same-trait.rs rename to src/test/ui/run-pass/associated-consts/associated-const-use-impl-of-same-trait.rs index 986f160f3cbd..80848e5653fb 100644 --- a/src/test/run-pass/associated-const-use-impl-of-same-trait.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const-use-impl-of-same-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // The main purpose of this test is to ensure that different impls of the same // trait can refer to each other without setting off the static recursion check diff --git a/src/test/run-pass/associated-const.rs b/src/test/ui/run-pass/associated-consts/associated-const.rs similarity index 98% rename from src/test/run-pass/associated-const.rs rename to src/test/ui/run-pass/associated-consts/associated-const.rs index 3c84f4a83353..c20025c385ac 100644 --- a/src/test/run-pass/associated-const.rs +++ b/src/test/ui/run-pass/associated-consts/associated-const.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { const ID: i32; diff --git a/src/test/run-pass/auxiliary/associated-const-cc-lib.rs b/src/test/ui/run-pass/associated-consts/auxiliary/associated-const-cc-lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/associated-const-cc-lib.rs rename to src/test/ui/run-pass/associated-consts/auxiliary/associated-const-cc-lib.rs diff --git a/src/test/run-pass/auxiliary/empty-struct.rs b/src/test/ui/run-pass/associated-consts/auxiliary/empty-struct.rs similarity index 100% rename from src/test/run-pass/auxiliary/empty-struct.rs rename to src/test/ui/run-pass/associated-consts/auxiliary/empty-struct.rs diff --git a/src/test/run-pass/associated-types-basic.rs b/src/test/ui/run-pass/associated-types/associated-types-basic.rs similarity index 98% rename from src/test/run-pass/associated-types-basic.rs rename to src/test/ui/run-pass/associated-types/associated-types-basic.rs index 2617a05fe241..3628f9ce183f 100644 --- a/src/test/run-pass/associated-types-basic.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-basic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { type T; } diff --git a/src/test/run-pass/associated-types-binding-in-trait.rs b/src/test/ui/run-pass/associated-types/associated-types-binding-in-trait.rs similarity index 98% rename from src/test/run-pass/associated-types-binding-in-trait.rs rename to src/test/ui/run-pass/associated-types/associated-types-binding-in-trait.rs index d82ba6add75c..63ac60e62d91 100644 --- a/src/test/run-pass/associated-types-binding-in-trait.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-binding-in-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test a case where the associated type binding (to `bool`, in this // case) is derived from the trait definition. Issue #21636. diff --git a/src/test/run-pass/associated-types-binding-in-where-clause.rs b/src/test/ui/run-pass/associated-types/associated-types-binding-in-where-clause.rs similarity index 98% rename from src/test/run-pass/associated-types-binding-in-where-clause.rs rename to src/test/ui/run-pass/associated-types/associated-types-binding-in-where-clause.rs index 82ebac7e5dc7..7b735520efb2 100644 --- a/src/test/run-pass/associated-types-binding-in-where-clause.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-binding-in-where-clause.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test equality constraints on associated types in a where clause. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/associated-types-bound.rs b/src/test/ui/run-pass/associated-types/associated-types-bound.rs similarity index 98% rename from src/test/run-pass/associated-types-bound.rs rename to src/test/ui/run-pass/associated-types/associated-types-bound.rs index 4eacd120bc69..56ce378da65f 100644 --- a/src/test/run-pass/associated-types-bound.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test equality constrai32s on associated types in a where clause. diff --git a/src/test/run-pass/associated-types-cc.rs b/src/test/ui/run-pass/associated-types/associated-types-cc.rs similarity index 98% rename from src/test/run-pass/associated-types-cc.rs rename to src/test/ui/run-pass/associated-types/associated-types-cc.rs index b2be87be4cb3..a8c7caa9361b 100644 --- a/src/test/run-pass/associated-types-cc.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-cc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:associated-types-cc-lib.rs // Test that we are able to reference cross-crate traits that employ diff --git a/src/test/run-pass/associated-types-conditional-dispatch.rs b/src/test/ui/run-pass/associated-types/associated-types-conditional-dispatch.rs similarity index 99% rename from src/test/run-pass/associated-types-conditional-dispatch.rs rename to src/test/ui/run-pass/associated-types/associated-types-conditional-dispatch.rs index dbf975c6f2e8..a795ee2c5ef0 100644 --- a/src/test/run-pass/associated-types-conditional-dispatch.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-conditional-dispatch.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we evaluate projection predicates to winnow out // candidates during trait selection and method resolution (#20296). // If we don't properly winnow out candidates based on the output type diff --git a/src/test/run-pass/associated-types-constant-type.rs b/src/test/ui/run-pass/associated-types/associated-types-constant-type.rs similarity index 98% rename from src/test/run-pass/associated-types-constant-type.rs rename to src/test/ui/run-pass/associated-types/associated-types-constant-type.rs index 77ab616ca918..3581a6c43888 100644 --- a/src/test/run-pass/associated-types-constant-type.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-constant-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait SignedUnsigned { type Opposite; diff --git a/src/test/run-pass/associated-types-doubleendediterator-object.rs b/src/test/ui/run-pass/associated-types/associated-types-doubleendediterator-object.rs similarity index 98% rename from src/test/run-pass/associated-types-doubleendediterator-object.rs rename to src/test/ui/run-pass/associated-types/associated-types-doubleendediterator-object.rs index de83e4edd852..4b8ceda9b811 100644 --- a/src/test/run-pass/associated-types-doubleendediterator-object.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-doubleendediterator-object.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn pairwise_sub(mut t: Box>) -> isize { diff --git a/src/test/run-pass/associated-types-duplicate-binding-in-env-hrtb.rs b/src/test/ui/run-pass/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs similarity index 98% rename from src/test/run-pass/associated-types-duplicate-binding-in-env-hrtb.rs rename to src/test/ui/run-pass/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs index 8ca3bc025483..e6175dc34ecc 100644 --- a/src/test/run-pass/associated-types-duplicate-binding-in-env-hrtb.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-duplicate-binding-in-env-hrtb.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that we do not report ambiguities when equivalent predicates // (modulo bound lifetime names) appears in the environment // twice. Issue #21965. diff --git a/src/test/run-pass/associated-types-duplicate-binding-in-env.rs b/src/test/ui/run-pass/associated-types/associated-types-duplicate-binding-in-env.rs similarity index 98% rename from src/test/run-pass/associated-types-duplicate-binding-in-env.rs rename to src/test/ui/run-pass/associated-types/associated-types-duplicate-binding-in-env.rs index 5878f5dd51b2..6836d2860b51 100644 --- a/src/test/run-pass/associated-types-duplicate-binding-in-env.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-duplicate-binding-in-env.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that we do not report ambiguities when the same predicate // appears in the environment twice. Issue #21965. diff --git a/src/test/run-pass/associated-types-enum-field-named.rs b/src/test/ui/run-pass/associated-types/associated-types-enum-field-named.rs similarity index 99% rename from src/test/run-pass/associated-types-enum-field-named.rs rename to src/test/ui/run-pass/associated-types/associated-types-enum-field-named.rs index 7014cc59b71d..d21195c3d3a6 100644 --- a/src/test/run-pass/associated-types-enum-field-named.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-enum-field-named.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test associated types appearing in struct-like enum variants. diff --git a/src/test/run-pass/associated-types-enum-field-numbered.rs b/src/test/ui/run-pass/associated-types/associated-types-enum-field-numbered.rs similarity index 99% rename from src/test/run-pass/associated-types-enum-field-numbered.rs rename to src/test/ui/run-pass/associated-types/associated-types-enum-field-numbered.rs index c983fdefc0e3..9a91a998201f 100644 --- a/src/test/run-pass/associated-types-enum-field-numbered.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-enum-field-numbered.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test associated types appearing in tuple-like enum variants. diff --git a/src/test/run-pass/associated-types-eq-obj.rs b/src/test/ui/run-pass/associated-types/associated-types-eq-obj.rs similarity index 98% rename from src/test/run-pass/associated-types-eq-obj.rs rename to src/test/ui/run-pass/associated-types/associated-types-eq-obj.rs index feccd1d2dcec..75fe2093da99 100644 --- a/src/test/run-pass/associated-types-eq-obj.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-eq-obj.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test equality constraints on associated types inside of an object type // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/associated-types-impl-redirect.rs b/src/test/ui/run-pass/associated-types/associated-types-impl-redirect.rs similarity index 99% rename from src/test/run-pass/associated-types-impl-redirect.rs rename to src/test/ui/run-pass/associated-types/associated-types-impl-redirect.rs index 3e34367a2158..aca767489258 100644 --- a/src/test/run-pass/associated-types-impl-redirect.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-impl-redirect.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test how resolving a projection interacts with inference. In this // case, we were eagerly unifying the type variable for the iterator // type with `I` from the where clause, ignoring the in-scope `impl` diff --git a/src/test/run-pass/associated-types-in-bound-type-arg.rs b/src/test/ui/run-pass/associated-types/associated-types-in-bound-type-arg.rs similarity index 98% rename from src/test/run-pass/associated-types-in-bound-type-arg.rs rename to src/test/ui/run-pass/associated-types/associated-types-in-bound-type-arg.rs index 18803d15719e..a80350a596e5 100644 --- a/src/test/run-pass/associated-types-in-bound-type-arg.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-in-bound-type-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test the case where we resolve `C::Result` and the trait bound // itself includes a `Self::Item` shorthand. // diff --git a/src/test/run-pass/associated-types-in-default-method.rs b/src/test/ui/run-pass/associated-types/associated-types-in-default-method.rs similarity index 98% rename from src/test/run-pass/associated-types-in-default-method.rs rename to src/test/ui/run-pass/associated-types/associated-types-in-default-method.rs index 74199f57fb63..846dfcd2141c 100644 --- a/src/test/run-pass/associated-types-in-default-method.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-in-default-method.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Get { type Value; diff --git a/src/test/run-pass/associated-types-in-fn.rs b/src/test/ui/run-pass/associated-types/associated-types-in-fn.rs similarity index 98% rename from src/test/run-pass/associated-types-in-fn.rs rename to src/test/ui/run-pass/associated-types/associated-types-in-fn.rs index dcd7895fa99e..555c74dd70a7 100644 --- a/src/test/run-pass/associated-types-in-fn.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-in-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Get { type Value; diff --git a/src/test/run-pass/associated-types-in-impl-generics.rs b/src/test/ui/run-pass/associated-types/associated-types-in-impl-generics.rs similarity index 98% rename from src/test/run-pass/associated-types-in-impl-generics.rs rename to src/test/ui/run-pass/associated-types/associated-types-in-impl-generics.rs index 5b81ac709087..d27c1dd296e4 100644 --- a/src/test/run-pass/associated-types-in-impl-generics.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-in-impl-generics.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Get { type Value; diff --git a/src/test/run-pass/associated-types-in-inherent-method.rs b/src/test/ui/run-pass/associated-types/associated-types-in-inherent-method.rs similarity index 98% rename from src/test/run-pass/associated-types-in-inherent-method.rs rename to src/test/ui/run-pass/associated-types/associated-types-in-inherent-method.rs index 5eaf4c2bc839..f68ab8cd610c 100644 --- a/src/test/run-pass/associated-types-in-inherent-method.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-in-inherent-method.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Get { type Value; diff --git a/src/test/run-pass/associated-types-issue-20220.rs b/src/test/ui/run-pass/associated-types/associated-types-issue-20220.rs similarity index 98% rename from src/test/run-pass/associated-types-issue-20220.rs rename to src/test/ui/run-pass/associated-types/associated-types-issue-20220.rs index 31336787e4c1..e2a87382fba9 100644 --- a/src/test/run-pass/associated-types-issue-20220.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-issue-20220.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test references to `Self::Item` in the trait. Issue #20220. diff --git a/src/test/run-pass/associated-types-issue-20371.rs b/src/test/ui/run-pass/associated-types/associated-types-issue-20371.rs similarity index 98% rename from src/test/run-pass/associated-types-issue-20371.rs rename to src/test/ui/run-pass/associated-types/associated-types-issue-20371.rs index c93a0b76a956..54f1d2e81260 100644 --- a/src/test/run-pass/associated-types-issue-20371.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-issue-20371.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to have an impl that defines an associated type // before the actual trait. diff --git a/src/test/run-pass/associated-types-issue-21212.rs b/src/test/ui/run-pass/associated-types/associated-types-issue-21212.rs similarity index 98% rename from src/test/run-pass/associated-types-issue-21212.rs rename to src/test/ui/run-pass/associated-types/associated-types-issue-21212.rs index cf4b82721112..259661dc058c 100644 --- a/src/test/run-pass/associated-types-issue-21212.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-issue-21212.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #21212: an overflow occurred during trait // checking where normalizing `Self::Input` led to normalizing the // where clauses in the environment which in turn required normalizing diff --git a/src/test/run-pass/associated-types-iterator-binding.rs b/src/test/ui/run-pass/associated-types/associated-types-iterator-binding.rs similarity index 98% rename from src/test/run-pass/associated-types-iterator-binding.rs rename to src/test/ui/run-pass/associated-types/associated-types-iterator-binding.rs index abd4917cae87..eab66a941291 100644 --- a/src/test/run-pass/associated-types-iterator-binding.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-iterator-binding.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn pairwise_sub>(mut t: T) -> isize { let mut result = 0; diff --git a/src/test/run-pass/associated-types-method.rs b/src/test/ui/run-pass/associated-types/associated-types-method.rs similarity index 98% rename from src/test/run-pass/associated-types-method.rs rename to src/test/ui/run-pass/associated-types/associated-types-method.rs index b57687a49fa6..73d075313ad5 100644 --- a/src/test/run-pass/associated-types-method.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-method.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that methods whose impl-trait-ref contains associated types // are supported. diff --git a/src/test/run-pass/associated-types-nested-projections.rs b/src/test/ui/run-pass/associated-types/associated-types-nested-projections.rs similarity index 98% rename from src/test/run-pass/associated-types-nested-projections.rs rename to src/test/ui/run-pass/associated-types/associated-types-nested-projections.rs index 62fa07e20b6b..a877a3cfa9dd 100644 --- a/src/test/run-pass/associated-types-nested-projections.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-nested-projections.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can resolve nested projection types. Issue #20666. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/associated-types-normalize-in-bounds-binding.rs b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds-binding.rs similarity index 98% rename from src/test/run-pass/associated-types-normalize-in-bounds-binding.rs rename to src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds-binding.rs index 7e2d1aa23149..d989e08e8083 100644 --- a/src/test/run-pass/associated-types-normalize-in-bounds-binding.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds-binding.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we normalize associated types that appear in a bound that // contains a binding. Issue #21664. diff --git a/src/test/run-pass/associated-types-normalize-in-bounds-ufcs.rs b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds-ufcs.rs similarity index 99% rename from src/test/run-pass/associated-types-normalize-in-bounds-ufcs.rs rename to src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds-ufcs.rs index d8e4c5218d9c..3d3540bbf72b 100644 --- a/src/test/run-pass/associated-types-normalize-in-bounds-ufcs.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds-ufcs.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we normalize associated types that appear in bounds; if // we didn't, the call to `self.split2()` fails to type check. diff --git a/src/test/run-pass/associated-types-normalize-in-bounds.rs b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds.rs similarity index 99% rename from src/test/run-pass/associated-types-normalize-in-bounds.rs rename to src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds.rs index ff08e7b69bdd..79d23c3999e6 100644 --- a/src/test/run-pass/associated-types-normalize-in-bounds.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-normalize-in-bounds.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we normalize associated types that appear in bounds; if // we didn't, the call to `self.split2()` fails to type check. diff --git a/src/test/run-pass/associated-types-normalize-unifield-struct.rs b/src/test/ui/run-pass/associated-types/associated-types-normalize-unifield-struct.rs similarity index 98% rename from src/test/run-pass/associated-types-normalize-unifield-struct.rs rename to src/test/ui/run-pass/associated-types/associated-types-normalize-unifield-struct.rs index 517033d58702..03d712b110dc 100644 --- a/src/test/run-pass/associated-types-normalize-unifield-struct.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-normalize-unifield-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #21010: Normalize associated types in // various special paths in the `type_is_immediate` function. diff --git a/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where.rs b/src/test/ui/run-pass/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs similarity index 99% rename from src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where.rs rename to src/test/ui/run-pass/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs index 5ceb1013ad81..f21bbddc4ddc 100644 --- a/src/test/run-pass/associated-types-project-from-type-param-via-bound-in-where.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-project-from-type-param-via-bound-in-where.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Various uses of `T::Item` syntax where the bound that supplies // `Item` originates in a where-clause, not the declaration of // `T`. Issue #20300. diff --git a/src/test/run-pass/associated-types-projection-bound-in-supertraits.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-bound-in-supertraits.rs similarity index 98% rename from src/test/run-pass/associated-types-projection-bound-in-supertraits.rs rename to src/test/ui/run-pass/associated-types/associated-types-projection-bound-in-supertraits.rs index e150d0158243..57c7f557ffaf 100644 --- a/src/test/run-pass/associated-types-projection-bound-in-supertraits.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-projection-bound-in-supertraits.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we correctly handle projection bounds appearing in the // supertrait list (and in conjunction with overloaded operators). In // this case, the `Result=Self` binding in the supertrait listing of diff --git a/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-from-known-type-in-impl.rs similarity index 99% rename from src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs rename to src/test/ui/run-pass/associated-types/associated-types-projection-from-known-type-in-impl.rs index 8054b3aa52a1..964eb8862360 100644 --- a/src/test/run-pass/associated-types-projection-from-known-type-in-impl.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-projection-from-known-type-in-impl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test where the impl self type uses a projection from a constant type. diff --git a/src/test/run-pass/associated-types-projection-in-object-type.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-in-object-type.rs similarity index 99% rename from src/test/run-pass/associated-types-projection-in-object-type.rs rename to src/test/ui/run-pass/associated-types/associated-types-projection-in-object-type.rs index 14e94dbff6ca..8b98325598c8 100644 --- a/src/test/run-pass/associated-types-projection-in-object-type.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-projection-in-object-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Corrected regression test for #20831. The original did not compile. // When fixed, it revealed another problem concerning projections that // appear in associated type bindings in object types, which were not diff --git a/src/test/run-pass/associated-types-projection-in-supertrait.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-in-supertrait.rs similarity index 98% rename from src/test/run-pass/associated-types-projection-in-supertrait.rs rename to src/test/ui/run-pass/associated-types/associated-types-projection-in-supertrait.rs index 70c7602ffceb..001faef7f481 100644 --- a/src/test/run-pass/associated-types-projection-in-supertrait.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-projection-in-supertrait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are handle to correctly handle a projection type // that appears in a supertrait bound. Issue #20559. diff --git a/src/test/run-pass/associated-types-projection-in-where-clause.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-in-where-clause.rs similarity index 98% rename from src/test/run-pass/associated-types-projection-in-where-clause.rs rename to src/test/ui/run-pass/associated-types/associated-types-projection-in-where-clause.rs index 80e3aa09e3e6..c2379e0f0782 100644 --- a/src/test/run-pass/associated-types-projection-in-where-clause.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-projection-in-where-clause.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test a where clause that uses a non-normalized projection type. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/associated-types-projection-to-unrelated-trait.rs b/src/test/ui/run-pass/associated-types/associated-types-projection-to-unrelated-trait.rs similarity index 99% rename from src/test/run-pass/associated-types-projection-to-unrelated-trait.rs rename to src/test/ui/run-pass/associated-types/associated-types-projection-to-unrelated-trait.rs index 8059db5204ee..f6951b48ae79 100644 --- a/src/test/run-pass/associated-types-projection-to-unrelated-trait.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-projection-to-unrelated-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that we do not get an error when you use `::Value` in // the trait definition if there is no default method and for every impl, // `Self` does implement `Get`. diff --git a/src/test/run-pass/associated-types-qualified-path-with-trait-with-type-parameters.rs b/src/test/ui/run-pass/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs similarity index 98% rename from src/test/run-pass/associated-types-qualified-path-with-trait-with-type-parameters.rs rename to src/test/ui/run-pass/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs index a69de216ab99..b3d5c3539894 100644 --- a/src/test/run-pass/associated-types-qualified-path-with-trait-with-type-parameters.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-qualified-path-with-trait-with-type-parameters.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/associated-types-ref-from-struct.rs b/src/test/ui/run-pass/associated-types/associated-types-ref-from-struct.rs similarity index 99% rename from src/test/run-pass/associated-types-ref-from-struct.rs rename to src/test/ui/run-pass/associated-types/associated-types-ref-from-struct.rs index ce09ec60bd6a..e45766adc2ca 100644 --- a/src/test/run-pass/associated-types-ref-from-struct.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-ref-from-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test associated type references in structure fields. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/associated-types-ref-in-struct-literal.rs b/src/test/ui/run-pass/associated-types/associated-types-ref-in-struct-literal.rs similarity index 98% rename from src/test/run-pass/associated-types-ref-in-struct-literal.rs rename to src/test/ui/run-pass/associated-types/associated-types-ref-in-struct-literal.rs index 3b7fb65a8b4a..02e1d74db47d 100644 --- a/src/test/run-pass/associated-types-ref-in-struct-literal.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-ref-in-struct-literal.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test associated type references in a struct literal. Issue #20535. diff --git a/src/test/run-pass/associated-types-region-erasure-issue-20582.rs b/src/test/ui/run-pass/associated-types/associated-types-region-erasure-issue-20582.rs similarity index 98% rename from src/test/run-pass/associated-types-region-erasure-issue-20582.rs rename to src/test/ui/run-pass/associated-types/associated-types-region-erasure-issue-20582.rs index 40f352e2e1f7..b4038a21828c 100644 --- a/src/test/run-pass/associated-types-region-erasure-issue-20582.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-region-erasure-issue-20582.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #20582. This test caused an ICE related to // inconsistent region erasure in codegen. diff --git a/src/test/run-pass/associated-types-resolve-lifetime.rs b/src/test/ui/run-pass/associated-types/associated-types-resolve-lifetime.rs similarity index 98% rename from src/test/run-pass/associated-types-resolve-lifetime.rs rename to src/test/ui/run-pass/associated-types/associated-types-resolve-lifetime.rs index 824291ea6078..b77f3fcd295f 100644 --- a/src/test/run-pass/associated-types-resolve-lifetime.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-resolve-lifetime.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Get { diff --git a/src/test/run-pass/associated-types-return.rs b/src/test/ui/run-pass/associated-types/associated-types-return.rs similarity index 98% rename from src/test/run-pass/associated-types-return.rs rename to src/test/ui/run-pass/associated-types/associated-types-return.rs index f5434c9eb865..18b05987715a 100644 --- a/src/test/run-pass/associated-types-return.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-return.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test equality constraints on associated types in a where clause. diff --git a/src/test/run-pass/associated-types-simple.rs b/src/test/ui/run-pass/associated-types/associated-types-simple.rs similarity index 98% rename from src/test/run-pass/associated-types-simple.rs rename to src/test/ui/run-pass/associated-types/associated-types-simple.rs index 776b2183d390..8e9b2367fcd0 100644 --- a/src/test/run-pass/associated-types-simple.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-simple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Get { type Value; diff --git a/src/test/run-pass/associated-types-stream.rs b/src/test/ui/run-pass/associated-types/associated-types-stream.rs similarity index 98% rename from src/test/run-pass/associated-types-stream.rs rename to src/test/ui/run-pass/associated-types/associated-types-stream.rs index 6adfaabcc23b..c486e3463515 100644 --- a/src/test/run-pass/associated-types-stream.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-stream.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test references to the trait `Stream` in the bounds for associated // types defined on `Stream`. Issue #20551. diff --git a/src/test/run-pass/associated-types-struct-field-named.rs b/src/test/ui/run-pass/associated-types/associated-types-struct-field-named.rs similarity index 98% rename from src/test/run-pass/associated-types-struct-field-named.rs rename to src/test/ui/run-pass/associated-types/associated-types-struct-field-named.rs index 00746c32e1c3..384ec8ef44f0 100644 --- a/src/test/run-pass/associated-types-struct-field-named.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-struct-field-named.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we correctly normalize the type of a struct field // which has an associated type. diff --git a/src/test/run-pass/associated-types-struct-field-numbered.rs b/src/test/ui/run-pass/associated-types/associated-types-struct-field-numbered.rs similarity index 98% rename from src/test/run-pass/associated-types-struct-field-numbered.rs rename to src/test/ui/run-pass/associated-types/associated-types-struct-field-numbered.rs index 25e89892a29a..54d0c8839a37 100644 --- a/src/test/run-pass/associated-types-struct-field-numbered.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-struct-field-numbered.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we correctly normalize the type of a struct field // which has an associated type. diff --git a/src/test/run-pass/associated-types-sugar-path.rs b/src/test/ui/run-pass/associated-types/associated-types-sugar-path.rs similarity index 98% rename from src/test/run-pass/associated-types-sugar-path.rs rename to src/test/ui/run-pass/associated-types/associated-types-sugar-path.rs index d8d42f2cba28..3b148c5e1065 100644 --- a/src/test/run-pass/associated-types-sugar-path.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-sugar-path.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test paths to associated types using the type-parameter-only sugar. use std::ops::Deref; diff --git a/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs b/src/test/ui/run-pass/associated-types/associated-types-where-clause-impl-ambiguity.rs similarity index 99% rename from src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs rename to src/test/ui/run-pass/associated-types/associated-types-where-clause-impl-ambiguity.rs index ef1225d39a70..5f24a44c14b5 100644 --- a/src/test/run-pass/associated-types-where-clause-impl-ambiguity.rs +++ b/src/test/ui/run-pass/associated-types/associated-types-where-clause-impl-ambiguity.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test how resolving a projection interacts with inference. In this // case, we were eagerly unifying the type variable for the iterator // type with `I` from the where clause, ignoring the in-scope `impl` diff --git a/src/test/run-pass/auxiliary/associated-types-cc-lib.rs b/src/test/ui/run-pass/associated-types/auxiliary/associated-types-cc-lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/associated-types-cc-lib.rs rename to src/test/ui/run-pass/associated-types/auxiliary/associated-types-cc-lib.rs diff --git a/src/test/run-pass/auto-ref-bounded-ty-param.rs b/src/test/ui/run-pass/autoref-autoderef/auto-ref-bounded-ty-param.rs similarity index 98% rename from src/test/run-pass/auto-ref-bounded-ty-param.rs rename to src/test/ui/run-pass/autoref-autoderef/auto-ref-bounded-ty-param.rs index 77ec0e1791f9..d984531b8bbf 100644 --- a/src/test/run-pass/auto-ref-bounded-ty-param.rs +++ b/src/test/ui/run-pass/autoref-autoderef/auto-ref-bounded-ty-param.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { fn f(&self); } diff --git a/src/test/run-pass/auto-ref-sliceable.rs b/src/test/ui/run-pass/autoref-autoderef/auto-ref-sliceable.rs similarity index 98% rename from src/test/run-pass/auto-ref-sliceable.rs rename to src/test/ui/run-pass/autoref-autoderef/auto-ref-sliceable.rs index f6cb314d06e2..6e665b076568 100644 --- a/src/test/run-pass/auto-ref-sliceable.rs +++ b/src/test/ui/run-pass/autoref-autoderef/auto-ref-sliceable.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Pushable { diff --git a/src/test/run-pass/auto-ref.rs b/src/test/ui/run-pass/autoref-autoderef/auto-ref.rs similarity index 98% rename from src/test/run-pass/auto-ref.rs rename to src/test/ui/run-pass/autoref-autoderef/auto-ref.rs index 0ad2303a7697..afc79cce35e0 100644 --- a/src/test/run-pass/auto-ref.rs +++ b/src/test/ui/run-pass/autoref-autoderef/auto-ref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo { x: isize, } diff --git a/src/test/run-pass/autoderef-and-borrow-method-receiver.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-and-borrow-method-receiver.rs similarity index 98% rename from src/test/run-pass/autoderef-and-borrow-method-receiver.rs rename to src/test/ui/run-pass/autoref-autoderef/autoderef-and-borrow-method-receiver.rs index a4c6cdd544c8..0ce3ef7fd7b3 100644 --- a/src/test/run-pass/autoderef-and-borrow-method-receiver.rs +++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-and-borrow-method-receiver.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Foo { diff --git a/src/test/run-pass/autoderef-method-on-trait.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-on-trait.rs similarity index 94% rename from src/test/run-pass/autoderef-method-on-trait.rs rename to src/test/ui/run-pass/autoref-autoderef/autoderef-method-on-trait.rs index f6ff9a31fa13..8116a311eb45 100644 --- a/src/test/run-pass/autoderef-method-on-trait.rs +++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-on-trait.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] #![feature(box_syntax)] trait double { diff --git a/src/test/run-pass/autoderef-method-priority.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-priority.rs similarity index 94% rename from src/test/run-pass/autoderef-method-priority.rs rename to src/test/ui/run-pass/autoref-autoderef/autoderef-method-priority.rs index 234af92610ab..2b1483950039 100644 --- a/src/test/run-pass/autoderef-method-priority.rs +++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-priority.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] #![feature(box_syntax)] trait double { diff --git a/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs similarity index 94% rename from src/test/run-pass/autoderef-method-twice-but-not-thrice.rs rename to src/test/ui/run-pass/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs index 5890fe441666..14c57b075195 100644 --- a/src/test/run-pass/autoderef-method-twice-but-not-thrice.rs +++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-twice-but-not-thrice.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] #![feature(box_syntax)] trait double { diff --git a/src/test/run-pass/autoderef-method-twice.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-twice.rs similarity index 94% rename from src/test/run-pass/autoderef-method-twice.rs rename to src/test/ui/run-pass/autoref-autoderef/autoderef-method-twice.rs index 2598ec17d2ae..5185d0ee749a 100644 --- a/src/test/run-pass/autoderef-method-twice.rs +++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-method-twice.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] #![feature(box_syntax)] trait double { diff --git a/src/test/run-pass/autoderef-method.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-method.rs similarity index 94% rename from src/test/run-pass/autoderef-method.rs rename to src/test/ui/run-pass/autoref-autoderef/autoderef-method.rs index 7c83b9c982fb..398ccde88948 100644 --- a/src/test/run-pass/autoderef-method.rs +++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-method.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] #![feature(box_syntax)] trait double { diff --git a/src/test/run-pass/autoderef-privacy.rs b/src/test/ui/run-pass/autoref-autoderef/autoderef-privacy.rs similarity index 99% rename from src/test/run-pass/autoderef-privacy.rs rename to src/test/ui/run-pass/autoref-autoderef/autoderef-privacy.rs index e50f1bea0d3b..cfbc7744a4cf 100644 --- a/src/test/run-pass/autoderef-privacy.rs +++ b/src/test/ui/run-pass/autoref-autoderef/autoderef-privacy.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check we do not select a private method or field when computing autoderefs #![allow(unused)] diff --git a/src/test/run-pass/autoref-intermediate-types-issue-3585.rs b/src/test/ui/run-pass/autoref-autoderef/autoref-intermediate-types-issue-3585.rs similarity index 98% rename from src/test/run-pass/autoref-intermediate-types-issue-3585.rs rename to src/test/ui/run-pass/autoref-autoderef/autoref-intermediate-types-issue-3585.rs index 4096d45d8df8..e32738e8f152 100644 --- a/src/test/run-pass/autoref-intermediate-types-issue-3585.rs +++ b/src/test/ui/run-pass/autoref-autoderef/autoref-intermediate-types-issue-3585.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] trait Foo { diff --git a/src/test/run-pass/bench/issue-32062.rs b/src/test/ui/run-pass/bench/issue-32062.rs similarity index 99% rename from src/test/run-pass/bench/issue-32062.rs rename to src/test/ui/run-pass/bench/issue-32062.rs index 8f6457d820a8..c21399fd2998 100644 --- a/src/test/run-pass/bench/issue-32062.rs +++ b/src/test/ui/run-pass/bench/issue-32062.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/allow_irrefutable_let_patterns.rs b/src/test/ui/run-pass/binding/allow_irrefutable_let_patterns.rs similarity index 98% rename from src/test/run-pass/allow_irrefutable_let_patterns.rs rename to src/test/ui/run-pass/binding/allow_irrefutable_let_patterns.rs index ea114b63be73..866784e517c7 100644 --- a/src/test/run-pass/allow_irrefutable_let_patterns.rs +++ b/src/test/ui/run-pass/binding/allow_irrefutable_let_patterns.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(irrefutable_let_patterns)] // must-compile-successfully-irrefutable_let_patterns_with_gate diff --git a/src/test/run-pass/bind-field-short-with-modifiers.rs b/src/test/ui/run-pass/binding/bind-field-short-with-modifiers.rs similarity index 94% rename from src/test/run-pass/bind-field-short-with-modifiers.rs rename to src/test/ui/run-pass/binding/bind-field-short-with-modifiers.rs index b4c38bf450b1..24f037742708 100644 --- a/src/test/run-pass/bind-field-short-with-modifiers.rs +++ b/src/test/ui/run-pass/binding/bind-field-short-with-modifiers.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_shorthand_field_patterns)] pub fn main() { struct Foo { x: isize, y: isize } diff --git a/src/test/run-pass/borrowed-ptr-pattern-2.rs b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-2.rs similarity index 98% rename from src/test/run-pass/borrowed-ptr-pattern-2.rs rename to src/test/ui/run-pass/binding/borrowed-ptr-pattern-2.rs index 3e47764ba026..6a23d159047a 100644 --- a/src/test/run-pass/borrowed-ptr-pattern-2.rs +++ b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo(s: &String) -> bool { match &**s { diff --git a/src/test/run-pass/borrowed-ptr-pattern-3.rs b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-3.rs similarity index 98% rename from src/test/run-pass/borrowed-ptr-pattern-3.rs rename to src/test/ui/run-pass/binding/borrowed-ptr-pattern-3.rs index 91228efb9c1c..cb40b3a00991 100644 --- a/src/test/run-pass/borrowed-ptr-pattern-3.rs +++ b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo<'r>(s: &'r usize) -> bool { match s { diff --git a/src/test/run-pass/borrowed-ptr-pattern-infallible.rs b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-infallible.rs similarity index 97% rename from src/test/run-pass/borrowed-ptr-pattern-infallible.rs rename to src/test/ui/run-pass/binding/borrowed-ptr-pattern-infallible.rs index 6656eb41f2e3..5f906903ed25 100644 --- a/src/test/run-pass/borrowed-ptr-pattern-infallible.rs +++ b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-infallible.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { diff --git a/src/test/run-pass/borrowed-ptr-pattern-option.rs b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-option.rs similarity index 98% rename from src/test/run-pass/borrowed-ptr-pattern-option.rs rename to src/test/ui/run-pass/binding/borrowed-ptr-pattern-option.rs index e1e9381eeb8e..1372a7a07893 100644 --- a/src/test/run-pass/borrowed-ptr-pattern-option.rs +++ b/src/test/ui/run-pass/binding/borrowed-ptr-pattern-option.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn select<'r>(x: &'r Option, y: &'r Option) -> &'r Option { match (x, y) { diff --git a/src/test/run-pass/borrowed-ptr-pattern.rs b/src/test/ui/run-pass/binding/borrowed-ptr-pattern.rs similarity index 98% rename from src/test/run-pass/borrowed-ptr-pattern.rs rename to src/test/ui/run-pass/binding/borrowed-ptr-pattern.rs index 3042ff7743b7..f363bef36d64 100644 --- a/src/test/run-pass/borrowed-ptr-pattern.rs +++ b/src/test/ui/run-pass/binding/borrowed-ptr-pattern.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo(x: &T) -> T{ match x { diff --git a/src/test/run-pass/empty-types-in-patterns.rs b/src/test/ui/run-pass/binding/empty-types-in-patterns.rs similarity index 99% rename from src/test/run-pass/empty-types-in-patterns.rs rename to src/test/ui/run-pass/binding/empty-types-in-patterns.rs index 86cf9b5ec478..c230442eecc5 100644 --- a/src/test/run-pass/empty-types-in-patterns.rs +++ b/src/test/ui/run-pass/binding/empty-types-in-patterns.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(never_type)] #![feature(exhaustive_patterns)] #![feature(slice_patterns)] diff --git a/src/test/run-pass/exhaustive-bool-match-sanity.rs b/src/test/ui/run-pass/binding/exhaustive-bool-match-sanity.rs similarity index 98% rename from src/test/run-pass/exhaustive-bool-match-sanity.rs rename to src/test/ui/run-pass/binding/exhaustive-bool-match-sanity.rs index 27bcab43229c..26e852eff235 100644 --- a/src/test/run-pass/exhaustive-bool-match-sanity.rs +++ b/src/test/ui/run-pass/binding/exhaustive-bool-match-sanity.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #33540 // We previously used to generate a 3-armed boolean `SwitchInt` in the // MIR of the function `foo` below. #33583 changed rustc to diff --git a/src/test/run-pass/expr-match-generic-unique1.rs b/src/test/ui/run-pass/binding/expr-match-generic-unique1.rs similarity index 98% rename from src/test/run-pass/expr-match-generic-unique1.rs rename to src/test/ui/run-pass/binding/expr-match-generic-unique1.rs index 3fce798c285c..3325aa7b3df8 100644 --- a/src/test/run-pass/expr-match-generic-unique1.rs +++ b/src/test/ui/run-pass/binding/expr-match-generic-unique1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn test_generic(expected: Box, eq: F) where F: FnOnce(Box, Box) -> bool { diff --git a/src/test/run-pass/expr-match-generic-unique2.rs b/src/test/ui/run-pass/binding/expr-match-generic-unique2.rs similarity index 98% rename from src/test/run-pass/expr-match-generic-unique2.rs rename to src/test/ui/run-pass/binding/expr-match-generic-unique2.rs index 5500edcf239f..8daa33e62273 100644 --- a/src/test/run-pass/expr-match-generic-unique2.rs +++ b/src/test/ui/run-pass/binding/expr-match-generic-unique2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn test_generic(expected: T, eq: F) where F: FnOnce(T, T) -> bool { diff --git a/src/test/run-pass/expr-match-generic.rs b/src/test/ui/run-pass/binding/expr-match-generic.rs similarity index 96% rename from src/test/run-pass/expr-match-generic.rs rename to src/test/ui/run-pass/binding/expr-match-generic.rs index 509106289d07..11c907b9b2da 100644 --- a/src/test/run-pass/expr-match-generic.rs +++ b/src/test/ui/run-pass/binding/expr-match-generic.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - +// run-pass +#![allow(non_camel_case_types)] type compare = extern "Rust" fn(T, T) -> bool; diff --git a/src/test/run-pass/expr-match-panic-all.rs b/src/test/ui/run-pass/binding/expr-match-panic-all.rs similarity index 98% rename from src/test/run-pass/expr-match-panic-all.rs rename to src/test/ui/run-pass/binding/expr-match-panic-all.rs index e712d552a810..f283fdddb6a1 100644 --- a/src/test/run-pass/expr-match-panic-all.rs +++ b/src/test/ui/run-pass/binding/expr-match-panic-all.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/expr-match-panic.rs b/src/test/ui/run-pass/binding/expr-match-panic.rs similarity index 98% rename from src/test/run-pass/expr-match-panic.rs rename to src/test/ui/run-pass/binding/expr-match-panic.rs index 1a6466048d90..c6f8ae7bca68 100644 --- a/src/test/run-pass/expr-match-panic.rs +++ b/src/test/ui/run-pass/binding/expr-match-panic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn test_simple() { diff --git a/src/test/run-pass/expr-match-unique.rs b/src/test/ui/run-pass/binding/expr-match-unique.rs similarity index 98% rename from src/test/run-pass/expr-match-unique.rs rename to src/test/ui/run-pass/binding/expr-match-unique.rs index e66f09c63ea4..b67b9fa3ddac 100644 --- a/src/test/run-pass/expr-match-unique.rs +++ b/src/test/ui/run-pass/binding/expr-match-unique.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] // Tests for match as expressions resulting in boxed types diff --git a/src/test/run-pass/expr-match.rs b/src/test/ui/run-pass/binding/expr-match.rs similarity index 99% rename from src/test/run-pass/expr-match.rs rename to src/test/ui/run-pass/binding/expr-match.rs index 580ee52ed364..83d44e42b327 100644 --- a/src/test/run-pass/expr-match.rs +++ b/src/test/ui/run-pass/binding/expr-match.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/fat-arrow-match.rs b/src/test/ui/run-pass/binding/fat-arrow-match.rs similarity index 93% rename from src/test/run-pass/fat-arrow-match.rs rename to src/test/ui/run-pass/binding/fat-arrow-match.rs index 004e6d48e379..c0e68f99ad0e 100644 --- a/src/test/run-pass/fat-arrow-match.rs +++ b/src/test/ui/run-pass/binding/fat-arrow-match.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] enum color { red, diff --git a/src/test/run-pass/fn-pattern-expected-type-2.rs b/src/test/ui/run-pass/binding/fn-pattern-expected-type-2.rs similarity index 98% rename from src/test/run-pass/fn-pattern-expected-type-2.rs rename to src/test/ui/run-pass/binding/fn-pattern-expected-type-2.rs index 66a7123c795f..7926234161f5 100644 --- a/src/test/run-pass/fn-pattern-expected-type-2.rs +++ b/src/test/ui/run-pass/binding/fn-pattern-expected-type-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let v : &[(isize,isize)] = &[ (1, 2), (3, 4), (5, 6) ]; for &(x, y) in v { diff --git a/src/test/run-pass/fn-pattern-expected-type.rs b/src/test/ui/run-pass/binding/fn-pattern-expected-type.rs similarity index 98% rename from src/test/run-pass/fn-pattern-expected-type.rs rename to src/test/ui/run-pass/binding/fn-pattern-expected-type.rs index 2e9607602fd6..a868267f3716 100644 --- a/src/test/run-pass/fn-pattern-expected-type.rs +++ b/src/test/ui/run-pass/binding/fn-pattern-expected-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let f = |(x, y): (isize, isize)| { diff --git a/src/test/run-pass/func-arg-incomplete-pattern.rs b/src/test/ui/run-pass/binding/func-arg-incomplete-pattern.rs similarity index 98% rename from src/test/run-pass/func-arg-incomplete-pattern.rs rename to src/test/ui/run-pass/binding/func-arg-incomplete-pattern.rs index 7d9501879d0a..d766feeb72c9 100644 --- a/src/test/run-pass/func-arg-incomplete-pattern.rs +++ b/src/test/ui/run-pass/binding/func-arg-incomplete-pattern.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we do not leak when the arg pattern must drop part of the // argument (in this case, the `y` field). diff --git a/src/test/run-pass/func-arg-ref-pattern.rs b/src/test/ui/run-pass/binding/func-arg-ref-pattern.rs similarity index 98% rename from src/test/run-pass/func-arg-ref-pattern.rs rename to src/test/ui/run-pass/binding/func-arg-ref-pattern.rs index 5214f2d02f51..7e87f14e2c53 100644 --- a/src/test/run-pass/func-arg-ref-pattern.rs +++ b/src/test/ui/run-pass/binding/func-arg-ref-pattern.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // exec-env:RUST_POISON_ON_FREE=1 // Test argument patterns where we create refs to the inside of diff --git a/src/test/run-pass/func-arg-wild-pattern.rs b/src/test/ui/run-pass/binding/func-arg-wild-pattern.rs similarity index 98% rename from src/test/run-pass/func-arg-wild-pattern.rs rename to src/test/ui/run-pass/binding/func-arg-wild-pattern.rs index 3ab3ee4db2d5..18a1909b51e0 100644 --- a/src/test/run-pass/func-arg-wild-pattern.rs +++ b/src/test/ui/run-pass/binding/func-arg-wild-pattern.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can compile code that uses a `_` in function argument // patterns. diff --git a/src/test/run-pass/if-let.rs b/src/test/ui/run-pass/binding/if-let.rs similarity index 99% rename from src/test/run-pass/if-let.rs rename to src/test/ui/run-pass/binding/if-let.rs index 13134abd8fdd..9147bf14cadb 100644 --- a/src/test/run-pass/if-let.rs +++ b/src/test/ui/run-pass/binding/if-let.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = Some(3); diff --git a/src/test/run-pass/inconsistent-lifetime-mismatch.rs b/src/test/ui/run-pass/binding/inconsistent-lifetime-mismatch.rs similarity index 98% rename from src/test/run-pass/inconsistent-lifetime-mismatch.rs rename to src/test/ui/run-pass/binding/inconsistent-lifetime-mismatch.rs index 9a0d8e201c24..9e9fc8b42490 100644 --- a/src/test/run-pass/inconsistent-lifetime-mismatch.rs +++ b/src/test/ui/run-pass/binding/inconsistent-lifetime-mismatch.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn foo(_: &[&str]) {} diff --git a/src/test/run-pass/inferred-suffix-in-pattern-range.rs b/src/test/ui/run-pass/binding/inferred-suffix-in-pattern-range.rs similarity index 98% rename from src/test/run-pass/inferred-suffix-in-pattern-range.rs rename to src/test/ui/run-pass/binding/inferred-suffix-in-pattern-range.rs index 89d26aade2ec..3be0991aea6a 100644 --- a/src/test/run-pass/inferred-suffix-in-pattern-range.rs +++ b/src/test/ui/run-pass/binding/inferred-suffix-in-pattern-range.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = 2; diff --git a/src/test/run-pass/irrefutable-slice-patterns.rs b/src/test/ui/run-pass/binding/irrefutable-slice-patterns.rs similarity index 98% rename from src/test/run-pass/irrefutable-slice-patterns.rs rename to src/test/ui/run-pass/binding/irrefutable-slice-patterns.rs index c2e95eb54f90..9cd62f9a9010 100644 --- a/src/test/run-pass/irrefutable-slice-patterns.rs +++ b/src/test/ui/run-pass/binding/irrefutable-slice-patterns.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // #47096 #![feature(slice_patterns)] diff --git a/src/test/run-pass/let-assignability.rs b/src/test/ui/run-pass/binding/let-assignability.rs similarity index 98% rename from src/test/run-pass/let-assignability.rs rename to src/test/ui/run-pass/binding/let-assignability.rs index 69b0eab99f71..99fc172892c2 100644 --- a/src/test/run-pass/let-assignability.rs +++ b/src/test/ui/run-pass/binding/let-assignability.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn f() { diff --git a/src/test/run-pass/let-destruct-ref.rs b/src/test/ui/run-pass/binding/let-destruct-ref.rs similarity index 97% rename from src/test/run-pass/let-destruct-ref.rs rename to src/test/ui/run-pass/binding/let-destruct-ref.rs index c9504f87c490..1c1b1a397692 100644 --- a/src/test/run-pass/let-destruct-ref.rs +++ b/src/test/ui/run-pass/binding/let-destruct-ref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = 3_usize; diff --git a/src/test/run-pass/let-var-hygiene.rs b/src/test/ui/run-pass/binding/let-var-hygiene.rs similarity index 98% rename from src/test/run-pass/let-var-hygiene.rs rename to src/test/ui/run-pass/binding/let-var-hygiene.rs index d9087f58befe..d432dbe86b91 100644 --- a/src/test/run-pass/let-var-hygiene.rs +++ b/src/test/ui/run-pass/binding/let-var-hygiene.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // shouldn't affect evaluation of $ex: macro_rules! bad_macro { diff --git a/src/test/run-pass/match-arm-statics.rs b/src/test/ui/run-pass/binding/match-arm-statics.rs similarity index 99% rename from src/test/run-pass/match-arm-statics.rs rename to src/test/ui/run-pass/binding/match-arm-statics.rs index ca6ef2e42777..c5111073ca8b 100644 --- a/src/test/run-pass/match-arm-statics.rs +++ b/src/test/ui/run-pass/binding/match-arm-statics.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -g #[derive(PartialEq, Eq)] diff --git a/src/test/run-pass/match-beginning-vert.rs b/src/test/ui/run-pass/binding/match-beginning-vert.rs similarity index 98% rename from src/test/run-pass/match-beginning-vert.rs rename to src/test/ui/run-pass/binding/match-beginning-vert.rs index cdacfb2f0572..16954f85752a 100644 --- a/src/test/run-pass/match-beginning-vert.rs +++ b/src/test/ui/run-pass/binding/match-beginning-vert.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Foo { A, B, diff --git a/src/test/run-pass/match-borrowed_str.rs b/src/test/ui/run-pass/binding/match-borrowed_str.rs similarity index 98% rename from src/test/run-pass/match-borrowed_str.rs rename to src/test/ui/run-pass/binding/match-borrowed_str.rs index b027e62494c2..0871ff836cca 100644 --- a/src/test/run-pass/match-borrowed_str.rs +++ b/src/test/ui/run-pass/binding/match-borrowed_str.rs @@ -8,8 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - -#![allow(unnecessary_allocation)] +// run-pass fn f1(ref_string: &str) -> String { match ref_string { diff --git a/src/test/run-pass/match-bot-2.rs b/src/test/ui/run-pass/binding/match-bot-2.rs similarity index 98% rename from src/test/run-pass/match-bot-2.rs rename to src/test/ui/run-pass/binding/match-bot-2.rs index 88c514a724f2..8f9a8d2cfcca 100644 --- a/src/test/run-pass/match-bot-2.rs +++ b/src/test/ui/run-pass/binding/match-bot-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // n.b. This was only ever failing with optimization disabled. fn a() -> isize { match return 1 { 2 => 3, _ => panic!() } } diff --git a/src/test/run-pass/match-bot.rs b/src/test/ui/run-pass/binding/match-bot.rs similarity index 98% rename from src/test/run-pass/match-bot.rs rename to src/test/ui/run-pass/binding/match-bot.rs index 7745410fa434..d91d95b826a1 100644 --- a/src/test/run-pass/match-bot.rs +++ b/src/test/ui/run-pass/binding/match-bot.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let i: isize = diff --git a/src/test/run-pass/match-byte-array-patterns.rs b/src/test/ui/run-pass/binding/match-byte-array-patterns.rs similarity index 99% rename from src/test/run-pass/match-byte-array-patterns.rs rename to src/test/ui/run-pass/binding/match-byte-array-patterns.rs index dbfe588fb0c6..728d4a241fef 100644 --- a/src/test/run-pass/match-byte-array-patterns.rs +++ b/src/test/ui/run-pass/binding/match-byte-array-patterns.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(slice_patterns)] fn main() { diff --git a/src/test/run-pass/match-enum-struct-0.rs b/src/test/ui/run-pass/binding/match-enum-struct-0.rs similarity index 98% rename from src/test/run-pass/match-enum-struct-0.rs rename to src/test/ui/run-pass/binding/match-enum-struct-0.rs index 1754dc0c960f..9ddf3b421d5e 100644 --- a/src/test/run-pass/match-enum-struct-0.rs +++ b/src/test/ui/run-pass/binding/match-enum-struct-0.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // regression test for issue #5625 diff --git a/src/test/run-pass/match-enum-struct-1.rs b/src/test/ui/run-pass/binding/match-enum-struct-1.rs similarity index 98% rename from src/test/run-pass/match-enum-struct-1.rs rename to src/test/ui/run-pass/binding/match-enum-struct-1.rs index ebf2db36700c..46d9c19bf849 100644 --- a/src/test/run-pass/match-enum-struct-1.rs +++ b/src/test/ui/run-pass/binding/match-enum-struct-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { Foo{f : isize}, diff --git a/src/test/run-pass/match-implicit-copy-unique.rs b/src/test/ui/run-pass/binding/match-implicit-copy-unique.rs similarity index 93% rename from src/test/run-pass/match-implicit-copy-unique.rs rename to src/test/ui/run-pass/binding/match-implicit-copy-unique.rs index 10de6eeabdda..68edbea34717 100644 --- a/src/test/run-pass/match-implicit-copy-unique.rs +++ b/src/test/ui/run-pass/binding/match-implicit-copy-unique.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_shorthand_field_patterns)] #![feature(box_syntax)] struct Pair { a: Box, b: Box } diff --git a/src/test/run-pass/match-in-macro.rs b/src/test/ui/run-pass/binding/match-in-macro.rs similarity index 98% rename from src/test/run-pass/match-in-macro.rs rename to src/test/ui/run-pass/binding/match-in-macro.rs index e096c97e16f1..5c4c7c048ef7 100644 --- a/src/test/run-pass/match-in-macro.rs +++ b/src/test/ui/run-pass/binding/match-in-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Foo { B { b1: isize, bb1: isize}, diff --git a/src/test/run-pass/match-join.rs b/src/test/ui/run-pass/binding/match-join.rs similarity index 98% rename from src/test/run-pass/match-join.rs rename to src/test/ui/run-pass/binding/match-join.rs index b47732b325a9..94ea8edd70f4 100644 --- a/src/test/run-pass/match-join.rs +++ b/src/test/ui/run-pass/binding/match-join.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo(y: Option) { let mut x: isize; let mut rs: Vec = Vec::new(); diff --git a/src/test/run-pass/match-larger-const.rs b/src/test/ui/run-pass/binding/match-larger-const.rs similarity index 98% rename from src/test/run-pass/match-larger-const.rs rename to src/test/ui/run-pass/binding/match-larger-const.rs index 8cb4d92c21cf..f649ce0ee0e0 100644 --- a/src/test/run-pass/match-larger-const.rs +++ b/src/test/ui/run-pass/binding/match-larger-const.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Eq, PartialEq)] pub struct Data([u8; 4]); diff --git a/src/test/run-pass/match-naked-record-expr.rs b/src/test/ui/run-pass/binding/match-naked-record-expr.rs similarity index 98% rename from src/test/run-pass/match-naked-record-expr.rs rename to src/test/ui/run-pass/binding/match-naked-record-expr.rs index e558e88e03d9..f016ca8e43ce 100644 --- a/src/test/run-pass/match-naked-record-expr.rs +++ b/src/test/ui/run-pass/binding/match-naked-record-expr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct X { x: isize } diff --git a/src/test/run-pass/match-naked-record.rs b/src/test/ui/run-pass/binding/match-naked-record.rs similarity index 98% rename from src/test/run-pass/match-naked-record.rs rename to src/test/ui/run-pass/binding/match-naked-record.rs index a2b35e6558c4..550ace8b6495 100644 --- a/src/test/run-pass/match-naked-record.rs +++ b/src/test/ui/run-pass/binding/match-naked-record.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct X { x: isize } diff --git a/src/test/run-pass/match-path.rs b/src/test/ui/run-pass/binding/match-path.rs similarity index 93% rename from src/test/run-pass/match-path.rs rename to src/test/ui/run-pass/binding/match-path.rs index 1b3594a0a792..06d7095a9248 100644 --- a/src/test/run-pass/match-path.rs +++ b/src/test/ui/run-pass/binding/match-path.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/match-pattern-bindings.rs b/src/test/ui/run-pass/binding/match-pattern-bindings.rs similarity index 98% rename from src/test/run-pass/match-pattern-bindings.rs rename to src/test/ui/run-pass/binding/match-pattern-bindings.rs index 9f687ab99e80..e6242a0ee587 100644 --- a/src/test/run-pass/match-pattern-bindings.rs +++ b/src/test/ui/run-pass/binding/match-pattern-bindings.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let value = Some(1); diff --git a/src/test/run-pass/match-pattern-lit.rs b/src/test/ui/run-pass/binding/match-pattern-lit.rs similarity index 98% rename from src/test/run-pass/match-pattern-lit.rs rename to src/test/ui/run-pass/binding/match-pattern-lit.rs index 32de1c6c6742..8e6129d60b58 100644 --- a/src/test/run-pass/match-pattern-lit.rs +++ b/src/test/ui/run-pass/binding/match-pattern-lit.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn altlit(f: isize) -> isize { diff --git a/src/test/run-pass/match-pattern-no-type-params.rs b/src/test/ui/run-pass/binding/match-pattern-no-type-params.rs similarity index 93% rename from src/test/run-pass/match-pattern-no-type-params.rs rename to src/test/ui/run-pass/binding/match-pattern-no-type-params.rs index ccf23b87ea3b..2486fa782e0f 100644 --- a/src/test/run-pass/match-pattern-no-type-params.rs +++ b/src/test/ui/run-pass/binding/match-pattern-no-type-params.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + enum maybe { nothing, just(T), } fn foo(x: maybe) { diff --git a/src/test/run-pass/match-pattern-simple.rs b/src/test/ui/run-pass/binding/match-pattern-simple.rs similarity index 97% rename from src/test/run-pass/match-pattern-simple.rs rename to src/test/ui/run-pass/binding/match-pattern-simple.rs index 8e729e2eab38..d15256612692 100644 --- a/src/test/run-pass/match-pattern-simple.rs +++ b/src/test/ui/run-pass/binding/match-pattern-simple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/match-phi.rs b/src/test/ui/run-pass/binding/match-phi.rs similarity index 94% rename from src/test/run-pass/match-phi.rs rename to src/test/ui/run-pass/binding/match-phi.rs index 24185ffa4128..06a011c0fa27 100644 --- a/src/test/run-pass/match-phi.rs +++ b/src/test/ui/run-pass/binding/match-phi.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 - -#![allow(dead_assignment)] +#![allow(non_camel_case_types)] #![allow(unused_variables)] enum thing { a, b, c, } diff --git a/src/test/run-pass/match-pipe-binding.rs b/src/test/ui/run-pass/binding/match-pipe-binding.rs similarity index 99% rename from src/test/run-pass/match-pipe-binding.rs rename to src/test/ui/run-pass/binding/match-pipe-binding.rs index 9592da77a1b5..577e5c97e42a 100644 --- a/src/test/run-pass/match-pipe-binding.rs +++ b/src/test/ui/run-pass/binding/match-pipe-binding.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -Z borrowck=compare fn test1() { diff --git a/src/test/run-pass/match-range-infer.rs b/src/test/ui/run-pass/binding/match-range-infer.rs similarity index 98% rename from src/test/run-pass/match-range-infer.rs rename to src/test/ui/run-pass/binding/match-range-infer.rs index cf07345d3433..7178d1837c7a 100644 --- a/src/test/run-pass/match-range-infer.rs +++ b/src/test/ui/run-pass/binding/match-range-infer.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that type inference for range patterns works correctly (is bi-directional). pub fn main() { diff --git a/src/test/run-pass/match-range-static.rs b/src/test/ui/run-pass/binding/match-range-static.rs similarity index 93% rename from src/test/run-pass/match-range-static.rs rename to src/test/ui/run-pass/binding/match-range-static.rs index b63ca7defd61..5be8db5fc86b 100644 --- a/src/test/run-pass/match-range-static.rs +++ b/src/test/ui/run-pass/binding/match-range-static.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_upper_case_globals)] const s: isize = 1; const e: isize = 42; diff --git a/src/test/run-pass/match-range.rs b/src/test/ui/run-pass/binding/match-range.rs similarity index 95% rename from src/test/run-pass/match-range.rs rename to src/test/ui/run-pass/binding/match-range.rs index efa725321967..a9687943e993 100644 --- a/src/test/run-pass/match-range.rs +++ b/src/test/ui/run-pass/binding/match-range.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(illegal_floating_point_literal_pattern)] // FIXME #41620 #![feature(exclusive_range_pattern)] pub fn main() { diff --git a/src/test/run-pass/match-reassign.rs b/src/test/ui/run-pass/binding/match-reassign.rs similarity index 98% rename from src/test/run-pass/match-reassign.rs rename to src/test/ui/run-pass/binding/match-reassign.rs index bedcee43db5b..89b12976355b 100644 --- a/src/test/run-pass/match-reassign.rs +++ b/src/test/ui/run-pass/binding/match-reassign.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #23698: The reassignment checker only cared // about the last assignment in a match arm body diff --git a/src/test/run-pass/match-ref-binding-in-guard-3256.rs b/src/test/ui/run-pass/binding/match-ref-binding-in-guard-3256.rs similarity index 98% rename from src/test/run-pass/match-ref-binding-in-guard-3256.rs rename to src/test/ui/run-pass/binding/match-ref-binding-in-guard-3256.rs index dc3c759078f3..2da75d941b4c 100644 --- a/src/test/run-pass/match-ref-binding-in-guard-3256.rs +++ b/src/test/ui/run-pass/binding/match-ref-binding-in-guard-3256.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::sync::Mutex; diff --git a/src/test/run-pass/match-ref-binding-mut-option.rs b/src/test/ui/run-pass/binding/match-ref-binding-mut-option.rs similarity index 98% rename from src/test/run-pass/match-ref-binding-mut-option.rs rename to src/test/ui/run-pass/binding/match-ref-binding-mut-option.rs index f429e7b58e38..a3d26024732d 100644 --- a/src/test/run-pass/match-ref-binding-mut-option.rs +++ b/src/test/ui/run-pass/binding/match-ref-binding-mut-option.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut v = Some(22); diff --git a/src/test/run-pass/match-ref-binding-mut.rs b/src/test/ui/run-pass/binding/match-ref-binding-mut.rs similarity index 92% rename from src/test/run-pass/match-ref-binding-mut.rs rename to src/test/ui/run-pass/binding/match-ref-binding-mut.rs index abc418ddd516..c1f09502542a 100644 --- a/src/test/run-pass/match-ref-binding-mut.rs +++ b/src/test/ui/run-pass/binding/match-ref-binding-mut.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_shorthand_field_patterns)] struct Rec { f: isize diff --git a/src/test/run-pass/match-ref-binding.rs b/src/test/ui/run-pass/binding/match-ref-binding.rs similarity index 98% rename from src/test/run-pass/match-ref-binding.rs rename to src/test/ui/run-pass/binding/match-ref-binding.rs index eab7ed529b1f..bc36b8102ce0 100644 --- a/src/test/run-pass/match-ref-binding.rs +++ b/src/test/ui/run-pass/binding/match-ref-binding.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn destructure(x: Option) -> isize { match x { diff --git a/src/test/run-pass/match-ref-unsized.rs b/src/test/ui/run-pass/binding/match-ref-unsized.rs similarity index 98% rename from src/test/run-pass/match-ref-unsized.rs rename to src/test/ui/run-pass/binding/match-ref-unsized.rs index 4de028299df8..7ef193300150 100644 --- a/src/test/run-pass/match-ref-unsized.rs +++ b/src/test/ui/run-pass/binding/match-ref-unsized.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Binding unsized expressions to ref patterns pub fn main() { diff --git a/src/test/run-pass/match-static-const-rename.rs b/src/test/ui/run-pass/binding/match-static-const-rename.rs similarity index 99% rename from src/test/run-pass/match-static-const-rename.rs rename to src/test/ui/run-pass/binding/match-static-const-rename.rs index 77e3b724cbe7..0d75c81b1e6d 100644 --- a/src/test/run-pass/match-static-const-rename.rs +++ b/src/test/ui/run-pass/binding/match-static-const-rename.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #7526: lowercase static constants in patterns look like bindings // This is similar to compile-fail/match-static-const-lc, except it diff --git a/src/test/run-pass/match-str.rs b/src/test/ui/run-pass/binding/match-str.rs similarity index 95% rename from src/test/run-pass/match-str.rs rename to src/test/ui/run-pass/binding/match-str.rs index e6def65e53a6..0722a6f0b32e 100644 --- a/src/test/run-pass/match-str.rs +++ b/src/test/ui/run-pass/binding/match-str.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #53 +#![allow(non_camel_case_types)] pub fn main() { diff --git a/src/test/run-pass/match-struct-0.rs b/src/test/ui/run-pass/binding/match-struct-0.rs similarity index 98% rename from src/test/run-pass/match-struct-0.rs rename to src/test/ui/run-pass/binding/match-struct-0.rs index e9e45df460df..facfaae54051 100644 --- a/src/test/run-pass/match-struct-0.rs +++ b/src/test/ui/run-pass/binding/match-struct-0.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo{ f : isize, diff --git a/src/test/run-pass/match-tag.rs b/src/test/ui/run-pass/binding/match-tag.rs similarity index 96% rename from src/test/run-pass/match-tag.rs rename to src/test/ui/run-pass/binding/match-tag.rs index e4a0d4e95f3c..aeeb7dd4bc9e 100644 --- a/src/test/run-pass/match-tag.rs +++ b/src/test/ui/run-pass/binding/match-tag.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - +// run-pass +#![allow(non_camel_case_types)] diff --git a/src/test/run-pass/match-unique-bind.rs b/src/test/ui/run-pass/binding/match-unique-bind.rs similarity index 98% rename from src/test/run-pass/match-unique-bind.rs rename to src/test/ui/run-pass/binding/match-unique-bind.rs index ca864c05cfdc..a543527586f8 100644 --- a/src/test/run-pass/match-unique-bind.rs +++ b/src/test/ui/run-pass/binding/match-unique-bind.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/match-unsized.rs b/src/test/ui/run-pass/binding/match-unsized.rs similarity index 98% rename from src/test/run-pass/match-unsized.rs rename to src/test/ui/run-pass/binding/match-unsized.rs index 7253672a7ff4..2e2f0f0b7ea4 100644 --- a/src/test/run-pass/match-unsized.rs +++ b/src/test/ui/run-pass/binding/match-unsized.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let data: &'static str = "Hello, World!"; match data { diff --git a/src/test/run-pass/match-value-binding-in-guard-3291.rs b/src/test/ui/run-pass/binding/match-value-binding-in-guard-3291.rs similarity index 98% rename from src/test/run-pass/match-value-binding-in-guard-3291.rs rename to src/test/ui/run-pass/binding/match-value-binding-in-guard-3291.rs index ab56a8cfc939..a24a38af22f1 100644 --- a/src/test/run-pass/match-value-binding-in-guard-3291.rs +++ b/src/test/ui/run-pass/binding/match-value-binding-in-guard-3291.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/match-var-hygiene.rs b/src/test/ui/run-pass/binding/match-var-hygiene.rs similarity index 98% rename from src/test/run-pass/match-var-hygiene.rs rename to src/test/ui/run-pass/binding/match-var-hygiene.rs index dfb23aabf191..5d4347559f78 100644 --- a/src/test/run-pass/match-var-hygiene.rs +++ b/src/test/ui/run-pass/binding/match-var-hygiene.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // shouldn't affect evaluation of $ex. macro_rules! bad_macro { ($ex:expr) => ( {match 9 {_x => $ex}} diff --git a/src/test/run-pass/match-vec-alternatives.rs b/src/test/ui/run-pass/binding/match-vec-alternatives.rs similarity index 99% rename from src/test/run-pass/match-vec-alternatives.rs rename to src/test/ui/run-pass/binding/match-vec-alternatives.rs index 7d03d9c2abe2..4c7289245568 100644 --- a/src/test/run-pass/match-vec-alternatives.rs +++ b/src/test/ui/run-pass/binding/match-vec-alternatives.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(slice_patterns)] fn match_vecs<'a, T>(l1: &'a [T], l2: &'a [T]) -> &'static str { diff --git a/src/test/run-pass/match-vec-rvalue.rs b/src/test/ui/run-pass/binding/match-vec-rvalue.rs similarity index 98% rename from src/test/run-pass/match-vec-rvalue.rs rename to src/test/ui/run-pass/binding/match-vec-rvalue.rs index 3d221927b96e..308a4938b3aa 100644 --- a/src/test/run-pass/match-vec-rvalue.rs +++ b/src/test/ui/run-pass/binding/match-vec-rvalue.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that matching rvalues with drops does not crash. diff --git a/src/test/run-pass/match-with-ret-arm.rs b/src/test/ui/run-pass/binding/match-with-ret-arm.rs similarity index 98% rename from src/test/run-pass/match-with-ret-arm.rs rename to src/test/ui/run-pass/binding/match-with-ret-arm.rs index 79b197f08e27..fe7aa288d52b 100644 --- a/src/test/run-pass/match-with-ret-arm.rs +++ b/src/test/ui/run-pass/binding/match-with-ret-arm.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { // sometimes we have had trouble finding // the right type for f, as we unified diff --git a/src/test/run-pass/multi-let.rs b/src/test/ui/run-pass/binding/multi-let.rs similarity index 97% rename from src/test/run-pass/multi-let.rs rename to src/test/ui/run-pass/binding/multi-let.rs index 3b060bb18868..6ecd84d8c58b 100644 --- a/src/test/run-pass/multi-let.rs +++ b/src/test/ui/run-pass/binding/multi-let.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = 10; diff --git a/src/test/run-pass/mut-in-ident-patterns.rs b/src/test/ui/run-pass/binding/mut-in-ident-patterns.rs similarity index 95% rename from src/test/run-pass/mut-in-ident-patterns.rs rename to src/test/ui/run-pass/binding/mut-in-ident-patterns.rs index 32ff7efffa0d..1e28b77f2ce0 100644 --- a/src/test/run-pass/mut-in-ident-patterns.rs +++ b/src/test/ui/run-pass/binding/mut-in-ident-patterns.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_shorthand_field_patterns)] trait Foo { fn foo(&self, mut x: isize) -> isize { diff --git a/src/test/run-pass/nested-exhaustive-match.rs b/src/test/ui/run-pass/binding/nested-exhaustive-match.rs similarity index 98% rename from src/test/run-pass/nested-exhaustive-match.rs rename to src/test/ui/run-pass/binding/nested-exhaustive-match.rs index e0a3b1adfe49..8456e63d4c7b 100644 --- a/src/test/run-pass/nested-exhaustive-match.rs +++ b/src/test/ui/run-pass/binding/nested-exhaustive-match.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Foo { foo: bool, bar: Option, baz: isize } diff --git a/src/test/run-pass/nested-matchs.rs b/src/test/ui/run-pass/binding/nested-matchs.rs similarity index 98% rename from src/test/run-pass/nested-matchs.rs rename to src/test/ui/run-pass/binding/nested-matchs.rs index 46d30b68f789..e1012f3b384c 100644 --- a/src/test/run-pass/nested-matchs.rs +++ b/src/test/ui/run-pass/binding/nested-matchs.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn baz() -> ! { panic!(); } fn foo() { diff --git a/src/test/run-pass/nested-pattern.rs b/src/test/ui/run-pass/binding/nested-pattern.rs similarity index 94% rename from src/test/run-pass/nested-pattern.rs rename to src/test/ui/run-pass/binding/nested-pattern.rs index f9abdd56fa44..5bf558a48712 100644 --- a/src/test/run-pass/nested-pattern.rs +++ b/src/test/ui/run-pass/binding/nested-pattern.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - +// run-pass +#![allow(non_camel_case_types)] // a bug was causing this to complain about leaked memory on exit diff --git a/src/test/run-pass/nil-pattern.rs b/src/test/ui/run-pass/binding/nil-pattern.rs similarity index 97% rename from src/test/run-pass/nil-pattern.rs rename to src/test/ui/run-pass/binding/nil-pattern.rs index 342644e03843..39b2f2da6244 100644 --- a/src/test/run-pass/nil-pattern.rs +++ b/src/test/ui/run-pass/binding/nil-pattern.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { let x = (); match x { () => { } } } diff --git a/src/test/run-pass/nullary-or-pattern.rs b/src/test/ui/run-pass/binding/nullary-or-pattern.rs similarity index 93% rename from src/test/run-pass/nullary-or-pattern.rs rename to src/test/ui/run-pass/binding/nullary-or-pattern.rs index feb8726c0e4a..892464dd1dbf 100644 --- a/src/test/run-pass/nullary-or-pattern.rs +++ b/src/test/ui/run-pass/binding/nullary-or-pattern.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] enum blah { a, b, } diff --git a/src/test/run-pass/optional_comma_in_match_arm.rs b/src/test/ui/run-pass/binding/optional_comma_in_match_arm.rs similarity index 97% rename from src/test/run-pass/optional_comma_in_match_arm.rs rename to src/test/ui/run-pass/binding/optional_comma_in_match_arm.rs index b25ec444f22a..90ef3c2b7eaf 100644 --- a/src/test/run-pass/optional_comma_in_match_arm.rs +++ b/src/test/ui/run-pass/binding/optional_comma_in_match_arm.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37199 +#![allow(while_true)] fn main() { let x = 1; diff --git a/src/test/run-pass/or-pattern.rs b/src/test/ui/run-pass/binding/or-pattern.rs similarity index 94% rename from src/test/run-pass/or-pattern.rs rename to src/test/ui/run-pass/binding/or-pattern.rs index 3bb0c71c5811..a9b3e2786524 100644 --- a/src/test/run-pass/or-pattern.rs +++ b/src/test/ui/run-pass/binding/or-pattern.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] enum blah { a(isize, isize, usize), b(isize, isize), c, } diff --git a/src/test/run-pass/order-drop-with-match.rs b/src/test/ui/run-pass/binding/order-drop-with-match.rs similarity index 99% rename from src/test/run-pass/order-drop-with-match.rs rename to src/test/ui/run-pass/binding/order-drop-with-match.rs index 8f82e3aaba15..7bb929325ad6 100644 --- a/src/test/run-pass/order-drop-with-match.rs +++ b/src/test/ui/run-pass/binding/order-drop-with-match.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test to make sure the destructors run in the right order. // Each destructor sets it's tag in the corresponding entry diff --git a/src/test/run-pass/pat-ranges.rs b/src/test/ui/run-pass/binding/pat-ranges.rs similarity index 98% rename from src/test/run-pass/pat-ranges.rs rename to src/test/ui/run-pass/binding/pat-ranges.rs index 964989508ccf..44666eda3ca7 100644 --- a/src/test/run-pass/pat-ranges.rs +++ b/src/test/ui/run-pass/binding/pat-ranges.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Parsing of range patterns const NUM1: i32 = 10; diff --git a/src/test/run-pass/pat-tuple-1.rs b/src/test/ui/run-pass/binding/pat-tuple-1.rs similarity index 99% rename from src/test/run-pass/pat-tuple-1.rs rename to src/test/ui/run-pass/binding/pat-tuple-1.rs index 45a9a2b303c9..dc8a7ff7a07d 100644 --- a/src/test/run-pass/pat-tuple-1.rs +++ b/src/test/ui/run-pass/binding/pat-tuple-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn tuple() { let x = (1, 2, 3); match x { diff --git a/src/test/run-pass/pat-tuple-2.rs b/src/test/ui/run-pass/binding/pat-tuple-2.rs similarity index 98% rename from src/test/run-pass/pat-tuple-2.rs rename to src/test/ui/run-pass/binding/pat-tuple-2.rs index ee60d1c01cf8..0428e32c43b4 100644 --- a/src/test/run-pass/pat-tuple-2.rs +++ b/src/test/ui/run-pass/binding/pat-tuple-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn tuple() { let x = (1,); match x { diff --git a/src/test/run-pass/pat-tuple-3.rs b/src/test/ui/run-pass/binding/pat-tuple-3.rs similarity index 98% rename from src/test/run-pass/pat-tuple-3.rs rename to src/test/ui/run-pass/binding/pat-tuple-3.rs index 7a46c1deb59b..60b933e4ce44 100644 --- a/src/test/run-pass/pat-tuple-3.rs +++ b/src/test/ui/run-pass/binding/pat-tuple-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn tuple() { let x = (1, 2, 3); let branch = match x { diff --git a/src/test/run-pass/pat-tuple-4.rs b/src/test/ui/run-pass/binding/pat-tuple-4.rs similarity index 99% rename from src/test/run-pass/pat-tuple-4.rs rename to src/test/ui/run-pass/binding/pat-tuple-4.rs index 1d75e1e9d14d..cd19f2c67a12 100644 --- a/src/test/run-pass/pat-tuple-4.rs +++ b/src/test/ui/run-pass/binding/pat-tuple-4.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn tuple() { let x = (1, 2, 3); match x { diff --git a/src/test/run-pass/pat-tuple-5.rs b/src/test/ui/run-pass/binding/pat-tuple-5.rs similarity index 98% rename from src/test/run-pass/pat-tuple-5.rs rename to src/test/ui/run-pass/binding/pat-tuple-5.rs index 1192932f13da..0ac4c24c4eef 100644 --- a/src/test/run-pass/pat-tuple-5.rs +++ b/src/test/ui/run-pass/binding/pat-tuple-5.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn tuple() { struct S; struct Z; diff --git a/src/test/run-pass/pat-tuple-6.rs b/src/test/ui/run-pass/binding/pat-tuple-6.rs similarity index 99% rename from src/test/run-pass/pat-tuple-6.rs rename to src/test/ui/run-pass/binding/pat-tuple-6.rs index 9d3cd65b455c..b3cd0e1b5431 100644 --- a/src/test/run-pass/pat-tuple-6.rs +++ b/src/test/ui/run-pass/binding/pat-tuple-6.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn tuple() { let x = (1, 2, 3, 4, 5); match x { diff --git a/src/test/run-pass/pat-tuple-7.rs b/src/test/ui/run-pass/binding/pat-tuple-7.rs similarity index 97% rename from src/test/run-pass/pat-tuple-7.rs rename to src/test/ui/run-pass/binding/pat-tuple-7.rs index 6d51df63e158..c6730f14bc4c 100644 --- a/src/test/run-pass/pat-tuple-7.rs +++ b/src/test/ui/run-pass/binding/pat-tuple-7.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(pattern_parentheses)] fn main() { diff --git a/src/test/run-pass/pattern-bound-var-in-for-each.rs b/src/test/ui/run-pass/binding/pattern-bound-var-in-for-each.rs similarity index 98% rename from src/test/run-pass/pattern-bound-var-in-for-each.rs rename to src/test/ui/run-pass/binding/pattern-bound-var-in-for-each.rs index 778f355b24b8..2ee697fe2ff0 100644 --- a/src/test/run-pass/pattern-bound-var-in-for-each.rs +++ b/src/test/ui/run-pass/binding/pattern-bound-var-in-for-each.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that codegen_path checks whether a // pattern-bound var is an upvar (when codegenning // the for-each body) diff --git a/src/test/run-pass/pattern-in-closure.rs b/src/test/ui/run-pass/binding/pattern-in-closure.rs similarity index 92% rename from src/test/run-pass/pattern-in-closure.rs rename to src/test/ui/run-pass/binding/pattern-in-closure.rs index 909ed985d7f4..9a5a420a80ba 100644 --- a/src/test/run-pass/pattern-in-closure.rs +++ b/src/test/ui/run-pass/binding/pattern-in-closure.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_shorthand_field_patterns)] + struct Foo { x: isize, y: isize diff --git a/src/test/run-pass/range-inclusive-pattern-precedence.rs b/src/test/ui/run-pass/binding/range-inclusive-pattern-precedence.rs similarity index 98% rename from src/test/run-pass/range-inclusive-pattern-precedence.rs rename to src/test/ui/run-pass/binding/range-inclusive-pattern-precedence.rs index 5e491d48bcf4..350a64781cdb 100644 --- a/src/test/run-pass/range-inclusive-pattern-precedence.rs +++ b/src/test/ui/run-pass/binding/range-inclusive-pattern-precedence.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_patterns, pattern_parentheses)] const VALUE: usize = 21; diff --git a/src/test/run-pass/simple-generic-match.rs b/src/test/ui/run-pass/binding/simple-generic-match.rs similarity index 93% rename from src/test/run-pass/simple-generic-match.rs rename to src/test/ui/run-pass/binding/simple-generic-match.rs index 02fc2a61d017..13c16790e09b 100644 --- a/src/test/run-pass/simple-generic-match.rs +++ b/src/test/ui/run-pass/binding/simple-generic-match.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - +// run-pass +#![allow(non_camel_case_types)] // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/use-uninit-match.rs b/src/test/ui/run-pass/binding/use-uninit-match.rs similarity index 94% rename from src/test/run-pass/use-uninit-match.rs rename to src/test/ui/run-pass/binding/use-uninit-match.rs index 9e606384f3fa..1fc597b636ec 100644 --- a/src/test/run-pass/use-uninit-match.rs +++ b/src/test/ui/run-pass/binding/use-uninit-match.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] fn foo(o: myoption) -> isize { diff --git a/src/test/run-pass/use-uninit-match2.rs b/src/test/ui/run-pass/binding/use-uninit-match2.rs similarity index 94% rename from src/test/run-pass/use-uninit-match2.rs rename to src/test/ui/run-pass/binding/use-uninit-match2.rs index dc0a6a26bc02..8eb44fd76e1d 100644 --- a/src/test/run-pass/use-uninit-match2.rs +++ b/src/test/ui/run-pass/binding/use-uninit-match2.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] fn foo(o: myoption) -> isize { diff --git a/src/test/run-pass/zero_sized_subslice_match.rs b/src/test/ui/run-pass/binding/zero_sized_subslice_match.rs similarity index 98% rename from src/test/run-pass/zero_sized_subslice_match.rs rename to src/test/ui/run-pass/binding/zero_sized_subslice_match.rs index d399ef72976f..db71d97a19d4 100644 --- a/src/test/run-pass/zero_sized_subslice_match.rs +++ b/src/test/ui/run-pass/binding/zero_sized_subslice_match.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(slice_patterns)] fn main() { diff --git a/src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs b/src/test/ui/run-pass/borrowck/borrowck-assign-to-subfield.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs rename to src/test/ui/run-pass/borrowck/borrowck-assign-to-subfield.rs index ee74a0544084..248e34bde09c 100644 --- a/src/test/run-pass/borrowck/borrowck-assign-to-subfield.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-assign-to-subfield.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs b/src/test/ui/run-pass/borrowck/borrowck-assignment-to-static-mut.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs rename to src/test/ui/run-pass/borrowck/borrowck-assignment-to-static-mut.rs index 302a7b96bc07..fa79ac84c865 100644 --- a/src/test/run-pass/borrowck/borrowck-assignment-to-static-mut.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-assignment-to-static-mut.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test taken from #45641 (https://github.com/rust-lang/rust/issues/45641) // revisions: ast mir diff --git a/src/test/run-pass/borrowck/borrowck-binding-mutbl.rs b/src/test/ui/run-pass/borrowck/borrowck-binding-mutbl.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-binding-mutbl.rs rename to src/test/ui/run-pass/borrowck/borrowck-binding-mutbl.rs index b6c2a3a61ea4..86875a038daa 100644 --- a/src/test/run-pass/borrowck/borrowck-binding-mutbl.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-binding-mutbl.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + struct F { f: Vec } fn impure(_v: &[isize]) { diff --git a/src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs b/src/test/ui/run-pass/borrowck/borrowck-borrow-from-expr-block.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs rename to src/test/ui/run-pass/borrowck/borrowck-borrow-from-expr-block.rs index 1d7230510df2..b85a9baf5a0a 100644 --- a/src/test/run-pass/borrowck/borrowck-borrow-from-expr-block.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-borrow-from-expr-block.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn borrow(x: &isize, f: F) where F: FnOnce(&isize) { diff --git a/src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs b/src/test/ui/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs rename to src/test/ui/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs index b716a1a27a19..72634651d959 100644 --- a/src/test/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-borrow-of-mut-base-ptr-safe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that freezing an `&mut` pointer while referent is // frozen is legal. // diff --git a/src/test/run-pass/borrowck/borrowck-closures-two-imm.rs b/src/test/ui/run-pass/borrowck/borrowck-closures-two-imm.rs similarity index 99% rename from src/test/run-pass/borrowck/borrowck-closures-two-imm.rs rename to src/test/ui/run-pass/borrowck/borrowck-closures-two-imm.rs index 5b15c8f0797f..8c6d92c99626 100644 --- a/src/test/run-pass/borrowck/borrowck-closures-two-imm.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-closures-two-imm.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that two closures can simultaneously have immutable // access to the variable, whether that immutable access be used // for direct reads or for taking immutable ref. Also check diff --git a/src/test/run-pass/borrowck/borrowck-field-sensitivity.rs b/src/test/ui/run-pass/borrowck/borrowck-field-sensitivity.rs similarity index 99% rename from src/test/run-pass/borrowck/borrowck-field-sensitivity.rs rename to src/test/ui/run-pass/borrowck/borrowck-field-sensitivity.rs index a465c9cf811a..a3d6f129f183 100644 --- a/src/test/run-pass/borrowck/borrowck-field-sensitivity.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-field-sensitivity.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs b/src/test/ui/run-pass/borrowck/borrowck-fixed-length-vecs.rs similarity index 97% rename from src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs rename to src/test/ui/run-pass/borrowck/borrowck-fixed-length-vecs.rs index 0e33351894d1..baefdf657ea3 100644 --- a/src/test/run-pass/borrowck/borrowck-fixed-length-vecs.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-fixed-length-vecs.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = [22]; diff --git a/src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs b/src/test/ui/run-pass/borrowck/borrowck-freeze-frozen-mut.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs rename to src/test/ui/run-pass/borrowck/borrowck-freeze-frozen-mut.rs index 380bd398a7cb..0ddb71d1d158 100644 --- a/src/test/run-pass/borrowck/borrowck-freeze-frozen-mut.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-freeze-frozen-mut.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that a `&mut` inside of an `&` is freezable. diff --git a/src/test/run-pass/borrowck/borrowck-lend-args.rs b/src/test/ui/run-pass/borrowck/borrowck-lend-args.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-lend-args.rs rename to src/test/ui/run-pass/borrowck/borrowck-lend-args.rs index f1f0274c5cc4..4ec7e0a58983 100644 --- a/src/test/run-pass/borrowck/borrowck-lend-args.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-lend-args.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs b/src/test/ui/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs similarity index 95% rename from src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs rename to src/test/ui/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs index fb30c85e7096..3f81c2e5619e 100644 --- a/src/test/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-macro-interaction-issue-6304.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(unconditional_recursion)] + // Check that we do not ICE when compiling this // macro, which reuses the expression `$id` diff --git a/src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs b/src/test/ui/run-pass/borrowck/borrowck-move-by-capture-ok.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs rename to src/test/ui/run-pass/borrowck/borrowck-move-by-capture-ok.rs index c3645867117d..180a6ad8f87f 100644 --- a/src/test/run-pass/borrowck/borrowck-move-by-capture-ok.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-move-by-capture-ok.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs b/src/test/ui/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs rename to src/test/ui/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs index f57a7bd7add4..4650ce8d2c42 100644 --- a/src/test/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-multiple-borrows-interior-boxes.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test case from #39963. #![feature(nll)] diff --git a/src/test/run-pass/borrowck/borrowck-mut-uniq.rs b/src/test/ui/run-pass/borrowck/borrowck-mut-uniq.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-mut-uniq.rs rename to src/test/ui/run-pass/borrowck/borrowck-mut-uniq.rs index ec868bc5c85e..87dd1f1de537 100644 --- a/src/test/run-pass/borrowck/borrowck-mut-uniq.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-mut-uniq.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] use std::mem::swap; diff --git a/src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs b/src/test/ui/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs rename to src/test/ui/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs index 4699f376313b..b616cf253821 100644 --- a/src/test/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-mut-vec-as-imm-slice.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn want_slice(v: &[isize]) -> isize { diff --git a/src/test/run-pass/borrowck/borrowck-pat-enum.rs b/src/test/ui/run-pass/borrowck/borrowck-pat-enum.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-pat-enum.rs rename to src/test/ui/run-pass/borrowck/borrowck-pat-enum.rs index 8de45e4205df..3b9c4aed03ec 100644 --- a/src/test/run-pass/borrowck/borrowck-pat-enum.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-pat-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37199 fn match_ref(v: Option) -> isize { diff --git a/src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs b/src/test/ui/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs rename to src/test/ui/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs index e0a5db678d2f..1ce7a00d4235 100644 --- a/src/test/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-pat-reassign-no-binding.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut x = None; diff --git a/src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs b/src/test/ui/run-pass/borrowck/borrowck-rvalues-mutable.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs rename to src/test/ui/run-pass/borrowck/borrowck-rvalues-mutable.rs index 93cb0cb0af23..936e5565eed6 100644 --- a/src/test/run-pass/borrowck/borrowck-rvalues-mutable.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-rvalues-mutable.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Counter { value: usize diff --git a/src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs b/src/test/ui/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs similarity index 99% rename from src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs rename to src/test/ui/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs index 59a5fea769a6..dd832b9eee08 100644 --- a/src/test/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-scope-of-deref-issue-4666.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that the scope of the pointer returned from `get()` is // limited to the deref operation itself, and does not infect the // block as a whole. diff --git a/src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs b/src/test/ui/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs rename to src/test/ui/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs index 48d16102ff3c..e7c1699f7b41 100644 --- a/src/test/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-slice-pattern-element-loan.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass //compile-flags: -Z borrowck=mir #![feature(slice_patterns)] diff --git a/src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs b/src/test/ui/run-pass/borrowck/borrowck-static-item-in-fn.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs rename to src/test/ui/run-pass/borrowck/borrowck-static-item-in-fn.rs index d51d0b1d2e1f..809948d5423d 100644 --- a/src/test/run-pass/borrowck/borrowck-static-item-in-fn.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-static-item-in-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #7740 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/borrowck/borrowck-trait-lifetime.rs b/src/test/ui/run-pass/borrowck/borrowck-trait-lifetime.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-trait-lifetime.rs rename to src/test/ui/run-pass/borrowck/borrowck-trait-lifetime.rs index 0bfa8f48650b..cf7a976628e8 100644 --- a/src/test/run-pass/borrowck/borrowck-trait-lifetime.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-trait-lifetime.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test verifies that casting from the same lifetime on a value // to the same lifetime on a trait succeeds. See issue #10766. diff --git a/src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs b/src/test/ui/run-pass/borrowck/borrowck-uniq-via-ref.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs rename to src/test/ui/run-pass/borrowck/borrowck-uniq-via-ref.rs index 0ec87599c639..f9b650e0e828 100644 --- a/src/test/run-pass/borrowck/borrowck-uniq-via-ref.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-uniq-via-ref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/borrowck/borrowck-univariant-enum.rs b/src/test/ui/run-pass/borrowck/borrowck-univariant-enum.rs similarity index 95% rename from src/test/run-pass/borrowck/borrowck-univariant-enum.rs rename to src/test/ui/run-pass/borrowck/borrowck-univariant-enum.rs index 2e8ddb080647..0a8d30753362 100644 --- a/src/test/run-pass/borrowck/borrowck-univariant-enum.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-univariant-enum.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - +// run-pass +#![allow(non_camel_case_types)] use std::cell::Cell; diff --git a/src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs b/src/test/ui/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs rename to src/test/ui/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs index de411d309609..aba46ad609f7 100644 --- a/src/test/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-unsafe-static-mutable-borrows.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // revisions: ast mir //[mir]compile-flags: -Z borrowck=mir diff --git a/src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs b/src/test/ui/run-pass/borrowck/borrowck-unused-mut-locals.rs similarity index 98% rename from src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs rename to src/test/ui/run-pass/borrowck/borrowck-unused-mut-locals.rs index 7f1b6ed17016..15eaf83b5084 100644 --- a/src/test/run-pass/borrowck/borrowck-unused-mut-locals.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-unused-mut-locals.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(nll)] #![deny(unused_mut)] diff --git a/src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs b/src/test/ui/run-pass/borrowck/borrowck-use-mut-borrow.rs similarity index 99% rename from src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs rename to src/test/ui/run-pass/borrowck/borrowck-use-mut-borrow.rs index 8c94df6dbf45..10809c1bb0be 100644 --- a/src/test/run-pass/borrowck/borrowck-use-mut-borrow.rs +++ b/src/test/ui/run-pass/borrowck/borrowck-use-mut-borrow.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/borrowck/two-phase-baseline.rs b/src/test/ui/run-pass/borrowck/two-phase-baseline.rs similarity index 98% rename from src/test/run-pass/borrowck/two-phase-baseline.rs rename to src/test/ui/run-pass/borrowck/two-phase-baseline.rs index ca15591a1019..561a5b3c1151 100644 --- a/src/test/run-pass/borrowck/two-phase-baseline.rs +++ b/src/test/ui/run-pass/borrowck/two-phase-baseline.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -Z borrowck=mir -Z two-phase-borrows // This is the "goto example" for why we want two phase borrows. diff --git a/src/test/run-pass/borrowck/two-phase-bin-ops.rs b/src/test/ui/run-pass/borrowck/two-phase-bin-ops.rs similarity index 99% rename from src/test/run-pass/borrowck/two-phase-bin-ops.rs rename to src/test/ui/run-pass/borrowck/two-phase-bin-ops.rs index 1b2529d7875a..ce601bc9a3c2 100644 --- a/src/test/run-pass/borrowck/two-phase-bin-ops.rs +++ b/src/test/ui/run-pass/borrowck/two-phase-bin-ops.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // revisions: lxl nll #![cfg_attr(nll, feature(nll))] diff --git a/src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs b/src/test/ui/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs similarity index 98% rename from src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs rename to src/test/ui/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs index 35a5422040a1..6d06d0c7941b 100644 --- a/src/test/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs +++ b/src/test/ui/run-pass/borrowck/two-phase-control-flow-split-before-activation.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // revisions: lxl nll //[lxl]compile-flags: -Z borrowck=mir -Z two-phase-borrows diff --git a/src/test/run-pass/auxiliary/cfg_inner_static.rs b/src/test/ui/run-pass/cfg/auxiliary/cfg_inner_static.rs similarity index 100% rename from src/test/run-pass/auxiliary/cfg_inner_static.rs rename to src/test/ui/run-pass/cfg/auxiliary/cfg_inner_static.rs diff --git a/src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs b/src/test/ui/run-pass/cfg/auxiliary/crate-attributes-using-cfg_attr.rs similarity index 100% rename from src/test/run-pass/auxiliary/crate-attributes-using-cfg_attr.rs rename to src/test/ui/run-pass/cfg/auxiliary/crate-attributes-using-cfg_attr.rs diff --git a/src/test/run-pass/cfg-attr-cfg.rs b/src/test/ui/run-pass/cfg/cfg-attr-cfg.rs similarity index 98% rename from src/test/run-pass/cfg-attr-cfg.rs rename to src/test/ui/run-pass/cfg/cfg-attr-cfg.rs index 74022d4c6c83..6e3d8f2e7f12 100644 --- a/src/test/run-pass/cfg-attr-cfg.rs +++ b/src/test/ui/run-pass/cfg/cfg-attr-cfg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // main is conditionally compiled, but the conditional compilation // is conditional too! diff --git a/src/test/run-pass/cfg-attr-crate.rs b/src/test/ui/run-pass/cfg/cfg-attr-crate.rs similarity index 98% rename from src/test/run-pass/cfg-attr-crate.rs rename to src/test/ui/run-pass/cfg/cfg-attr-crate.rs index 21dc7ff7e01f..d352e53f231a 100644 --- a/src/test/run-pass/cfg-attr-crate.rs +++ b/src/test/ui/run-pass/cfg/cfg-attr-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // https://github.com/rust-lang/rust/issues/21833#issuecomment-72353044 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/cfg-family.rs b/src/test/ui/run-pass/cfg/cfg-family.rs similarity index 98% rename from src/test/run-pass/cfg-family.rs rename to src/test/ui/run-pass/cfg/cfg-family.rs index e45e35b370d9..0a1241cccb82 100644 --- a/src/test/run-pass/cfg-family.rs +++ b/src/test/ui/run-pass/cfg/cfg-family.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 // ignore-cloudabi no target_family // ignore-wasm32-bare no target_family diff --git a/src/test/run-pass/cfg-in-crate-1.rs b/src/test/ui/run-pass/cfg/cfg-in-crate-1.rs similarity index 97% rename from src/test/run-pass/cfg-in-crate-1.rs rename to src/test/ui/run-pass/cfg/cfg-in-crate-1.rs index 5dd6fa45bb96..e66c8324f366 100644 --- a/src/test/run-pass/cfg-in-crate-1.rs +++ b/src/test/ui/run-pass/cfg/cfg-in-crate-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: --cfg bar -D warnings #![cfg(bar)] diff --git a/src/test/run-pass/cfg-macros-foo.rs b/src/test/ui/run-pass/cfg/cfg-macros-foo.rs similarity index 98% rename from src/test/run-pass/cfg-macros-foo.rs rename to src/test/ui/run-pass/cfg/cfg-macros-foo.rs index 36b9ce1585cf..6729d205410c 100644 --- a/src/test/run-pass/cfg-macros-foo.rs +++ b/src/test/ui/run-pass/cfg/cfg-macros-foo.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: --cfg foo // check that cfg correctly chooses between the macro impls (see also diff --git a/src/test/run-pass/cfg-macros-notfoo.rs b/src/test/ui/run-pass/cfg/cfg-macros-notfoo.rs similarity index 98% rename from src/test/run-pass/cfg-macros-notfoo.rs rename to src/test/ui/run-pass/cfg/cfg-macros-notfoo.rs index 4e1b833add01..2e9614cf8af7 100644 --- a/src/test/run-pass/cfg-macros-notfoo.rs +++ b/src/test/ui/run-pass/cfg/cfg-macros-notfoo.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: // check that cfg correctly chooses between the macro impls (see also diff --git a/src/test/run-pass/cfg-match-arm.rs b/src/test/ui/run-pass/cfg/cfg-match-arm.rs similarity index 98% rename from src/test/run-pass/cfg-match-arm.rs rename to src/test/ui/run-pass/cfg/cfg-match-arm.rs index 05dc7d52424b..8443d59e8697 100644 --- a/src/test/run-pass/cfg-match-arm.rs +++ b/src/test/ui/run-pass/cfg/cfg-match-arm.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 enum Foo { diff --git a/src/test/run-pass/cfg-target-family.rs b/src/test/ui/run-pass/cfg/cfg-target-family.rs similarity index 98% rename from src/test/run-pass/cfg-target-family.rs rename to src/test/ui/run-pass/cfg/cfg-target-family.rs index 7c279e43e0e6..3345df69d87a 100644 --- a/src/test/run-pass/cfg-target-family.rs +++ b/src/test/ui/run-pass/cfg/cfg-target-family.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no target_family // ignore-wasm32-bare no target_family diff --git a/src/test/run-pass/cfg-target-vendor.rs b/src/test/ui/run-pass/cfg/cfg-target-vendor.rs similarity index 98% rename from src/test/run-pass/cfg-target-vendor.rs rename to src/test/ui/run-pass/cfg/cfg-target-vendor.rs index 787ae5289dd5..08daa67827b1 100644 --- a/src/test/run-pass/cfg-target-vendor.rs +++ b/src/test/ui/run-pass/cfg/cfg-target-vendor.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(cfg_target_vendor)] #[cfg(target_vendor = "unknown")] diff --git a/src/test/run-pass/cfg_attr.rs b/src/test/ui/run-pass/cfg/cfg_attr.rs similarity index 99% rename from src/test/run-pass/cfg_attr.rs rename to src/test/ui/run-pass/cfg/cfg_attr.rs index 9bef7f70420e..e9f83e1112f2 100644 --- a/src/test/run-pass/cfg_attr.rs +++ b/src/test/ui/run-pass/cfg/cfg_attr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:--cfg set1 --cfg set2 #![allow(dead_code)] use std::fmt::Debug; diff --git a/src/test/run-pass/cfg_inner_static.rs b/src/test/ui/run-pass/cfg/cfg_inner_static.rs similarity index 98% rename from src/test/run-pass/cfg_inner_static.rs rename to src/test/ui/run-pass/cfg/cfg_inner_static.rs index b3d5ddc42830..e711132e16a8 100644 --- a/src/test/run-pass/cfg_inner_static.rs +++ b/src/test/ui/run-pass/cfg/cfg_inner_static.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cfg_inner_static.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/cfg_stmt_expr.rs b/src/test/ui/run-pass/cfg/cfg_stmt_expr.rs similarity index 99% rename from src/test/run-pass/cfg_stmt_expr.rs rename to src/test/ui/run-pass/cfg/cfg_stmt_expr.rs index fcc93557665b..102ca22f0bd7 100644 --- a/src/test/run-pass/cfg_stmt_expr.rs +++ b/src/test/ui/run-pass/cfg/cfg_stmt_expr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(non_snake_case)] #![feature(stmt_expr_attributes)] diff --git a/src/test/run-pass/cfgs-on-items.rs b/src/test/ui/run-pass/cfg/cfgs-on-items.rs similarity index 98% rename from src/test/run-pass/cfgs-on-items.rs rename to src/test/ui/run-pass/cfg/cfgs-on-items.rs index 1b692d8bd51f..d8011827f662 100644 --- a/src/test/run-pass/cfgs-on-items.rs +++ b/src/test/ui/run-pass/cfg/cfgs-on-items.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: --cfg fooA --cfg fooB // fooA AND !bar diff --git a/src/test/run-pass/conditional-compile-arch.rs b/src/test/ui/run-pass/cfg/conditional-compile-arch.rs similarity index 98% rename from src/test/run-pass/conditional-compile-arch.rs rename to src/test/ui/run-pass/cfg/conditional-compile-arch.rs index 1efbfb927fa7..2eafd8f854d6 100644 --- a/src/test/run-pass/conditional-compile-arch.rs +++ b/src/test/ui/run-pass/cfg/conditional-compile-arch.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[cfg(target_arch = "x86")] diff --git a/src/test/run-pass/conditional-compile.rs b/src/test/ui/run-pass/cfg/conditional-compile.rs similarity index 96% rename from src/test/run-pass/conditional-compile.rs rename to src/test/ui/run-pass/cfg/conditional-compile.rs index 01bdcfeaefb4..203624624845 100644 --- a/src/test/run-pass/conditional-compile.rs +++ b/src/test/ui/run-pass/cfg/conditional-compile.rs @@ -8,6 +8,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] +#![allow(non_camel_case_types)] +#![allow(improper_ctypes)] + // Crate use statements #[cfg(bogus)] diff --git a/src/test/run-pass/crate-attributes-using-cfg_attr.rs b/src/test/ui/run-pass/cfg/crate-attributes-using-cfg_attr.rs similarity index 97% rename from src/test/run-pass/crate-attributes-using-cfg_attr.rs rename to src/test/ui/run-pass/cfg/crate-attributes-using-cfg_attr.rs index 72ccc6723f92..0d817df7cdc9 100644 --- a/src/test/run-pass/crate-attributes-using-cfg_attr.rs +++ b/src/test/ui/run-pass/cfg/crate-attributes-using-cfg_attr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:crate-attributes-using-cfg_attr.rs extern crate crate_attributes_using_cfg_attr; diff --git a/src/test/run-pass/coerce-expect-unsized.rs b/src/test/ui/run-pass/coerce/coerce-expect-unsized.rs similarity index 99% rename from src/test/run-pass/coerce-expect-unsized.rs rename to src/test/ui/run-pass/coerce/coerce-expect-unsized.rs index 5a1953b563aa..cb0fd0b75046 100644 --- a/src/test/run-pass/coerce-expect-unsized.rs +++ b/src/test/ui/run-pass/coerce/coerce-expect-unsized.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] use std::cell::RefCell; diff --git a/src/test/run-pass/coerce-overloaded-autoderef.rs b/src/test/ui/run-pass/coerce/coerce-overloaded-autoderef.rs similarity index 99% rename from src/test/run-pass/coerce-overloaded-autoderef.rs rename to src/test/ui/run-pass/coerce/coerce-overloaded-autoderef.rs index 091e29dd18a6..c6b9e61dae1c 100644 --- a/src/test/run-pass/coerce-overloaded-autoderef.rs +++ b/src/test/ui/run-pass/coerce/coerce-overloaded-autoderef.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::rc::Rc; diff --git a/src/test/run-pass/coerce-reborrow-imm-ptr-arg.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-ptr-arg.rs similarity index 98% rename from src/test/run-pass/coerce-reborrow-imm-ptr-arg.rs rename to src/test/ui/run-pass/coerce/coerce-reborrow-imm-ptr-arg.rs index 581764d4a3b2..be5e55afbc57 100644 --- a/src/test/run-pass/coerce-reborrow-imm-ptr-arg.rs +++ b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-ptr-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn negate(x: &isize) -> isize { diff --git a/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-ptr-rcvr.rs similarity index 98% rename from src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs rename to src/test/ui/run-pass/coerce/coerce-reborrow-imm-ptr-rcvr.rs index 5258ad1af515..0b76375fba1d 100644 --- a/src/test/run-pass/coerce-reborrow-imm-ptr-rcvr.rs +++ b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-ptr-rcvr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct SpeechMaker { speeches: usize diff --git a/src/test/run-pass/coerce-reborrow-imm-vec-arg.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-vec-arg.rs similarity index 98% rename from src/test/run-pass/coerce-reborrow-imm-vec-arg.rs rename to src/test/ui/run-pass/coerce/coerce-reborrow-imm-vec-arg.rs index 1786d5b54f3a..f8849e6af866 100644 --- a/src/test/run-pass/coerce-reborrow-imm-vec-arg.rs +++ b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-vec-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn sum(x: &[isize]) -> isize { diff --git a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-vec-rcvr.rs similarity index 98% rename from src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs rename to src/test/ui/run-pass/coerce/coerce-reborrow-imm-vec-rcvr.rs index e86f20694e10..4faf6dadbef1 100644 --- a/src/test/run-pass/coerce-reborrow-imm-vec-rcvr.rs +++ b/src/test/ui/run-pass/coerce/coerce-reborrow-imm-vec-rcvr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn bar(v: &mut [usize]) -> Vec { diff --git a/src/test/run-pass/coerce-reborrow-mut-ptr-arg.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-ptr-arg.rs similarity index 98% rename from src/test/run-pass/coerce-reborrow-mut-ptr-arg.rs rename to src/test/ui/run-pass/coerce/coerce-reborrow-mut-ptr-arg.rs index b70146ea2d36..7d851bb8bd28 100644 --- a/src/test/run-pass/coerce-reborrow-mut-ptr-arg.rs +++ b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-ptr-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct SpeechMaker { diff --git a/src/test/run-pass/coerce-reborrow-mut-ptr-rcvr.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-ptr-rcvr.rs similarity index 98% rename from src/test/run-pass/coerce-reborrow-mut-ptr-rcvr.rs rename to src/test/ui/run-pass/coerce/coerce-reborrow-mut-ptr-rcvr.rs index 5f4cc569ac4e..42f710299ffb 100644 --- a/src/test/run-pass/coerce-reborrow-mut-ptr-rcvr.rs +++ b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-ptr-rcvr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct SpeechMaker { diff --git a/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-vec-arg.rs similarity index 98% rename from src/test/run-pass/coerce-reborrow-mut-vec-arg.rs rename to src/test/ui/run-pass/coerce/coerce-reborrow-mut-vec-arg.rs index ca4ee4a97d52..25a73c3d2d69 100644 --- a/src/test/run-pass/coerce-reborrow-mut-vec-arg.rs +++ b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-vec-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn reverse(v: &mut [usize]) { diff --git a/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-vec-rcvr.rs similarity index 98% rename from src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs rename to src/test/ui/run-pass/coerce/coerce-reborrow-mut-vec-rcvr.rs index f35735adbcfe..04b884620b68 100644 --- a/src/test/run-pass/coerce-reborrow-mut-vec-rcvr.rs +++ b/src/test/ui/run-pass/coerce/coerce-reborrow-mut-vec-rcvr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn bar(v: &mut [usize]) { diff --git a/src/test/run-pass/coerce-unify-return.rs b/src/test/ui/run-pass/coerce/coerce-unify-return.rs similarity index 98% rename from src/test/run-pass/coerce-unify-return.rs rename to src/test/ui/run-pass/coerce/coerce-unify-return.rs index 2299a03b2a42..2b276f2cfe43 100644 --- a/src/test/run-pass/coerce-unify-return.rs +++ b/src/test/ui/run-pass/coerce/coerce-unify-return.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that coercions unify the expected return type of a polymorphic // function call, instead of leaving the type variables as they were. diff --git a/src/test/run-pass/coerce-unify.rs b/src/test/ui/run-pass/coerce/coerce-unify.rs similarity index 99% rename from src/test/run-pass/coerce-unify.rs rename to src/test/ui/run-pass/coerce/coerce-unify.rs index 3d690146931d..575d672e092a 100644 --- a/src/test/run-pass/coerce-unify.rs +++ b/src/test/ui/run-pass/coerce/coerce-unify.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that coercions can unify if-else, match arms and array elements. // Try to construct if-else chains, matches and arrays out of given expressions. diff --git a/src/test/run-pass/coerce-unsize-subtype.rs b/src/test/ui/run-pass/coerce/coerce-unsize-subtype.rs similarity index 99% rename from src/test/run-pass/coerce-unsize-subtype.rs rename to src/test/ui/run-pass/coerce/coerce-unsize-subtype.rs index b19708f5a893..ab571a8b40dc 100644 --- a/src/test/run-pass/coerce-unsize-subtype.rs +++ b/src/test/ui/run-pass/coerce/coerce-unsize-subtype.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::rc::Rc; diff --git a/src/test/run-pass/auxiliary/coherence_copy_like_lib.rs b/src/test/ui/run-pass/coherence/auxiliary/coherence_copy_like_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/coherence_copy_like_lib.rs rename to src/test/ui/run-pass/coherence/auxiliary/coherence_copy_like_lib.rs diff --git a/src/test/run-pass/auxiliary/coherence_lib.rs b/src/test/ui/run-pass/coherence/auxiliary/coherence_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/coherence_lib.rs rename to src/test/ui/run-pass/coherence/auxiliary/coherence_lib.rs diff --git a/src/test/run-pass/coherence-bigint-int.rs b/src/test/ui/run-pass/coherence/coherence-bigint-int.rs similarity index 98% rename from src/test/run-pass/coherence-bigint-int.rs rename to src/test/ui/run-pass/coherence/coherence-bigint-int.rs index 9ad4f6b9d75c..62736b1f368c 100644 --- a/src/test/run-pass/coherence-bigint-int.rs +++ b/src/test/ui/run-pass/coherence/coherence-bigint-int.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-bigint-vecint.rs b/src/test/ui/run-pass/coherence/coherence-bigint-vecint.rs similarity index 98% rename from src/test/run-pass/coherence-bigint-vecint.rs rename to src/test/ui/run-pass/coherence/coherence-bigint-vecint.rs index ac4b98cfc8c8..372f38738e51 100644 --- a/src/test/run-pass/coherence-bigint-vecint.rs +++ b/src/test/ui/run-pass/coherence/coherence-bigint-vecint.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-blanket.rs b/src/test/ui/run-pass/coherence/coherence-blanket.rs similarity index 98% rename from src/test/run-pass/coherence-blanket.rs rename to src/test/ui/run-pass/coherence/coherence-blanket.rs index 32743aafa823..fa09b13bf673 100644 --- a/src/test/run-pass/coherence-blanket.rs +++ b/src/test/ui/run-pass/coherence/coherence-blanket.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-covered-type-parameter.rs b/src/test/ui/run-pass/coherence/coherence-covered-type-parameter.rs similarity index 98% rename from src/test/run-pass/coherence-covered-type-parameter.rs rename to src/test/ui/run-pass/coherence/coherence-covered-type-parameter.rs index 890470d8ac24..3ddeb58dddc8 100644 --- a/src/test/run-pass/coherence-covered-type-parameter.rs +++ b/src/test/ui/run-pass/coherence/coherence-covered-type-parameter.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-impl-in-fn.rs b/src/test/ui/run-pass/coherence/coherence-impl-in-fn.rs similarity index 94% rename from src/test/run-pass/coherence-impl-in-fn.rs rename to src/test/ui/run-pass/coherence/coherence-impl-in-fn.rs index d7c21340afc3..de7cb7664b64 100644 --- a/src/test/run-pass/coherence-impl-in-fn.rs +++ b/src/test/ui/run-pass/coherence/coherence-impl-in-fn.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + pub fn main() { #[derive(Copy, Clone)] enum x { foo } diff --git a/src/test/run-pass/coherence-iterator-vec-any-elem.rs b/src/test/ui/run-pass/coherence/coherence-iterator-vec-any-elem.rs similarity index 98% rename from src/test/run-pass/coherence-iterator-vec-any-elem.rs rename to src/test/ui/run-pass/coherence/coherence-iterator-vec-any-elem.rs index 04a6cd588278..d446f0dca9ab 100644 --- a/src/test/run-pass/coherence-iterator-vec-any-elem.rs +++ b/src/test/ui/run-pass/coherence/coherence-iterator-vec-any-elem.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-iterator-vec.rs b/src/test/ui/run-pass/coherence/coherence-iterator-vec.rs similarity index 98% rename from src/test/run-pass/coherence-iterator-vec.rs rename to src/test/ui/run-pass/coherence/coherence-iterator-vec.rs index 8a3301dee273..38ad5b8115a7 100644 --- a/src/test/run-pass/coherence-iterator-vec.rs +++ b/src/test/ui/run-pass/coherence/coherence-iterator-vec.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:coherence_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/coherence-multidispatch-tuple.rs b/src/test/ui/run-pass/coherence/coherence-multidispatch-tuple.rs similarity index 98% rename from src/test/run-pass/coherence-multidispatch-tuple.rs rename to src/test/ui/run-pass/coherence/coherence-multidispatch-tuple.rs index 07477f96c0d3..ab04f946fa62 100644 --- a/src/test/run-pass/coherence-multidispatch-tuple.rs +++ b/src/test/ui/run-pass/coherence/coherence-multidispatch-tuple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::fmt::Debug; diff --git a/src/test/run-pass/coherence-negative-impls-safe.rs b/src/test/ui/run-pass/coherence/coherence-negative-impls-safe.rs similarity index 98% rename from src/test/run-pass/coherence-negative-impls-safe.rs rename to src/test/ui/run-pass/coherence/coherence-negative-impls-safe.rs index 2f42ab4988ac..7984193862e4 100644 --- a/src/test/run-pass/coherence-negative-impls-safe.rs +++ b/src/test/ui/run-pass/coherence/coherence-negative-impls-safe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(optin_builtin_traits)] diff --git a/src/test/run-pass/coherence-rfc447-constrained.rs b/src/test/ui/run-pass/coherence/coherence-rfc447-constrained.rs similarity index 98% rename from src/test/run-pass/coherence-rfc447-constrained.rs rename to src/test/ui/run-pass/coherence/coherence-rfc447-constrained.rs index 4b52378e5088..5db8188e1ffa 100644 --- a/src/test/run-pass/coherence-rfc447-constrained.rs +++ b/src/test/ui/run-pass/coherence/coherence-rfc447-constrained.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // check that trait matching can handle impls whose types are only // constrained by a projection. diff --git a/src/test/run-pass/coherence-subtyping.rs b/src/test/ui/run-pass/coherence/coherence-subtyping.rs similarity index 99% rename from src/test/run-pass/coherence-subtyping.rs rename to src/test/ui/run-pass/coherence/coherence-subtyping.rs index eb04514271c7..0dcd83f87b89 100644 --- a/src/test/run-pass/coherence-subtyping.rs +++ b/src/test/ui/run-pass/coherence/coherence-subtyping.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that two distinct impls which match subtypes of one another // yield coherence errors (or not) depending on the variance. diff --git a/src/test/run-pass/coherence-where-clause.rs b/src/test/ui/run-pass/coherence/coherence-where-clause.rs similarity index 98% rename from src/test/run-pass/coherence-where-clause.rs rename to src/test/ui/run-pass/coherence/coherence-where-clause.rs index 8ab340d1bff6..9691978466b8 100644 --- a/src/test/run-pass/coherence-where-clause.rs +++ b/src/test/ui/run-pass/coherence/coherence-where-clause.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::fmt::Debug; use std::default::Default; diff --git a/src/test/run-pass/coherence_copy_like.rs b/src/test/ui/run-pass/coherence/coherence_copy_like.rs similarity index 98% rename from src/test/run-pass/coherence_copy_like.rs rename to src/test/ui/run-pass/coherence/coherence_copy_like.rs index 71db5225ecc0..c6903d911f98 100644 --- a/src/test/run-pass/coherence_copy_like.rs +++ b/src/test/ui/run-pass/coherence/coherence_copy_like.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to introduce a negative constraint that // `MyType: !MyTrait` along with other "fundamental" wrappers. diff --git a/src/test/ui/run-pass/consts/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/ui/run-pass/consts/auxiliary/anon-extern-mod-cross-crate-1.rs new file mode 100644 index 000000000000..741ce351da38 --- /dev/null +++ b/src/test/ui/run-pass/consts/auxiliary/anon-extern-mod-cross-crate-1.rs @@ -0,0 +1,19 @@ +// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_name="anonexternmod"] +#![feature(libc)] + +extern crate libc; + +#[link(name = "rust_test_helpers", kind = "static")] +extern { + pub fn rust_get_test_int() -> libc::intptr_t; +} diff --git a/src/test/run-pass/auxiliary/cci_borrow_lib.rs b/src/test/ui/run-pass/consts/auxiliary/cci_borrow_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_borrow_lib.rs rename to src/test/ui/run-pass/consts/auxiliary/cci_borrow_lib.rs diff --git a/src/test/run-pass/auxiliary/cci_const.rs b/src/test/ui/run-pass/consts/auxiliary/cci_const.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_const.rs rename to src/test/ui/run-pass/consts/auxiliary/cci_const.rs diff --git a/src/test/run-pass/auxiliary/cci_const_block.rs b/src/test/ui/run-pass/consts/auxiliary/cci_const_block.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_const_block.rs rename to src/test/ui/run-pass/consts/auxiliary/cci_const_block.rs diff --git a/src/test/run-pass/auxiliary/const_fn_lib.rs b/src/test/ui/run-pass/consts/auxiliary/const_fn_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/const_fn_lib.rs rename to src/test/ui/run-pass/consts/auxiliary/const_fn_lib.rs diff --git a/src/test/run-pass/const-adt-align-mismatch.rs b/src/test/ui/run-pass/consts/const-adt-align-mismatch.rs similarity index 96% rename from src/test/run-pass/const-adt-align-mismatch.rs rename to src/test/ui/run-pass/consts/const-adt-align-mismatch.rs index 46cd708a1396..10875d5046ca 100644 --- a/src/test/run-pass/const-adt-align-mismatch.rs +++ b/src/test/ui/run-pass/consts/const-adt-align-mismatch.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] + use std::mem; #[derive(PartialEq, Debug)] diff --git a/src/test/run-pass/const-autoderef.rs b/src/test/ui/run-pass/consts/const-autoderef.rs similarity index 98% rename from src/test/run-pass/const-autoderef.rs rename to src/test/ui/run-pass/consts/const-autoderef.rs index 6b3970e4f199..939f7d4441ad 100644 --- a/src/test/run-pass/const-autoderef.rs +++ b/src/test/ui/run-pass/consts/const-autoderef.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const A: [u8; 1] = ['h' as u8]; const B: u8 = (&A)[0]; diff --git a/src/test/run-pass/const-big-enum.rs b/src/test/ui/run-pass/consts/const-big-enum.rs similarity index 98% rename from src/test/run-pass/const-big-enum.rs rename to src/test/ui/run-pass/consts/const-big-enum.rs index 33e5e0546500..1ad46fa4106f 100644 --- a/src/test/run-pass/const-big-enum.rs +++ b/src/test/ui/run-pass/consts/const-big-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Foo { Bar(u32), diff --git a/src/test/run-pass/const-binops.rs b/src/test/ui/run-pass/consts/const-binops.rs similarity index 99% rename from src/test/run-pass/const-binops.rs rename to src/test/ui/run-pass/consts/const-binops.rs index a29953bea887..2e90a458aeeb 100644 --- a/src/test/run-pass/const-binops.rs +++ b/src/test/ui/run-pass/consts/const-binops.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! assert_approx_eq { ($a:expr, $b:expr) => ({ diff --git a/src/test/run-pass/const-bitshift-rhs-inference.rs b/src/test/ui/run-pass/consts/const-bitshift-rhs-inference.rs similarity index 99% rename from src/test/run-pass/const-bitshift-rhs-inference.rs rename to src/test/ui/run-pass/consts/const-bitshift-rhs-inference.rs index b377fd230b98..63b8af773261 100644 --- a/src/test/run-pass/const-bitshift-rhs-inference.rs +++ b/src/test/ui/run-pass/consts/const-bitshift-rhs-inference.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const RHS: u8 = 8; const IRHS: i8 = 8; const RHS16: u16 = 8; diff --git a/src/test/run-pass/const-block-cross-crate-fn.rs b/src/test/ui/run-pass/consts/const-block-cross-crate-fn.rs similarity index 98% rename from src/test/run-pass/const-block-cross-crate-fn.rs rename to src/test/ui/run-pass/consts/const-block-cross-crate-fn.rs index 6fa6feffbfa0..c7d156fcf198 100644 --- a/src/test/run-pass/const-block-cross-crate-fn.rs +++ b/src/test/ui/run-pass/consts/const-block-cross-crate-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_const_block.rs diff --git a/src/test/run-pass/const-block-item-macro-codegen.rs b/src/test/ui/run-pass/consts/const-block-item-macro-codegen.rs similarity index 99% rename from src/test/run-pass/const-block-item-macro-codegen.rs rename to src/test/ui/run-pass/consts/const-block-item-macro-codegen.rs index 8a4b220a3763..ab452e4fe468 100644 --- a/src/test/run-pass/const-block-item-macro-codegen.rs +++ b/src/test/ui/run-pass/consts/const-block-item-macro-codegen.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // General test that function items in static blocks // can be generated with a macro. diff --git a/src/test/run-pass/const-block-item.rs b/src/test/ui/run-pass/consts/const-block-item.rs similarity index 98% rename from src/test/run-pass/const-block-item.rs rename to src/test/ui/run-pass/consts/const-block-item.rs index 51ebc240e728..fe3483ae9f0d 100644 --- a/src/test/run-pass/const-block-item.rs +++ b/src/test/ui/run-pass/consts/const-block-item.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod foo { pub trait Value { diff --git a/src/test/run-pass/const-block.rs b/src/test/ui/run-pass/consts/const-block.rs similarity index 99% rename from src/test/run-pass/const-block.rs rename to src/test/ui/run-pass/consts/const-block.rs index e6f191ea9522..1b9330a6ebff 100644 --- a/src/test/run-pass/const-block.rs +++ b/src/test/ui/run-pass/consts/const-block.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] #![allow(unused_unsafe)] diff --git a/src/test/run-pass/const-bound.rs b/src/test/ui/run-pass/consts/const-bound.rs similarity index 98% rename from src/test/run-pass/const-bound.rs rename to src/test/ui/run-pass/consts/const-bound.rs index 72a23b998e5a..a4ac766a740f 100644 --- a/src/test/run-pass/const-bound.rs +++ b/src/test/ui/run-pass/consts/const-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Make sure const bounds work on things, and test that a few types // are const. diff --git a/src/test/run-pass/const-byte-str-cast.rs b/src/test/ui/run-pass/consts/const-byte-str-cast.rs similarity index 98% rename from src/test/run-pass/const-byte-str-cast.rs rename to src/test/ui/run-pass/consts/const-byte-str-cast.rs index 7297c71a6d66..175d48e5c01a 100644 --- a/src/test/run-pass/const-byte-str-cast.rs +++ b/src/test/ui/run-pass/consts/const-byte-str-cast.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[deny(warnings)] pub fn main() { diff --git a/src/test/run-pass/const-cast-ptr-int.rs b/src/test/ui/run-pass/consts/const-cast-ptr-int.rs similarity index 93% rename from src/test/run-pass/const-cast-ptr-int.rs rename to src/test/ui/run-pass/consts/const-cast-ptr-int.rs index e7674f893d37..f12a73f0ea61 100644 --- a/src/test/run-pass/const-cast-ptr-int.rs +++ b/src/test/ui/run-pass/consts/const-cast-ptr-int.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] use std::ptr; diff --git a/src/test/run-pass/const-cast.rs b/src/test/ui/run-pass/consts/const-cast.rs similarity index 93% rename from src/test/run-pass/const-cast.rs rename to src/test/ui/run-pass/consts/const-cast.rs index e77fd5f71394..100034ccc300 100644 --- a/src/test/run-pass/const-cast.rs +++ b/src/test/ui/run-pass/consts/const-cast.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + struct TestStruct { x: *const u8, } diff --git a/src/test/run-pass/const-const.rs b/src/test/ui/run-pass/consts/const-const.rs similarity index 92% rename from src/test/run-pass/const-const.rs rename to src/test/ui/run-pass/consts/const-const.rs index b28017b85ad6..160d10d3b114 100644 --- a/src/test/run-pass/const-const.rs +++ b/src/test/ui/run-pass/consts/const-const.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] const a: isize = 1; const b: isize = a + 2; diff --git a/src/test/run-pass/const-contents.rs b/src/test/ui/run-pass/consts/const-contents.rs similarity index 94% rename from src/test/run-pass/const-contents.rs rename to src/test/ui/run-pass/consts/const-contents.rs index 0d9d0e0e0aa7..3d99af9ee660 100644 --- a/src/test/run-pass/const-contents.rs +++ b/src/test/ui/run-pass/consts/const-contents.rs @@ -8,8 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #570 - +#![allow(non_upper_case_globals)] static lsl : isize = 1 << 2; static add : isize = 1 + 2; diff --git a/src/test/run-pass/const-cross-crate-const.rs b/src/test/ui/run-pass/consts/const-cross-crate-const.rs similarity index 94% rename from src/test/run-pass/const-cross-crate-const.rs rename to src/test/ui/run-pass/consts/const-cross-crate-const.rs index d66c335db2e8..3e8eb9a422d1 100644 --- a/src/test/run-pass/const-cross-crate-const.rs +++ b/src/test/ui/run-pass/consts/const-cross-crate-const.rs @@ -8,8 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_const.rs - +#![allow(non_upper_case_globals)] extern crate cci_const; static foo: &'static str = cci_const::foopy; diff --git a/src/test/run-pass/const-cross-crate-extern.rs b/src/test/ui/run-pass/consts/const-cross-crate-extern.rs similarity index 93% rename from src/test/run-pass/const-cross-crate-extern.rs rename to src/test/ui/run-pass/consts/const-cross-crate-extern.rs index bbe31ceed33c..504b872782ba 100644 --- a/src/test/run-pass/const-cross-crate-extern.rs +++ b/src/test/ui/run-pass/consts/const-cross-crate-extern.rs @@ -8,8 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_const.rs - +#![allow(non_upper_case_globals)] extern crate cci_const; use cci_const::bar; diff --git a/src/test/run-pass/const-deref.rs b/src/test/ui/run-pass/consts/const-deref.rs similarity index 97% rename from src/test/run-pass/const-deref.rs rename to src/test/ui/run-pass/consts/const-deref.rs index f5407f0c8152..39515c8546ac 100644 --- a/src/test/run-pass/const-deref.rs +++ b/src/test/ui/run-pass/consts/const-deref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const C: &'static isize = &1000; static D: isize = *C; diff --git a/src/test/run-pass/const-endianess.rs b/src/test/ui/run-pass/consts/const-endianess.rs similarity index 98% rename from src/test/run-pass/const-endianess.rs rename to src/test/ui/run-pass/consts/const-endianess.rs index 95c738d3ec49..4ac469557098 100644 --- a/src/test/run-pass/const-endianess.rs +++ b/src/test/ui/run-pass/consts/const-endianess.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(const_int_ops)] #![feature(test)] diff --git a/src/test/run-pass/const-enum-byref-self.rs b/src/test/ui/run-pass/consts/const-enum-byref-self.rs similarity index 98% rename from src/test/run-pass/const-enum-byref-self.rs rename to src/test/ui/run-pass/consts/const-enum-byref-self.rs index 57470c4a67e2..9656bc54eb24 100644 --- a/src/test/run-pass/const-enum-byref-self.rs +++ b/src/test/ui/run-pass/consts/const-enum-byref-self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V, VV(isize) } static C: E = E::V; diff --git a/src/test/run-pass/const-enum-byref.rs b/src/test/ui/run-pass/consts/const-enum-byref.rs similarity index 98% rename from src/test/run-pass/const-enum-byref.rs rename to src/test/ui/run-pass/consts/const-enum-byref.rs index e3f1d5d35320..1e418f66c13c 100644 --- a/src/test/run-pass/const-enum-byref.rs +++ b/src/test/ui/run-pass/consts/const-enum-byref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V, VV(isize) } static C: E = E::V; diff --git a/src/test/run-pass/const-enum-cast.rs b/src/test/ui/run-pass/consts/const-enum-cast.rs similarity index 94% rename from src/test/run-pass/const-enum-cast.rs rename to src/test/ui/run-pass/consts/const-enum-cast.rs index 38f21f7e9596..39602153c792 100644 --- a/src/test/run-pass/const-enum-cast.rs +++ b/src/test/ui/run-pass/consts/const-enum-cast.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] enum A { A1, A2 } enum B { B1=0, B2=2 } diff --git a/src/test/run-pass/const-enum-ptr.rs b/src/test/ui/run-pass/consts/const-enum-ptr.rs similarity index 98% rename from src/test/run-pass/const-enum-ptr.rs rename to src/test/ui/run-pass/consts/const-enum-ptr.rs index 40a1c99e987d..78c784e4bb3f 100644 --- a/src/test/run-pass/const-enum-ptr.rs +++ b/src/test/ui/run-pass/consts/const-enum-ptr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V0, V1(isize) } static C: &'static E = &E::V0; diff --git a/src/test/run-pass/const-enum-struct.rs b/src/test/ui/run-pass/consts/const-enum-struct.rs similarity index 98% rename from src/test/run-pass/const-enum-struct.rs rename to src/test/ui/run-pass/consts/const-enum-struct.rs index 46c4f82eb98e..4a4ad9d89e6b 100644 --- a/src/test/run-pass/const-enum-struct.rs +++ b/src/test/ui/run-pass/consts/const-enum-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V16(u16), V32(u32) } struct S { a: E, b: u16, c: u16 } diff --git a/src/test/run-pass/const-enum-struct2.rs b/src/test/ui/run-pass/consts/const-enum-struct2.rs similarity index 98% rename from src/test/run-pass/const-enum-struct2.rs rename to src/test/ui/run-pass/consts/const-enum-struct2.rs index e356ecb385b9..c37b06f83370 100644 --- a/src/test/run-pass/const-enum-struct2.rs +++ b/src/test/ui/run-pass/consts/const-enum-struct2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V0, V16(u16) } struct S { a: E, b: u16, c: u16 } diff --git a/src/test/run-pass/const-enum-structlike.rs b/src/test/ui/run-pass/consts/const-enum-structlike.rs similarity index 98% rename from src/test/run-pass/const-enum-structlike.rs rename to src/test/ui/run-pass/consts/const-enum-structlike.rs index a526e0be3da4..a6bac3c9e7d3 100644 --- a/src/test/run-pass/const-enum-structlike.rs +++ b/src/test/ui/run-pass/consts/const-enum-structlike.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { S0 { s: String }, diff --git a/src/test/run-pass/const-enum-tuple.rs b/src/test/ui/run-pass/consts/const-enum-tuple.rs similarity index 98% rename from src/test/run-pass/const-enum-tuple.rs rename to src/test/ui/run-pass/consts/const-enum-tuple.rs index 476defaa524a..2f0dcdaf9b25 100644 --- a/src/test/run-pass/const-enum-tuple.rs +++ b/src/test/ui/run-pass/consts/const-enum-tuple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V16(u16), V32(u32) } static C: (E, u16, u16) = (E::V16(0xDEAD), 0x600D, 0xBAD); diff --git a/src/test/run-pass/const-enum-tuple2.rs b/src/test/ui/run-pass/consts/const-enum-tuple2.rs similarity index 98% rename from src/test/run-pass/const-enum-tuple2.rs rename to src/test/ui/run-pass/consts/const-enum-tuple2.rs index 61043ef75a4c..1db56e0e6f25 100644 --- a/src/test/run-pass/const-enum-tuple2.rs +++ b/src/test/ui/run-pass/consts/const-enum-tuple2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V0, V16(u16) } static C: (E, u16, u16) = (E::V0, 0x600D, 0xBAD); diff --git a/src/test/run-pass/const-enum-tuplestruct.rs b/src/test/ui/run-pass/consts/const-enum-tuplestruct.rs similarity index 98% rename from src/test/run-pass/const-enum-tuplestruct.rs rename to src/test/ui/run-pass/consts/const-enum-tuplestruct.rs index f574508522b2..f37ff4d9c999 100644 --- a/src/test/run-pass/const-enum-tuplestruct.rs +++ b/src/test/ui/run-pass/consts/const-enum-tuplestruct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V16(u16), V32(u32) } struct S(E, u16, u16); diff --git a/src/test/run-pass/const-enum-tuplestruct2.rs b/src/test/ui/run-pass/consts/const-enum-tuplestruct2.rs similarity index 98% rename from src/test/run-pass/const-enum-tuplestruct2.rs rename to src/test/ui/run-pass/consts/const-enum-tuplestruct2.rs index 88cfc0dec702..5d6a77dddb88 100644 --- a/src/test/run-pass/const-enum-tuplestruct2.rs +++ b/src/test/ui/run-pass/consts/const-enum-tuplestruct2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V0, V16(u16) } struct S(E, u16, u16); diff --git a/src/test/run-pass/const-enum-vec-index.rs b/src/test/ui/run-pass/consts/const-enum-vec-index.rs similarity index 98% rename from src/test/run-pass/const-enum-vec-index.rs rename to src/test/ui/run-pass/consts/const-enum-vec-index.rs index 9c1a4dbdffa8..067cc2bc75ff 100644 --- a/src/test/run-pass/const-enum-vec-index.rs +++ b/src/test/ui/run-pass/consts/const-enum-vec-index.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Copy, Clone)] enum E { V1(isize), V0 } diff --git a/src/test/run-pass/const-enum-vec-ptr.rs b/src/test/ui/run-pass/consts/const-enum-vec-ptr.rs similarity index 98% rename from src/test/run-pass/const-enum-vec-ptr.rs rename to src/test/ui/run-pass/consts/const-enum-vec-ptr.rs index 0bd18a02e4a2..a8a3dec5bdc7 100644 --- a/src/test/run-pass/const-enum-vec-ptr.rs +++ b/src/test/ui/run-pass/consts/const-enum-vec-ptr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V1(isize), V0 } static C: &'static [E] = &[E::V0, E::V1(0xDEADBEE), E::V0]; diff --git a/src/test/run-pass/const-enum-vector.rs b/src/test/ui/run-pass/consts/const-enum-vector.rs similarity index 98% rename from src/test/run-pass/const-enum-vector.rs rename to src/test/ui/run-pass/consts/const-enum-vector.rs index e7a6f520a992..e95742451b4e 100644 --- a/src/test/run-pass/const-enum-vector.rs +++ b/src/test/ui/run-pass/consts/const-enum-vector.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { V1(isize), V0 } static C: [E; 3] = [E::V0, E::V1(0xDEADBEE), E::V0]; diff --git a/src/test/run-pass/const-err.rs b/src/test/ui/run-pass/consts/const-err.rs similarity index 98% rename from src/test/run-pass/const-err.rs rename to src/test/ui/run-pass/consts/const-err.rs index f7f79356a0b9..2074ee3e9081 100644 --- a/src/test/run-pass/const-err.rs +++ b/src/test/ui/run-pass/consts/const-err.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // check for const_err regressions #![deny(const_err)] diff --git a/src/test/run-pass/const-expr-in-fixed-length-vec.rs b/src/test/ui/run-pass/consts/const-expr-in-fixed-length-vec.rs similarity index 98% rename from src/test/run-pass/const-expr-in-fixed-length-vec.rs rename to src/test/ui/run-pass/consts/const-expr-in-fixed-length-vec.rs index 6cf9239e2e4e..c67946d6fa1f 100644 --- a/src/test/run-pass/const-expr-in-fixed-length-vec.rs +++ b/src/test/ui/run-pass/consts/const-expr-in-fixed-length-vec.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that constant expressions can be used for declaring the // type of a fixed length vector. diff --git a/src/test/run-pass/const-expr-in-vec-repeat.rs b/src/test/ui/run-pass/consts/const-expr-in-vec-repeat.rs similarity index 98% rename from src/test/run-pass/const-expr-in-vec-repeat.rs rename to src/test/ui/run-pass/consts/const-expr-in-vec-repeat.rs index fc3e6749f6e3..150d24b3106a 100644 --- a/src/test/run-pass/const-expr-in-vec-repeat.rs +++ b/src/test/ui/run-pass/consts/const-expr-in-vec-repeat.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that constant expressions can be used in vec repeat syntax. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/const-extern-function.rs b/src/test/ui/run-pass/consts/const-extern-function.rs similarity index 93% rename from src/test/run-pass/const-extern-function.rs rename to src/test/ui/run-pass/consts/const-extern-function.rs index 214b0400e863..e7e11e740862 100644 --- a/src/test/run-pass/const-extern-function.rs +++ b/src/test/ui/run-pass/consts/const-extern-function.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] extern fn foopy() {} diff --git a/src/test/run-pass/const-fields-and-indexing.rs b/src/test/ui/run-pass/consts/const-fields-and-indexing.rs similarity index 95% rename from src/test/run-pass/const-fields-and-indexing.rs rename to src/test/ui/run-pass/consts/const-fields-and-indexing.rs index 55d6b60c1928..c0ba4404f00a 100644 --- a/src/test/run-pass/const-fields-and-indexing.rs +++ b/src/test/ui/run-pass/consts/const-fields-and-indexing.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + const x : [isize; 4] = [1,2,3,4]; static p : isize = x[2]; const y : &'static [isize] = &[1,2,3,4]; diff --git a/src/test/run-pass/const-fn-const-eval.rs b/src/test/ui/run-pass/consts/const-fn-const-eval.rs similarity index 98% rename from src/test/run-pass/const-fn-const-eval.rs rename to src/test/ui/run-pass/consts/const-fn-const-eval.rs index 3fe27ca200cb..897073cd6233 100644 --- a/src/test/run-pass/const-fn-const-eval.rs +++ b/src/test/ui/run-pass/consts/const-fn-const-eval.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(min_const_fn)] const fn add(x: usize, y: usize) -> usize { diff --git a/src/test/run-pass/const-fn-feature-flags.rs b/src/test/ui/run-pass/consts/const-fn-feature-flags.rs similarity index 98% rename from src/test/run-pass/const-fn-feature-flags.rs rename to src/test/ui/run-pass/consts/const-fn-feature-flags.rs index a7736a2eb343..be529db3c081 100644 --- a/src/test/run-pass/const-fn-feature-flags.rs +++ b/src/test/ui/run-pass/consts/const-fn-feature-flags.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test use of stabilized const fns in std formerly using individual feature gates. use std::cell::Cell; diff --git a/src/test/run-pass/const-fn-method.rs b/src/test/ui/run-pass/consts/const-fn-method.rs similarity index 98% rename from src/test/run-pass/const-fn-method.rs rename to src/test/ui/run-pass/consts/const-fn-method.rs index bed78f1e8978..3ecb4fffba14 100644 --- a/src/test/run-pass/const-fn-method.rs +++ b/src/test/ui/run-pass/consts/const-fn-method.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(min_const_fn)] struct Foo { value: u32 } diff --git a/src/test/run-pass/const-fn-nested.rs b/src/test/ui/run-pass/consts/const-fn-nested.rs similarity index 98% rename from src/test/run-pass/const-fn-nested.rs rename to src/test/ui/run-pass/consts/const-fn-nested.rs index d5959a89e51a..41198a901c29 100644 --- a/src/test/run-pass/const-fn-nested.rs +++ b/src/test/ui/run-pass/consts/const-fn-nested.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test a call whose argument is the result of another call. #![feature(min_const_fn)] diff --git a/src/test/run-pass/const-fn-stability-calls.rs b/src/test/ui/run-pass/consts/const-fn-stability-calls.rs similarity index 98% rename from src/test/run-pass/const-fn-stability-calls.rs rename to src/test/ui/run-pass/consts/const-fn-stability-calls.rs index c5f97d55c066..b520ebab17c2 100644 --- a/src/test/run-pass/const-fn-stability-calls.rs +++ b/src/test/ui/run-pass/consts/const-fn-stability-calls.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test use of const fn from another crate without a feature gate. // aux-build:const_fn_lib.rs diff --git a/src/test/run-pass/const-fn-val.rs b/src/test/ui/run-pass/consts/const-fn-val.rs similarity index 89% rename from src/test/run-pass/const-fn-val.rs rename to src/test/ui/run-pass/consts/const-fn-val.rs index 85c92dda434a..4b6b529617fe 100644 --- a/src/test/run-pass/const-fn-val.rs +++ b/src/test/ui/run-pass/consts/const-fn-val.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] +#![allow(overflowing_literals)] fn foo() -> isize { return 0xca7f000d; diff --git a/src/test/run-pass/const-fn.rs b/src/test/ui/run-pass/consts/const-fn.rs similarity index 96% rename from src/test/run-pass/const-fn.rs rename to src/test/ui/run-pass/consts/const-fn.rs index 562040dc5620..616429bf1df3 100644 --- a/src/test/run-pass/const-fn.rs +++ b/src/test/ui/run-pass/consts/const-fn.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // A very basic test of const fn functionality. #![feature(const_fn, const_indexing)] diff --git a/src/test/run-pass/const-index-feature-gate.rs b/src/test/ui/run-pass/consts/const-index-feature-gate.rs similarity index 97% rename from src/test/run-pass/const-index-feature-gate.rs rename to src/test/ui/run-pass/consts/const-index-feature-gate.rs index 2e60634d15ee..3e26ea9dcae8 100644 --- a/src/test/run-pass/const-index-feature-gate.rs +++ b/src/test/ui/run-pass/consts/const-index-feature-gate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const ARR: [usize; 1] = [2]; const ARR2: [i32; ARR[0]] = [5, 6]; diff --git a/src/test/run-pass/const-meth-pattern.rs b/src/test/ui/run-pass/consts/const-meth-pattern.rs similarity index 98% rename from src/test/run-pass/const-meth-pattern.rs rename to src/test/ui/run-pass/consts/const-meth-pattern.rs index 836716051d21..1762c17e943c 100644 --- a/src/test/run-pass/const-meth-pattern.rs +++ b/src/test/ui/run-pass/consts/const-meth-pattern.rs @@ -7,6 +7,9 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass + #![feature(min_const_fn)] struct A; diff --git a/src/test/run-pass/const-negation.rs b/src/test/ui/run-pass/consts/const-negation.rs similarity index 97% rename from src/test/run-pass/const-negation.rs rename to src/test/ui/run-pass/consts/const-negation.rs index 5c633eb6112f..048aa1f4e7a8 100644 --- a/src/test/run-pass/const-negation.rs +++ b/src/test/ui/run-pass/consts/const-negation.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(overflowing_literals)] + #[deny(const_err)] fn main() { diff --git a/src/test/run-pass/const-negative.rs b/src/test/ui/run-pass/consts/const-negative.rs similarity index 92% rename from src/test/run-pass/const-negative.rs rename to src/test/ui/run-pass/consts/const-negative.rs index 7f26a9773396..9b3c846deac0 100644 --- a/src/test/run-pass/const-negative.rs +++ b/src/test/ui/run-pass/consts/const-negative.rs @@ -8,8 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #358 - +#![allow(non_upper_case_globals)] static toplevel_mod: isize = -1; diff --git a/src/test/run-pass/const-nullary-enum.rs b/src/test/ui/run-pass/consts/const-nullary-enum.rs similarity index 98% rename from src/test/run-pass/const-nullary-enum.rs rename to src/test/ui/run-pass/consts/const-nullary-enum.rs index b3f6549ef016..d1e359eab4e4 100644 --- a/src/test/run-pass/const-nullary-enum.rs +++ b/src/test/ui/run-pass/consts/const-nullary-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Foo { Bar, diff --git a/src/test/run-pass/const-nullary-univariant-enum.rs b/src/test/ui/run-pass/consts/const-nullary-univariant-enum.rs similarity index 98% rename from src/test/run-pass/const-nullary-univariant-enum.rs rename to src/test/ui/run-pass/consts/const-nullary-univariant-enum.rs index b1b7f782cd04..aa255c4fdebd 100644 --- a/src/test/run-pass/const-nullary-univariant-enum.rs +++ b/src/test/ui/run-pass/consts/const-nullary-univariant-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Copy, Clone)] enum Foo { diff --git a/src/test/run-pass/const-pattern-variant.rs b/src/test/ui/run-pass/consts/const-pattern-variant.rs similarity index 98% rename from src/test/run-pass/const-pattern-variant.rs rename to src/test/ui/run-pass/consts/const-pattern-variant.rs index 689ae19e7d4f..95e0a5a62e32 100644 --- a/src/test/run-pass/const-pattern-variant.rs +++ b/src/test/ui/run-pass/consts/const-pattern-variant.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(min_const_fn)] #[derive(PartialEq, Eq)] diff --git a/src/test/run-pass/const-rec-and-tup.rs b/src/test/ui/run-pass/consts/const-rec-and-tup.rs similarity index 92% rename from src/test/run-pass/const-rec-and-tup.rs rename to src/test/ui/run-pass/consts/const-rec-and-tup.rs index e6680fe3e8fd..15f74d23b6db 100644 --- a/src/test/run-pass/const-rec-and-tup.rs +++ b/src/test/ui/run-pass/consts/const-rec-and-tup.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] +#![allow(overflowing_literals)] + struct Pair { a: f64, b: f64 } struct AnotherPair { x: (i64, i64), y: Pair } diff --git a/src/test/run-pass/const-region-ptrs-noncopy.rs b/src/test/ui/run-pass/consts/const-region-ptrs-noncopy.rs similarity index 93% rename from src/test/run-pass/const-region-ptrs-noncopy.rs rename to src/test/ui/run-pass/consts/const-region-ptrs-noncopy.rs index 9a1f747ce59f..fdbebc479900 100644 --- a/src/test/run-pass/const-region-ptrs-noncopy.rs +++ b/src/test/ui/run-pass/consts/const-region-ptrs-noncopy.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] type Big = [u64; 8]; struct Pair<'a> { a: isize, b: &'a Big } diff --git a/src/test/run-pass/const-region-ptrs.rs b/src/test/ui/run-pass/consts/const-region-ptrs.rs similarity index 94% rename from src/test/run-pass/const-region-ptrs.rs rename to src/test/ui/run-pass/consts/const-region-ptrs.rs index c783d4b81847..00f987c745cd 100644 --- a/src/test/run-pass/const-region-ptrs.rs +++ b/src/test/ui/run-pass/consts/const-region-ptrs.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + struct Pair<'a> { a: isize, b: &'a isize } const x: &'static isize = &10; diff --git a/src/test/run-pass/const-repeated-values.rs b/src/test/ui/run-pass/consts/const-repeated-values.rs similarity index 97% rename from src/test/run-pass/const-repeated-values.rs rename to src/test/ui/run-pass/consts/const-repeated-values.rs index 1d749a2626e9..15a377c9c25d 100644 --- a/src/test/run-pass/const-repeated-values.rs +++ b/src/test/ui/run-pass/consts/const-repeated-values.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const FOO: isize = 42; enum Bar { diff --git a/src/test/run-pass/const-size_of-align_of.rs b/src/test/ui/run-pass/consts/const-size_of-align_of.rs similarity index 99% rename from src/test/run-pass/const-size_of-align_of.rs rename to src/test/ui/run-pass/consts/const-size_of-align_of.rs index 245dd673b512..289c61ea9faa 100644 --- a/src/test/run-pass/const-size_of-align_of.rs +++ b/src/test/ui/run-pass/consts/const-size_of-align_of.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(min_const_fn)] use std::mem; diff --git a/src/test/run-pass/const-str-ptr.rs b/src/test/ui/run-pass/consts/const-str-ptr.rs similarity index 98% rename from src/test/run-pass/const-str-ptr.rs rename to src/test/ui/run-pass/consts/const-str-ptr.rs index f58bf4fc39fe..594828118293 100644 --- a/src/test/run-pass/const-str-ptr.rs +++ b/src/test/ui/run-pass/consts/const-str-ptr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::{str, string}; const A: [u8; 2] = ['h' as u8, 'i' as u8]; diff --git a/src/test/run-pass/const-struct-offsets.rs b/src/test/ui/run-pass/consts/const-struct-offsets.rs similarity index 93% rename from src/test/run-pass/const-struct-offsets.rs rename to src/test/ui/run-pass/consts/const-struct-offsets.rs index 4f38a6431b8e..ec77b59e09d0 100644 --- a/src/test/run-pass/const-struct-offsets.rs +++ b/src/test/ui/run-pass/consts/const-struct-offsets.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_upper_case_globals)] enum Foo { IntVal(i32), diff --git a/src/test/run-pass/const-struct.rs b/src/test/ui/run-pass/consts/const-struct.rs similarity index 93% rename from src/test/run-pass/const-struct.rs rename to src/test/ui/run-pass/consts/const-struct.rs index 3cd58c6c52af..0554356ab8ea 100644 --- a/src/test/run-pass/const-struct.rs +++ b/src/test/ui/run-pass/consts/const-struct.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_upper_case_globals)] + use std::cmp; #[derive(Debug)] diff --git a/src/test/run-pass/const-trait-to-trait.rs b/src/test/ui/run-pass/consts/const-trait-to-trait.rs similarity index 98% rename from src/test/run-pass/const-trait-to-trait.rs rename to src/test/ui/run-pass/consts/const-trait-to-trait.rs index 4b53e116789a..6b7e4972536f 100644 --- a/src/test/run-pass/const-trait-to-trait.rs +++ b/src/test/ui/run-pass/consts/const-trait-to-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #24644 - block causes a &Trait -> &Trait coercion: trait Trait {} diff --git a/src/test/run-pass/const-tuple-struct.rs b/src/test/ui/run-pass/consts/const-tuple-struct.rs similarity index 98% rename from src/test/run-pass/const-tuple-struct.rs rename to src/test/ui/run-pass/consts/const-tuple-struct.rs index ddc50fc6646f..bee1c83e3f94 100644 --- a/src/test/run-pass/const-tuple-struct.rs +++ b/src/test/ui/run-pass/consts/const-tuple-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Bar(isize, isize); diff --git a/src/test/run-pass/const-typeid-of.rs b/src/test/ui/run-pass/consts/const-typeid-of.rs similarity index 99% rename from src/test/run-pass/const-typeid-of.rs rename to src/test/ui/run-pass/consts/const-typeid-of.rs index ce29e55c6d72..153d6eccaab6 100644 --- a/src/test/run-pass/const-typeid-of.rs +++ b/src/test/ui/run-pass/consts/const-typeid-of.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(core_intrinsics)] #![feature(const_type_id)] diff --git a/src/test/run-pass/const-unit-struct.rs b/src/test/ui/run-pass/consts/const-unit-struct.rs similarity index 98% rename from src/test/run-pass/const-unit-struct.rs rename to src/test/ui/run-pass/consts/const-unit-struct.rs index 320f41006e56..6dcf75b5331d 100644 --- a/src/test/run-pass/const-unit-struct.rs +++ b/src/test/ui/run-pass/consts/const-unit-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Foo; diff --git a/src/test/run-pass/const-unsafe-fn.rs b/src/test/ui/run-pass/consts/const-unsafe-fn.rs similarity index 98% rename from src/test/run-pass/const-unsafe-fn.rs rename to src/test/ui/run-pass/consts/const-unsafe-fn.rs index b267245b7896..6e05b0ac4d89 100644 --- a/src/test/run-pass/const-unsafe-fn.rs +++ b/src/test/ui/run-pass/consts/const-unsafe-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A quick test of 'unsafe const fn' functionality #![feature(min_const_fn)] diff --git a/src/test/run-pass/const-vec-of-fns.rs b/src/test/ui/run-pass/consts/const-vec-of-fns.rs similarity index 96% rename from src/test/run-pass/const-vec-of-fns.rs rename to src/test/ui/run-pass/consts/const-vec-of-fns.rs index f16fbac00797..79387b5195ba 100644 --- a/src/test/run-pass/const-vec-of-fns.rs +++ b/src/test/ui/run-pass/consts/const-vec-of-fns.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_upper_case_globals)] /*! * Try to double-check that static fns have the right size (with or diff --git a/src/test/run-pass/const-vec-syntax.rs b/src/test/ui/run-pass/consts/const-vec-syntax.rs similarity index 97% rename from src/test/run-pass/const-vec-syntax.rs rename to src/test/ui/run-pass/consts/const-vec-syntax.rs index a577bbd82788..ef979ca398ed 100644 --- a/src/test/run-pass/const-vec-syntax.rs +++ b/src/test/ui/run-pass/consts/const-vec-syntax.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn f(_: &[isize]) {} diff --git a/src/test/run-pass/const-vecs-and-slices.rs b/src/test/ui/run-pass/consts/const-vecs-and-slices.rs similarity index 95% rename from src/test/run-pass/const-vecs-and-slices.rs rename to src/test/ui/run-pass/consts/const-vecs-and-slices.rs index 758812054cd9..85d227b2d6e8 100644 --- a/src/test/run-pass/const-vecs-and-slices.rs +++ b/src/test/ui/run-pass/consts/const-vecs-and-slices.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + static x : [isize; 4] = [1,2,3,4]; static y : &'static [isize] = &[1,2,3,4]; static z : &'static [isize; 4] = &[1,2,3,4]; diff --git a/src/test/run-pass/const.rs b/src/test/ui/run-pass/consts/const.rs similarity index 91% rename from src/test/run-pass/const.rs rename to src/test/ui/run-pass/consts/const.rs index 95ae514636e5..7fc5ecb5bd72 100644 --- a/src/test/run-pass/const.rs +++ b/src/test/ui/run-pass/consts/const.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - +// run-pass +#![allow(non_upper_case_globals)] static i: isize = 10; diff --git a/src/test/run-pass/consts-in-patterns.rs b/src/test/ui/run-pass/consts/consts-in-patterns.rs similarity index 98% rename from src/test/run-pass/consts-in-patterns.rs rename to src/test/ui/run-pass/consts/consts-in-patterns.rs index 574fb29e82c7..b96ad2f40a57 100644 --- a/src/test/run-pass/consts-in-patterns.rs +++ b/src/test/ui/run-pass/consts/consts-in-patterns.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(min_const_fn)] const FOO: isize = 10; diff --git a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs b/src/test/ui/run-pass/cross-crate/anon-extern-mod-cross-crate-2.rs similarity index 98% rename from src/test/run-pass/anon-extern-mod-cross-crate-2.rs rename to src/test/ui/run-pass/cross-crate/anon-extern-mod-cross-crate-2.rs index 8c480d7deebd..52c3b073388a 100644 --- a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs +++ b/src/test/ui/run-pass/cross-crate/anon-extern-mod-cross-crate-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:anon-extern-mod-cross-crate-1.rs // pretty-expanded FIXME #23616 // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/ui/run-pass/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs b/src/test/ui/run-pass/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs new file mode 100644 index 000000000000..741ce351da38 --- /dev/null +++ b/src/test/ui/run-pass/cross-crate/auxiliary/anon-extern-mod-cross-crate-1.rs @@ -0,0 +1,19 @@ +// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_name="anonexternmod"] +#![feature(libc)] + +extern crate libc; + +#[link(name = "rust_test_helpers", kind = "static")] +extern { + pub fn rust_get_test_int() -> libc::intptr_t; +} diff --git a/src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/anon_trait_static_method_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/anon_trait_static_method_lib.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/anon_trait_static_method_lib.rs diff --git a/src/test/ui/run-pass/cross-crate/auxiliary/cci_borrow_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_borrow_lib.rs new file mode 100644 index 000000000000..9c90510a8573 --- /dev/null +++ b/src/test/ui/run-pass/cross-crate/auxiliary/cci_borrow_lib.rs @@ -0,0 +1,13 @@ +// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +pub fn foo(x: &usize) -> usize { + *x +} diff --git a/src/test/run-pass/auxiliary/cci_capture_clause.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_capture_clause.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_capture_clause.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/cci_capture_clause.rs diff --git a/src/test/ui/run-pass/cross-crate/auxiliary/cci_const.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_const.rs new file mode 100644 index 000000000000..ee8290050f91 --- /dev/null +++ b/src/test/ui/run-pass/cross-crate/auxiliary/cci_const.rs @@ -0,0 +1,16 @@ +// Copyright 2013 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +pub extern fn bar() { +} + +pub const foopy: &'static str = "hi there"; +pub const uint_val: usize = 12; +pub const uint_expr: usize = (1 << uint_val) - 1; diff --git a/src/test/run-pass/auxiliary/cci_impl_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_impl_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_impl_lib.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/cci_impl_lib.rs diff --git a/src/test/run-pass/auxiliary/cci_iter_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_iter_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_iter_lib.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/cci_iter_lib.rs diff --git a/src/test/run-pass/auxiliary/cci_nested_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_nested_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_nested_lib.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/cci_nested_lib.rs diff --git a/src/test/run-pass/auxiliary/cci_no_inline_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/cci_no_inline_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_no_inline_lib.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/cci_no_inline_lib.rs diff --git a/src/test/run-pass/auxiliary/moves_based_on_type_lib.rs b/src/test/ui/run-pass/cross-crate/auxiliary/moves_based_on_type_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/moves_based_on_type_lib.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/moves_based_on_type_lib.rs diff --git a/src/test/run-pass/auxiliary/newtype_struct_xc.rs b/src/test/ui/run-pass/cross-crate/auxiliary/newtype_struct_xc.rs similarity index 100% rename from src/test/run-pass/auxiliary/newtype_struct_xc.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/newtype_struct_xc.rs diff --git a/src/test/run-pass/auxiliary/pub_static_array.rs b/src/test/ui/run-pass/cross-crate/auxiliary/pub_static_array.rs similarity index 100% rename from src/test/run-pass/auxiliary/pub_static_array.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/pub_static_array.rs diff --git a/src/test/run-pass/auxiliary/reexported_static_methods.rs b/src/test/ui/run-pass/cross-crate/auxiliary/reexported_static_methods.rs similarity index 100% rename from src/test/run-pass/auxiliary/reexported_static_methods.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/reexported_static_methods.rs diff --git a/src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs similarity index 100% rename from src/test/run-pass/auxiliary/xcrate-trait-lifetime-param.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate-trait-lifetime-param.rs diff --git a/src/test/run-pass/auxiliary/xcrate_address_insignificant.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate_address_insignificant.rs similarity index 100% rename from src/test/run-pass/auxiliary/xcrate_address_insignificant.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate_address_insignificant.rs diff --git a/src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate_associated_type_defaults.rs similarity index 100% rename from src/test/run-pass/auxiliary/xcrate_associated_type_defaults.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate_associated_type_defaults.rs diff --git a/src/test/run-pass/auxiliary/xcrate_generic_fn_nested_return.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs similarity index 100% rename from src/test/run-pass/auxiliary/xcrate_generic_fn_nested_return.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate_generic_fn_nested_return.rs diff --git a/src/test/run-pass/auxiliary/xcrate_static_addresses.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate_static_addresses.rs similarity index 100% rename from src/test/run-pass/auxiliary/xcrate_static_addresses.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate_static_addresses.rs diff --git a/src/test/run-pass/auxiliary/xcrate_unit_struct.rs b/src/test/ui/run-pass/cross-crate/auxiliary/xcrate_unit_struct.rs similarity index 100% rename from src/test/run-pass/auxiliary/xcrate_unit_struct.rs rename to src/test/ui/run-pass/cross-crate/auxiliary/xcrate_unit_struct.rs diff --git a/src/test/run-pass/cci_borrow.rs b/src/test/ui/run-pass/cross-crate/cci_borrow.rs similarity index 98% rename from src/test/run-pass/cci_borrow.rs rename to src/test/ui/run-pass/cross-crate/cci_borrow.rs index 1535ddfb4de0..6e822d7cb686 100644 --- a/src/test/run-pass/cci_borrow.rs +++ b/src/test/ui/run-pass/cross-crate/cci_borrow.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_borrow_lib.rs #![feature(box_syntax)] diff --git a/src/test/run-pass/cci_capture_clause.rs b/src/test/ui/run-pass/cross-crate/cci_capture_clause.rs similarity index 98% rename from src/test/run-pass/cci_capture_clause.rs rename to src/test/ui/run-pass/cross-crate/cci_capture_clause.rs index 5019455c2a7f..ea389d314b5a 100644 --- a/src/test/run-pass/cci_capture_clause.rs +++ b/src/test/ui/run-pass/cross-crate/cci_capture_clause.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_capture_clause.rs // This test makes sure we can do cross-crate inlining on functions diff --git a/src/test/run-pass/cci_impl_exe.rs b/src/test/ui/run-pass/cross-crate/cci_impl_exe.rs similarity index 98% rename from src/test/run-pass/cci_impl_exe.rs rename to src/test/ui/run-pass/cross-crate/cci_impl_exe.rs index 998f41259777..18378ca63ed0 100644 --- a/src/test/run-pass/cci_impl_exe.rs +++ b/src/test/ui/run-pass/cross-crate/cci_impl_exe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_impl_lib.rs extern crate cci_impl_lib; diff --git a/src/test/run-pass/cci_iter_exe.rs b/src/test/ui/run-pass/cross-crate/cci_iter_exe.rs similarity index 98% rename from src/test/run-pass/cci_iter_exe.rs rename to src/test/ui/run-pass/cross-crate/cci_iter_exe.rs index 4d9646522749..89c01bab3ca4 100644 --- a/src/test/run-pass/cci_iter_exe.rs +++ b/src/test/ui/run-pass/cross-crate/cci_iter_exe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_iter_lib.rs extern crate cci_iter_lib; diff --git a/src/test/run-pass/cci_nested_exe.rs b/src/test/ui/run-pass/cross-crate/cci_nested_exe.rs similarity index 98% rename from src/test/run-pass/cci_nested_exe.rs rename to src/test/ui/run-pass/cross-crate/cci_nested_exe.rs index b40c29dd7152..3e88aad55f33 100644 --- a/src/test/run-pass/cci_nested_exe.rs +++ b/src/test/ui/run-pass/cross-crate/cci_nested_exe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_nested_lib.rs diff --git a/src/test/run-pass/cci_no_inline_exe.rs b/src/test/ui/run-pass/cross-crate/cci_no_inline_exe.rs similarity index 98% rename from src/test/run-pass/cci_no_inline_exe.rs rename to src/test/ui/run-pass/cross-crate/cci_no_inline_exe.rs index b105411c284a..797294940094 100644 --- a/src/test/run-pass/cci_no_inline_exe.rs +++ b/src/test/ui/run-pass/cross-crate/cci_no_inline_exe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_no_inline_lib.rs extern crate cci_no_inline_lib; diff --git a/src/test/run-pass/cross-crate-const-pat.rs b/src/test/ui/run-pass/cross-crate/cross-crate-const-pat.rs similarity index 98% rename from src/test/run-pass/cross-crate-const-pat.rs rename to src/test/ui/run-pass/cross-crate/cross-crate-const-pat.rs index a85541bb8ba5..8040f60f9474 100644 --- a/src/test/run-pass/cross-crate-const-pat.rs +++ b/src/test/ui/run-pass/cross-crate/cross-crate-const-pat.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_const.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/cross-crate-newtype-struct-pat.rs b/src/test/ui/run-pass/cross-crate/cross-crate-newtype-struct-pat.rs similarity index 98% rename from src/test/run-pass/cross-crate-newtype-struct-pat.rs rename to src/test/ui/run-pass/cross-crate/cross-crate-newtype-struct-pat.rs index 7eae9017420d..e714e1d32ffa 100644 --- a/src/test/run-pass/cross-crate-newtype-struct-pat.rs +++ b/src/test/ui/run-pass/cross-crate/cross-crate-newtype-struct-pat.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:newtype_struct_xc.rs diff --git a/src/test/run-pass/moves-based-on-type-cross-crate.rs b/src/test/ui/run-pass/cross-crate/moves-based-on-type-cross-crate.rs similarity index 98% rename from src/test/run-pass/moves-based-on-type-cross-crate.rs rename to src/test/ui/run-pass/cross-crate/moves-based-on-type-cross-crate.rs index a313ec998f0a..8cc84c6c5366 100644 --- a/src/test/run-pass/moves-based-on-type-cross-crate.rs +++ b/src/test/ui/run-pass/cross-crate/moves-based-on-type-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:moves_based_on_type_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/reexported-static-methods-cross-crate.rs b/src/test/ui/run-pass/cross-crate/reexported-static-methods-cross-crate.rs similarity index 98% rename from src/test/run-pass/reexported-static-methods-cross-crate.rs rename to src/test/ui/run-pass/cross-crate/reexported-static-methods-cross-crate.rs index 4d1050383844..062e25723992 100644 --- a/src/test/run-pass/reexported-static-methods-cross-crate.rs +++ b/src/test/ui/run-pass/cross-crate/reexported-static-methods-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:reexported_static_methods.rs extern crate reexported_static_methods; diff --git a/src/test/run-pass/static-array-across-crate.rs b/src/test/ui/run-pass/cross-crate/static-array-across-crate.rs similarity index 98% rename from src/test/run-pass/static-array-across-crate.rs rename to src/test/ui/run-pass/cross-crate/static-array-across-crate.rs index 732d94cee8ed..c21be4ce47c7 100644 --- a/src/test/run-pass/static-array-across-crate.rs +++ b/src/test/ui/run-pass/cross-crate/static-array-across-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:pub_static_array.rs extern crate pub_static_array as array; diff --git a/src/test/run-pass/xcrate-address-insignificant.rs b/src/test/ui/run-pass/cross-crate/xcrate-address-insignificant.rs similarity index 98% rename from src/test/run-pass/xcrate-address-insignificant.rs rename to src/test/ui/run-pass/cross-crate/xcrate-address-insignificant.rs index 8794ecd061b4..3ac2a0c8b457 100644 --- a/src/test/run-pass/xcrate-address-insignificant.rs +++ b/src/test/ui/run-pass/cross-crate/xcrate-address-insignificant.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:xcrate_address_insignificant.rs diff --git a/src/test/run-pass/xcrate-associated-type-defaults.rs b/src/test/ui/run-pass/cross-crate/xcrate-associated-type-defaults.rs similarity index 98% rename from src/test/run-pass/xcrate-associated-type-defaults.rs rename to src/test/ui/run-pass/cross-crate/xcrate-associated-type-defaults.rs index 2dacbe0966ee..7015732daf66 100644 --- a/src/test/run-pass/xcrate-associated-type-defaults.rs +++ b/src/test/ui/run-pass/cross-crate/xcrate-associated-type-defaults.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:xcrate_associated_type_defaults.rs extern crate xcrate_associated_type_defaults; diff --git a/src/test/run-pass/xcrate-static-addresses.rs b/src/test/ui/run-pass/cross-crate/xcrate-static-addresses.rs similarity index 98% rename from src/test/run-pass/xcrate-static-addresses.rs rename to src/test/ui/run-pass/cross-crate/xcrate-static-addresses.rs index 43bae9c7ce07..cb2a3563c7ee 100644 --- a/src/test/run-pass/xcrate-static-addresses.rs +++ b/src/test/ui/run-pass/cross-crate/xcrate-static-addresses.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:xcrate_static_addresses.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/xcrate-trait-lifetime-param.rs b/src/test/ui/run-pass/cross-crate/xcrate-trait-lifetime-param.rs similarity index 98% rename from src/test/run-pass/xcrate-trait-lifetime-param.rs rename to src/test/ui/run-pass/cross-crate/xcrate-trait-lifetime-param.rs index 62d62839ba31..467ee2cedb9f 100644 --- a/src/test/run-pass/xcrate-trait-lifetime-param.rs +++ b/src/test/ui/run-pass/cross-crate/xcrate-trait-lifetime-param.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:xcrate-trait-lifetime-param.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/xcrate-unit-struct.rs b/src/test/ui/run-pass/cross-crate/xcrate-unit-struct.rs similarity index 96% rename from src/test/run-pass/xcrate-unit-struct.rs rename to src/test/ui/run-pass/cross-crate/xcrate-unit-struct.rs index 78e92053a112..65ce4244f569 100644 --- a/src/test/run-pass/xcrate-unit-struct.rs +++ b/src/test/ui/run-pass/cross-crate/xcrate-unit-struct.rs @@ -8,8 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:xcrate_unit_struct.rs // pretty-expanded FIXME #23616 +#![allow(non_upper_case_globals)] extern crate xcrate_unit_struct; diff --git a/src/test/run-pass/xcrate_generic_fn_nested_return.rs b/src/test/ui/run-pass/cross-crate/xcrate_generic_fn_nested_return.rs similarity index 98% rename from src/test/run-pass/xcrate_generic_fn_nested_return.rs rename to src/test/ui/run-pass/cross-crate/xcrate_generic_fn_nested_return.rs index 181c91686823..2ed392a3fbb4 100644 --- a/src/test/run-pass/xcrate_generic_fn_nested_return.rs +++ b/src/test/ui/run-pass/cross-crate/xcrate_generic_fn_nested_return.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:xcrate_generic_fn_nested_return.rs extern crate xcrate_generic_fn_nested_return as test; diff --git a/src/test/run-pass/ctfe/assoc-const.rs b/src/test/ui/run-pass/ctfe/assoc-const.rs similarity index 98% rename from src/test/run-pass/ctfe/assoc-const.rs rename to src/test/ui/run-pass/ctfe/assoc-const.rs index 6a740dc1dd30..cead17439261 100644 --- a/src/test/run-pass/ctfe/assoc-const.rs +++ b/src/test/ui/run-pass/ctfe/assoc-const.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + trait Nat { const VALUE: usize; } diff --git a/src/test/run-pass/ctfe/bswap-const.rs b/src/test/ui/run-pass/ctfe/bswap-const.rs similarity index 98% rename from src/test/run-pass/ctfe/bswap-const.rs rename to src/test/ui/run-pass/ctfe/bswap-const.rs index b951a9b72b1e..5fc7609bb680 100644 --- a/src/test/run-pass/ctfe/bswap-const.rs +++ b/src/test/ui/run-pass/ctfe/bswap-const.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(core_intrinsics)] use std::intrinsics; diff --git a/src/test/run-pass/ctfe/chained-constants-stackoverflow.rs b/src/test/ui/run-pass/ctfe/chained-constants-stackoverflow.rs similarity index 99% rename from src/test/run-pass/ctfe/chained-constants-stackoverflow.rs rename to src/test/ui/run-pass/ctfe/chained-constants-stackoverflow.rs index 813dd5fbb994..94e97d37424c 100644 --- a/src/test/run-pass/ctfe/chained-constants-stackoverflow.rs +++ b/src/test/ui/run-pass/ctfe/chained-constants-stackoverflow.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/34997 pub const CST_1: u32 = 0; diff --git a/src/test/run-pass/ctfe/const-block-non-item-statement-3.rs b/src/test/ui/run-pass/ctfe/const-block-non-item-statement-3.rs similarity index 97% rename from src/test/run-pass/ctfe/const-block-non-item-statement-3.rs rename to src/test/ui/run-pass/ctfe/const-block-non-item-statement-3.rs index e233107169c7..09590d5f1977 100644 --- a/src/test/run-pass/ctfe/const-block-non-item-statement-3.rs +++ b/src/test/ui/run-pass/ctfe/const-block-non-item-statement-3.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(const_let)] type Array = [u32; { let x = 2; 5 }]; diff --git a/src/test/run-pass/ctfe/const-block-non-item-statement.rs b/src/test/ui/run-pass/ctfe/const-block-non-item-statement.rs similarity index 97% rename from src/test/run-pass/ctfe/const-block-non-item-statement.rs rename to src/test/ui/run-pass/ctfe/const-block-non-item-statement.rs index b5a9bfb45a1b..5490bd4d3ad8 100644 --- a/src/test/run-pass/ctfe/const-block-non-item-statement.rs +++ b/src/test/ui/run-pass/ctfe/const-block-non-item-statement.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(const_let)] enum Foo { diff --git a/src/test/run-pass/ctfe/const-fn-destructuring-arg.rs b/src/test/ui/run-pass/ctfe/const-fn-destructuring-arg.rs similarity index 98% rename from src/test/run-pass/ctfe/const-fn-destructuring-arg.rs rename to src/test/ui/run-pass/ctfe/const-fn-destructuring-arg.rs index 8b832976aab0..323232acc675 100644 --- a/src/test/run-pass/ctfe/const-fn-destructuring-arg.rs +++ b/src/test/ui/run-pass/ctfe/const-fn-destructuring-arg.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // test that certain things are disallowed in constant functions #![feature(const_fn, const_let)] diff --git a/src/test/run-pass/ctfe/deref_in_pattern.rs b/src/test/ui/run-pass/ctfe/deref_in_pattern.rs similarity index 97% rename from src/test/run-pass/ctfe/deref_in_pattern.rs rename to src/test/ui/run-pass/ctfe/deref_in_pattern.rs index 4ccfa0338f39..6f4cca624bfe 100644 --- a/src/test/run-pass/ctfe/deref_in_pattern.rs +++ b/src/test/ui/run-pass/ctfe/deref_in_pattern.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/25574 const A: [u8; 4] = *b"fooo"; diff --git a/src/test/run-pass/ctfe/ice-48279.rs b/src/test/ui/run-pass/ctfe/ice-48279.rs similarity index 98% rename from src/test/run-pass/ctfe/ice-48279.rs rename to src/test/ui/run-pass/ctfe/ice-48279.rs index f59a6810e3a7..34b7b56f274a 100644 --- a/src/test/run-pass/ctfe/ice-48279.rs +++ b/src/test/ui/run-pass/ctfe/ice-48279.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/48279 #![feature(min_const_fn)] diff --git a/src/test/run-pass/ctfe/issue-37550.rs b/src/test/ui/run-pass/ctfe/issue-37550.rs similarity index 97% rename from src/test/run-pass/ctfe/issue-37550.rs rename to src/test/ui/run-pass/ctfe/issue-37550.rs index 27796a5feea2..21c4ec2c09ec 100644 --- a/src/test/run-pass/ctfe/issue-37550.rs +++ b/src/test/ui/run-pass/ctfe/issue-37550.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(const_fn, const_let)] const fn x() { diff --git a/src/test/run-pass/ctfe/issue-broken-mir.rs b/src/test/ui/run-pass/ctfe/issue-broken-mir.rs similarity index 97% rename from src/test/run-pass/ctfe/issue-broken-mir.rs rename to src/test/ui/run-pass/ctfe/issue-broken-mir.rs index 6ed0c7c0d5dc..4810ef75c781 100644 --- a/src/test/run-pass/ctfe/issue-broken-mir.rs +++ b/src/test/ui/run-pass/ctfe/issue-broken-mir.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/27918 fn main() { diff --git a/src/test/run-pass/ctfe/locals-in-const-fn.rs b/src/test/ui/run-pass/ctfe/locals-in-const-fn.rs similarity index 98% rename from src/test/run-pass/ctfe/locals-in-const-fn.rs rename to src/test/ui/run-pass/ctfe/locals-in-const-fn.rs index 8c153315c25a..d10465b9dcd2 100644 --- a/src/test/run-pass/ctfe/locals-in-const-fn.rs +++ b/src/test/ui/run-pass/ctfe/locals-in-const-fn.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/48821 #![feature(const_fn, const_let)] diff --git a/src/test/run-pass/ctfe/match-const-fn-structs.rs b/src/test/ui/run-pass/ctfe/match-const-fn-structs.rs similarity index 98% rename from src/test/run-pass/ctfe/match-const-fn-structs.rs rename to src/test/ui/run-pass/ctfe/match-const-fn-structs.rs index 352958f4c6a4..6c829f142dd0 100644 --- a/src/test/run-pass/ctfe/match-const-fn-structs.rs +++ b/src/test/ui/run-pass/ctfe/match-const-fn-structs.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/46114 #![feature(min_const_fn)] diff --git a/src/test/run-pass/ctfe/mozjs-error.rs b/src/test/ui/run-pass/ctfe/mozjs-error.rs similarity index 95% rename from src/test/run-pass/ctfe/mozjs-error.rs rename to src/test/ui/run-pass/ctfe/mozjs-error.rs index 9c8a4b5ae6a2..ea200ba738fb 100644 --- a/src/test/run-pass/ctfe/mozjs-error.rs +++ b/src/test/ui/run-pass/ctfe/mozjs-error.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + struct CustomAutoRooterVFTable { trace: unsafe extern "C" fn(this: *mut i32, trc: *mut u32), } diff --git a/src/test/run-pass/ctfe/non-scalar-cast.rs b/src/test/ui/run-pass/ctfe/non-scalar-cast.rs similarity index 97% rename from src/test/run-pass/ctfe/non-scalar-cast.rs rename to src/test/ui/run-pass/ctfe/non-scalar-cast.rs index ff4474f47c9f..9711247b83e0 100644 --- a/src/test/run-pass/ctfe/non-scalar-cast.rs +++ b/src/test/ui/run-pass/ctfe/non-scalar-cast.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/37448 fn main() { diff --git a/src/test/run-pass/ctfe/promotion.rs b/src/test/ui/run-pass/ctfe/promotion.rs similarity index 98% rename from src/test/run-pass/ctfe/promotion.rs rename to src/test/ui/run-pass/ctfe/promotion.rs index 28b876c308b6..5407529f0653 100644 --- a/src/test/run-pass/ctfe/promotion.rs +++ b/src/test/ui/run-pass/ctfe/promotion.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // compile-flags: -O fn foo(_: &'static [&'static str]) {} diff --git a/src/test/run-pass/ctfe/references.rs b/src/test/ui/run-pass/ctfe/references.rs similarity index 98% rename from src/test/run-pass/ctfe/references.rs rename to src/test/ui/run-pass/ctfe/references.rs index ad7dbeb79c72..946ed246bb05 100644 --- a/src/test/run-pass/ctfe/references.rs +++ b/src/test/ui/run-pass/ctfe/references.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + const FOO: &[u8] = b"foo"; const BAR: &[u8] = &[1, 2, 3]; diff --git a/src/test/run-pass/ctfe/repeat_match.rs b/src/test/ui/run-pass/ctfe/repeat_match.rs similarity index 98% rename from src/test/run-pass/ctfe/repeat_match.rs rename to src/test/ui/run-pass/ctfe/repeat_match.rs index dedf5defebb7..60a9a916bff4 100644 --- a/src/test/run-pass/ctfe/repeat_match.rs +++ b/src/test/ui/run-pass/ctfe/repeat_match.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/45044 const X: [u8; 1] = [0; 1]; diff --git a/src/test/run-pass/ctfe/return-in-const-fn.rs b/src/test/ui/run-pass/ctfe/return-in-const-fn.rs similarity index 97% rename from src/test/run-pass/ctfe/return-in-const-fn.rs rename to src/test/ui/run-pass/ctfe/return-in-const-fn.rs index 87fdac4bfb4f..e00200195237 100644 --- a/src/test/run-pass/ctfe/return-in-const-fn.rs +++ b/src/test/ui/run-pass/ctfe/return-in-const-fn.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/43754 #![feature(min_const_fn)] diff --git a/src/test/run-pass/ctfe/signed_enum_discr.rs b/src/test/ui/run-pass/ctfe/signed_enum_discr.rs similarity index 98% rename from src/test/run-pass/ctfe/signed_enum_discr.rs rename to src/test/ui/run-pass/ctfe/signed_enum_discr.rs index 7049d28a8708..9dd2990ab8d6 100644 --- a/src/test/run-pass/ctfe/signed_enum_discr.rs +++ b/src/test/ui/run-pass/ctfe/signed_enum_discr.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/49181 #[derive(Eq, PartialEq)] diff --git a/src/test/run-pass/ctfe/transmute-const.rs b/src/test/ui/run-pass/ctfe/transmute-const.rs similarity index 98% rename from src/test/run-pass/ctfe/transmute-const.rs rename to src/test/ui/run-pass/ctfe/transmute-const.rs index bf9459a67c45..efd6df5f8864 100644 --- a/src/test/run-pass/ctfe/transmute-const.rs +++ b/src/test/ui/run-pass/ctfe/transmute-const.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(const_transmute)] use std::mem; diff --git a/src/test/run-pass/ctfe/tuple-struct-constructors.rs b/src/test/ui/run-pass/ctfe/tuple-struct-constructors.rs similarity index 98% rename from src/test/run-pass/ctfe/tuple-struct-constructors.rs rename to src/test/ui/run-pass/ctfe/tuple-struct-constructors.rs index d5f3e88fd52e..c7000d198138 100644 --- a/src/test/run-pass/ctfe/tuple-struct-constructors.rs +++ b/src/test/ui/run-pass/ctfe/tuple-struct-constructors.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // https://github.com/rust-lang/rust/issues/41898 use std::num::NonZeroU64; diff --git a/src/test/run-pass/auxiliary/derive-no-std.rs b/src/test/ui/run-pass/deriving/auxiliary/derive-no-std.rs similarity index 100% rename from src/test/run-pass/auxiliary/derive-no-std.rs rename to src/test/ui/run-pass/deriving/auxiliary/derive-no-std.rs diff --git a/src/test/run-pass/derive-no-std.rs b/src/test/ui/run-pass/deriving/derive-no-std.rs similarity index 98% rename from src/test/run-pass/derive-no-std.rs rename to src/test/ui/run-pass/deriving/derive-no-std.rs index 0cbe4f4ebd0e..1122083eb801 100644 --- a/src/test/run-pass/derive-no-std.rs +++ b/src/test/ui/run-pass/deriving/derive-no-std.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:derive-no-std.rs extern crate derive_no_std; diff --git a/src/test/run-pass/derive-partialord-correctness.rs b/src/test/ui/run-pass/deriving/derive-partialord-correctness.rs similarity index 98% rename from src/test/run-pass/derive-partialord-correctness.rs rename to src/test/ui/run-pass/deriving/derive-partialord-correctness.rs index bc9e9a700875..4890b1bc76ba 100644 --- a/src/test/run-pass/derive-partialord-correctness.rs +++ b/src/test/ui/run-pass/deriving/derive-partialord-correctness.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Original issue: #49650 #[derive(PartialOrd, PartialEq)] diff --git a/src/test/run-pass/deriving-associated-types.rs b/src/test/ui/run-pass/deriving/deriving-associated-types.rs similarity index 99% rename from src/test/run-pass/deriving-associated-types.rs rename to src/test/ui/run-pass/deriving/deriving-associated-types.rs index d3aaa3ded69d..46fb88e05c69 100644 --- a/src/test/run-pass/deriving-associated-types.rs +++ b/src/test/ui/run-pass/deriving/deriving-associated-types.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait DeclaredTrait { type Type; } diff --git a/src/test/run-pass/deriving-bounds.rs b/src/test/ui/run-pass/deriving/deriving-bounds.rs similarity index 97% rename from src/test/run-pass/deriving-bounds.rs rename to src/test/ui/run-pass/deriving/deriving-bounds.rs index 6d0a43997bc4..0e30de10e821 100644 --- a/src/test/run-pass/deriving-bounds.rs +++ b/src/test/ui/run-pass/deriving/deriving-bounds.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Copy, Clone)] struct Test; diff --git a/src/test/run-pass/deriving-clone-array.rs b/src/test/ui/run-pass/deriving/deriving-clone-array.rs similarity index 97% rename from src/test/run-pass/deriving-clone-array.rs rename to src/test/ui/run-pass/deriving/deriving-clone-array.rs index 182a1390b1f7..2d3be810def9 100644 --- a/src/test/run-pass/deriving-clone-array.rs +++ b/src/test/ui/run-pass/deriving/deriving-clone-array.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // test for issue #30244 #[derive(Copy, Clone)] diff --git a/src/test/run-pass/deriving-clone-enum.rs b/src/test/ui/run-pass/deriving/deriving-clone-enum.rs similarity index 98% rename from src/test/run-pass/deriving-clone-enum.rs rename to src/test/ui/run-pass/deriving/deriving-clone-enum.rs index 22daffc48699..cf924e0ff5ed 100644 --- a/src/test/run-pass/deriving-clone-enum.rs +++ b/src/test/ui/run-pass/deriving/deriving-clone-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-clone-generic-enum.rs b/src/test/ui/run-pass/deriving/deriving-clone-generic-enum.rs similarity index 98% rename from src/test/run-pass/deriving-clone-generic-enum.rs rename to src/test/ui/run-pass/deriving/deriving-clone-generic-enum.rs index 8a07bad69618..2b1ace396a74 100644 --- a/src/test/run-pass/deriving-clone-generic-enum.rs +++ b/src/test/ui/run-pass/deriving/deriving-clone-generic-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-clone-generic-struct.rs b/src/test/ui/run-pass/deriving/deriving-clone-generic-struct.rs similarity index 98% rename from src/test/run-pass/deriving-clone-generic-struct.rs rename to src/test/ui/run-pass/deriving/deriving-clone-generic-struct.rs index d80f14c36945..dea50871a744 100644 --- a/src/test/run-pass/deriving-clone-generic-struct.rs +++ b/src/test/ui/run-pass/deriving/deriving-clone-generic-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-clone-generic-tuple-struct.rs b/src/test/ui/run-pass/deriving/deriving-clone-generic-tuple-struct.rs similarity index 97% rename from src/test/run-pass/deriving-clone-generic-tuple-struct.rs rename to src/test/ui/run-pass/deriving/deriving-clone-generic-tuple-struct.rs index f2f2ec3de760..01ef89f81c18 100644 --- a/src/test/run-pass/deriving-clone-generic-tuple-struct.rs +++ b/src/test/ui/run-pass/deriving/deriving-clone-generic-tuple-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-clone-struct.rs b/src/test/ui/run-pass/deriving/deriving-clone-struct.rs similarity index 98% rename from src/test/run-pass/deriving-clone-struct.rs rename to src/test/ui/run-pass/deriving/deriving-clone-struct.rs index 8bca83450855..f82a41f8ba01 100644 --- a/src/test/run-pass/deriving-clone-struct.rs +++ b/src/test/ui/run-pass/deriving/deriving-clone-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-clone-tuple-struct.rs b/src/test/ui/run-pass/deriving/deriving-clone-tuple-struct.rs similarity index 97% rename from src/test/run-pass/deriving-clone-tuple-struct.rs rename to src/test/ui/run-pass/deriving/deriving-clone-tuple-struct.rs index 8be029ba2acc..49c675de112a 100644 --- a/src/test/run-pass/deriving-clone-tuple-struct.rs +++ b/src/test/ui/run-pass/deriving/deriving-clone-tuple-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/deriving-cmp-generic-enum.rs b/src/test/ui/run-pass/deriving/deriving-cmp-generic-enum.rs similarity index 99% rename from src/test/run-pass/deriving-cmp-generic-enum.rs rename to src/test/ui/run-pass/deriving/deriving-cmp-generic-enum.rs index b2add21dcd48..1a6582d9af22 100644 --- a/src/test/run-pass/deriving-cmp-generic-enum.rs +++ b/src/test/ui/run-pass/deriving/deriving-cmp-generic-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Eq, PartialOrd, Ord)] enum E { E0, diff --git a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs b/src/test/ui/run-pass/deriving/deriving-cmp-generic-struct-enum.rs similarity index 99% rename from src/test/run-pass/deriving-cmp-generic-struct-enum.rs rename to src/test/ui/run-pass/deriving/deriving-cmp-generic-struct-enum.rs index f061b6cf4c1b..93bda7fbf259 100644 --- a/src/test/run-pass/deriving-cmp-generic-struct-enum.rs +++ b/src/test/ui/run-pass/deriving/deriving-cmp-generic-struct-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Eq, PartialOrd, Ord)] enum ES { ES1 { x: T }, diff --git a/src/test/run-pass/deriving-cmp-generic-struct.rs b/src/test/ui/run-pass/deriving/deriving-cmp-generic-struct.rs similarity index 99% rename from src/test/run-pass/deriving-cmp-generic-struct.rs rename to src/test/ui/run-pass/deriving/deriving-cmp-generic-struct.rs index d6c73f394aca..f2e6fcd13fc7 100644 --- a/src/test/run-pass/deriving-cmp-generic-struct.rs +++ b/src/test/ui/run-pass/deriving/deriving-cmp-generic-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Eq, PartialOrd, Ord)] struct S { x: T, diff --git a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs b/src/test/ui/run-pass/deriving/deriving-cmp-generic-tuple-struct.rs similarity index 99% rename from src/test/run-pass/deriving-cmp-generic-tuple-struct.rs rename to src/test/ui/run-pass/deriving/deriving-cmp-generic-tuple-struct.rs index fc256228507f..04688ff352d1 100644 --- a/src/test/run-pass/deriving-cmp-generic-tuple-struct.rs +++ b/src/test/ui/run-pass/deriving/deriving-cmp-generic-tuple-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Eq, PartialOrd, Ord)] struct TS(T,T); diff --git a/src/test/run-pass/deriving-cmp-shortcircuit.rs b/src/test/ui/run-pass/deriving/deriving-cmp-shortcircuit.rs similarity index 99% rename from src/test/run-pass/deriving-cmp-shortcircuit.rs rename to src/test/ui/run-pass/deriving/deriving-cmp-shortcircuit.rs index e22e4767d521..e1f301922bdf 100644 --- a/src/test/run-pass/deriving-cmp-shortcircuit.rs +++ b/src/test/ui/run-pass/deriving/deriving-cmp-shortcircuit.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // check that the derived impls for the comparison traits shortcircuit // where possible, by having a type that panics when compared as the // second element, so this passes iff the instances shortcircuit. diff --git a/src/test/run-pass/deriving-copyclone.rs b/src/test/ui/run-pass/deriving/deriving-copyclone.rs similarity index 99% rename from src/test/run-pass/deriving-copyclone.rs rename to src/test/ui/run-pass/deriving/deriving-copyclone.rs index 96d0406d9eb2..e9da90fe6ede 100644 --- a/src/test/run-pass/deriving-copyclone.rs +++ b/src/test/ui/run-pass/deriving/deriving-copyclone.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass //! Test that #[derive(Copy, Clone)] produces a shallow copy //! even when a member violates RFC 1521 diff --git a/src/test/run-pass/deriving-default-box.rs b/src/test/ui/run-pass/deriving/deriving-default-box.rs similarity index 98% rename from src/test/run-pass/deriving-default-box.rs rename to src/test/ui/run-pass/deriving/deriving-default-box.rs index 70ac284cd30c..55111a4231a6 100644 --- a/src/test/run-pass/deriving-default-box.rs +++ b/src/test/ui/run-pass/deriving/deriving-default-box.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] use std::default::Default; diff --git a/src/test/run-pass/deriving-enum-single-variant.rs b/src/test/ui/run-pass/deriving/deriving-enum-single-variant.rs similarity index 93% rename from src/test/run-pass/deriving-enum-single-variant.rs rename to src/test/ui/run-pass/deriving/deriving-enum-single-variant.rs index d45247c593e5..e304f481baa6 100644 --- a/src/test/run-pass/deriving-enum-single-variant.rs +++ b/src/test/ui/run-pass/deriving/deriving-enum-single-variant.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_camel_case_types)] pub type task_id = isize; diff --git a/src/test/run-pass/deriving-eq-ord-boxed-slice.rs b/src/test/ui/run-pass/deriving/deriving-eq-ord-boxed-slice.rs similarity index 98% rename from src/test/run-pass/deriving-eq-ord-boxed-slice.rs rename to src/test/ui/run-pass/deriving/deriving-eq-ord-boxed-slice.rs index 16c49065008a..7997aa5a7ec2 100644 --- a/src/test/run-pass/deriving-eq-ord-boxed-slice.rs +++ b/src/test/ui/run-pass/deriving/deriving-eq-ord-boxed-slice.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, PartialOrd, Eq, Ord, Debug)] struct Foo(Box<[u8]>); diff --git a/src/test/run-pass/deriving-hash.rs b/src/test/ui/run-pass/deriving/deriving-hash.rs similarity index 93% rename from src/test/run-pass/deriving-hash.rs rename to src/test/ui/run-pass/deriving/deriving-hash.rs index ceeb42663965..aec8a7075a51 100644 --- a/src/test/run-pass/deriving-hash.rs +++ b/src/test/ui/run-pass/deriving/deriving-hash.rs @@ -8,6 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] +#![allow(non_camel_case_types)] +#![allow(non_snake_case)] +#![allow(overflowing_literals)] + use std::hash::{Hash, SipHasher, Hasher}; use std::mem::size_of; diff --git a/src/test/run-pass/deriving-in-fn.rs b/src/test/ui/run-pass/deriving/deriving-in-fn.rs similarity index 98% rename from src/test/run-pass/deriving-in-fn.rs rename to src/test/ui/run-pass/deriving/deriving-in-fn.rs index 435d15aab8f2..00100aa1be13 100644 --- a/src/test/run-pass/deriving-in-fn.rs +++ b/src/test/ui/run-pass/deriving/deriving-in-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { #[derive(Debug)] struct Foo { diff --git a/src/test/run-pass/deriving-in-macro.rs b/src/test/ui/run-pass/deriving/deriving-in-macro.rs similarity index 93% rename from src/test/run-pass/deriving-in-macro.rs rename to src/test/ui/run-pass/deriving/deriving-in-macro.rs index adc3e3efd70d..dc6fda84f1d4 100644 --- a/src/test/run-pass/deriving-in-macro.rs +++ b/src/test/ui/run-pass/deriving/deriving-in-macro.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_camel_case_types)] macro_rules! define_vec { () => ( diff --git a/src/test/run-pass/deriving-meta-multiple.rs b/src/test/ui/run-pass/deriving/deriving-meta-multiple.rs similarity index 96% rename from src/test/run-pass/deriving-meta-multiple.rs rename to src/test/ui/run-pass/deriving/deriving-meta-multiple.rs index a2d22699fcc1..33f98a74b142 100644 --- a/src/test/run-pass/deriving-meta-multiple.rs +++ b/src/test/ui/run-pass/deriving/deriving-meta-multiple.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(deprecated)] use std::hash::{Hash, SipHasher}; diff --git a/src/test/run-pass/deriving-meta.rs b/src/test/ui/run-pass/deriving/deriving-meta.rs similarity index 96% rename from src/test/run-pass/deriving-meta.rs rename to src/test/ui/run-pass/deriving/deriving-meta.rs index f1c930828d2a..309cd5aed1db 100644 --- a/src/test/run-pass/deriving-meta.rs +++ b/src/test/ui/run-pass/deriving/deriving-meta.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(deprecated)] use std::hash::{Hash, SipHasher}; diff --git a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs b/src/test/ui/run-pass/deriving/deriving-self-lifetime-totalord-totaleq.rs similarity index 98% rename from src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs rename to src/test/ui/run-pass/deriving/deriving-self-lifetime-totalord-totaleq.rs index 3fdf840d5963..64ef03adcaf2 100644 --- a/src/test/run-pass/deriving-self-lifetime-totalord-totaleq.rs +++ b/src/test/ui/run-pass/deriving/deriving-self-lifetime-totalord-totaleq.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::cmp::Ordering::{Less,Equal,Greater}; #[derive(PartialEq, Eq, PartialOrd, Ord)] diff --git a/src/test/run-pass/deriving-show-2.rs b/src/test/ui/run-pass/deriving/deriving-show-2.rs similarity index 99% rename from src/test/run-pass/deriving-show-2.rs rename to src/test/ui/run-pass/deriving/deriving-show-2.rs index 2b7438fd8454..3a1f40239c85 100644 --- a/src/test/run-pass/deriving-show-2.rs +++ b/src/test/ui/run-pass/deriving/deriving-show-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::fmt; #[derive(Debug)] diff --git a/src/test/run-pass/deriving-show.rs b/src/test/ui/run-pass/deriving/deriving-show.rs similarity index 98% rename from src/test/run-pass/deriving-show.rs rename to src/test/ui/run-pass/deriving/deriving-show.rs index e858ba8c823b..f19b014067d6 100644 --- a/src/test/run-pass/deriving-show.rs +++ b/src/test/ui/run-pass/deriving/deriving-show.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] struct Unit; diff --git a/src/test/run-pass/deriving-via-extension-c-enum.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-c-enum.rs similarity index 98% rename from src/test/run-pass/deriving-via-extension-c-enum.rs rename to src/test/ui/run-pass/deriving/deriving-via-extension-c-enum.rs index 92ffd82d9028..445545aaa0f2 100644 --- a/src/test/run-pass/deriving-via-extension-c-enum.rs +++ b/src/test/ui/run-pass/deriving/deriving-via-extension-c-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] enum Foo { Bar, diff --git a/src/test/run-pass/deriving-via-extension-enum.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-enum.rs similarity index 98% rename from src/test/run-pass/deriving-via-extension-enum.rs rename to src/test/ui/run-pass/deriving/deriving-via-extension-enum.rs index f43f5162196a..5b00f11a901b 100644 --- a/src/test/run-pass/deriving-via-extension-enum.rs +++ b/src/test/ui/run-pass/deriving/deriving-via-extension-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] enum Foo { Bar(isize, isize), diff --git a/src/test/run-pass/deriving-via-extension-hash-enum.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-hash-enum.rs similarity index 98% rename from src/test/run-pass/deriving-via-extension-hash-enum.rs rename to src/test/ui/run-pass/deriving/deriving-via-extension-hash-enum.rs index cbe23ea0522b..fe2716396d8b 100644 --- a/src/test/run-pass/deriving-via-extension-hash-enum.rs +++ b/src/test/ui/run-pass/deriving/deriving-via-extension-hash-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Hash)] enum Foo { Bar(isize, char), diff --git a/src/test/run-pass/deriving-via-extension-hash-struct.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-hash-struct.rs similarity index 98% rename from src/test/run-pass/deriving-via-extension-hash-struct.rs rename to src/test/ui/run-pass/deriving/deriving-via-extension-hash-struct.rs index 42f0e4562708..2178673cac81 100644 --- a/src/test/run-pass/deriving-via-extension-hash-struct.rs +++ b/src/test/ui/run-pass/deriving/deriving-via-extension-hash-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[derive(Hash)] diff --git a/src/test/run-pass/deriving-via-extension-struct-empty.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-empty.rs similarity index 97% rename from src/test/run-pass/deriving-via-extension-struct-empty.rs rename to src/test/ui/run-pass/deriving/deriving-via-extension-struct-empty.rs index 9c929940eba2..7753700db18b 100644 --- a/src/test/run-pass/deriving-via-extension-struct-empty.rs +++ b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-empty.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] struct Foo; diff --git a/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-like-enum-variant.rs similarity index 98% rename from src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs rename to src/test/ui/run-pass/deriving/deriving-via-extension-struct-like-enum-variant.rs index 5f9d9b6fb215..67a1472e8838 100644 --- a/src/test/run-pass/deriving-via-extension-struct-like-enum-variant.rs +++ b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-like-enum-variant.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] enum S { X { x: isize, y: isize }, diff --git a/src/test/run-pass/deriving-via-extension-struct-tuple.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-tuple.rs similarity index 98% rename from src/test/run-pass/deriving-via-extension-struct-tuple.rs rename to src/test/ui/run-pass/deriving/deriving-via-extension-struct-tuple.rs index 9dffac00a227..dd9d9b7707e2 100644 --- a/src/test/run-pass/deriving-via-extension-struct-tuple.rs +++ b/src/test/ui/run-pass/deriving/deriving-via-extension-struct-tuple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] struct Foo(isize, isize, String); diff --git a/src/test/run-pass/deriving-via-extension-struct.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-struct.rs similarity index 98% rename from src/test/run-pass/deriving-via-extension-struct.rs rename to src/test/ui/run-pass/deriving/deriving-via-extension-struct.rs index 624fb4a58e1a..69bca7ce36d1 100644 --- a/src/test/run-pass/deriving-via-extension-struct.rs +++ b/src/test/ui/run-pass/deriving/deriving-via-extension-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] struct Foo { x: isize, diff --git a/src/test/run-pass/deriving-via-extension-type-params.rs b/src/test/ui/run-pass/deriving/deriving-via-extension-type-params.rs similarity index 98% rename from src/test/run-pass/deriving-via-extension-type-params.rs rename to src/test/ui/run-pass/deriving/deriving-via-extension-type-params.rs index 4d88dbbca37b..63d2b58804b8 100644 --- a/src/test/run-pass/deriving-via-extension-type-params.rs +++ b/src/test/ui/run-pass/deriving/deriving-via-extension-type-params.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Hash, Debug)] struct Foo { x: isize, diff --git a/src/test/run-pass/deriving-with-repr-packed.rs b/src/test/ui/run-pass/deriving/deriving-with-repr-packed.rs similarity index 98% rename from src/test/run-pass/deriving-with-repr-packed.rs rename to src/test/ui/run-pass/deriving/deriving-with-repr-packed.rs index f5130908c0b2..fd84d6da29e9 100644 --- a/src/test/run-pass/deriving-with-repr-packed.rs +++ b/src/test/ui/run-pass/deriving/deriving-with-repr-packed.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // check that derive on a packed struct does not call field // methods with a misaligned field. diff --git a/src/test/run-pass/auxiliary/dropck_eyepatch_extern_crate.rs b/src/test/ui/run-pass/drop/auxiliary/dropck_eyepatch_extern_crate.rs similarity index 100% rename from src/test/run-pass/auxiliary/dropck_eyepatch_extern_crate.rs rename to src/test/ui/run-pass/drop/auxiliary/dropck_eyepatch_extern_crate.rs diff --git a/src/test/run-pass/drop-on-empty-block-exit.rs b/src/test/ui/run-pass/drop/drop-on-empty-block-exit.rs similarity index 93% rename from src/test/run-pass/drop-on-empty-block-exit.rs rename to src/test/ui/run-pass/drop/drop-on-empty-block-exit.rs index 8dea648508d6..9ddf399ed7a8 100644 --- a/src/test/run-pass/drop-on-empty-block-exit.rs +++ b/src/test/ui/run-pass/drop/drop-on-empty-block-exit.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_camel_case_types)] #![feature(box_syntax)] diff --git a/src/test/run-pass/drop-on-ret.rs b/src/test/ui/run-pass/drop/drop-on-ret.rs similarity index 98% rename from src/test/run-pass/drop-on-ret.rs rename to src/test/ui/run-pass/drop/drop-on-ret.rs index fc517fa592f5..e56119df20ed 100644 --- a/src/test/run-pass/drop-on-ret.rs +++ b/src/test/ui/run-pass/drop/drop-on-ret.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/drop-struct-as-object.rs b/src/test/ui/run-pass/drop/drop-struct-as-object.rs similarity index 95% rename from src/test/run-pass/drop-struct-as-object.rs rename to src/test/ui/run-pass/drop/drop-struct-as-object.rs index 17603e11dddd..97ec423643c1 100644 --- a/src/test/run-pass/drop-struct-as-object.rs +++ b/src/test/ui/run-pass/drop/drop-struct-as-object.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // Test that destructor on a struct runs successfully after the struct // is boxed and converted to an object. diff --git a/src/test/run-pass/drop-trait-enum.rs b/src/test/ui/run-pass/drop/drop-trait-enum.rs similarity index 99% rename from src/test/run-pass/drop-trait-enum.rs rename to src/test/ui/run-pass/drop/drop-trait-enum.rs index a6027615adb5..4d3cf2bd0533 100644 --- a/src/test/run-pass/drop-trait-enum.rs +++ b/src/test/ui/run-pass/drop/drop-trait-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support #![feature(box_syntax)] diff --git a/src/test/run-pass/drop-trait-generic.rs b/src/test/ui/run-pass/drop/drop-trait-generic.rs similarity index 98% rename from src/test/run-pass/drop-trait-generic.rs rename to src/test/ui/run-pass/drop/drop-trait-generic.rs index e55eae1e74fc..c09482a45409 100644 --- a/src/test/run-pass/drop-trait-generic.rs +++ b/src/test/ui/run-pass/drop/drop-trait-generic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S { x: T } diff --git a/src/test/run-pass/drop-trait.rs b/src/test/ui/run-pass/drop/drop-trait.rs similarity index 98% rename from src/test/run-pass/drop-trait.rs rename to src/test/ui/run-pass/drop/drop-trait.rs index 21740eb39306..2e867ac0fc09 100644 --- a/src/test/run-pass/drop-trait.rs +++ b/src/test/ui/run-pass/drop/drop-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo { x: isize } diff --git a/src/test/run-pass/drop-uninhabited-enum.rs b/src/test/ui/run-pass/drop/drop-uninhabited-enum.rs similarity index 98% rename from src/test/run-pass/drop-uninhabited-enum.rs rename to src/test/ui/run-pass/drop/drop-uninhabited-enum.rs index 9fa085b6701d..6fb0abd96439 100644 --- a/src/test/run-pass/drop-uninhabited-enum.rs +++ b/src/test/ui/run-pass/drop/drop-uninhabited-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 enum Foo { } diff --git a/src/test/run-pass/drop-with-type-ascription-1.rs b/src/test/ui/run-pass/drop/drop-with-type-ascription-1.rs similarity index 98% rename from src/test/run-pass/drop-with-type-ascription-1.rs rename to src/test/ui/run-pass/drop/drop-with-type-ascription-1.rs index 15f229dbca5d..2983508363b6 100644 --- a/src/test/run-pass/drop-with-type-ascription-1.rs +++ b/src/test/ui/run-pass/drop/drop-with-type-ascription-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let foo = "hello".to_string(); diff --git a/src/test/run-pass/drop-with-type-ascription-2.rs b/src/test/ui/run-pass/drop/drop-with-type-ascription-2.rs similarity index 98% rename from src/test/run-pass/drop-with-type-ascription-2.rs rename to src/test/ui/run-pass/drop/drop-with-type-ascription-2.rs index 1f486c1834c0..a2ac470ff115 100644 --- a/src/test/run-pass/drop-with-type-ascription-2.rs +++ b/src/test/ui/run-pass/drop/drop-with-type-ascription-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let args = vec!["foobie", "asdf::asdf"]; diff --git a/src/test/run-pass/dropck-eyepatch-extern-crate.rs b/src/test/ui/run-pass/drop/dropck-eyepatch-extern-crate.rs similarity index 99% rename from src/test/run-pass/dropck-eyepatch-extern-crate.rs rename to src/test/ui/run-pass/drop/dropck-eyepatch-extern-crate.rs index 20f069f77ea1..42d54b7be37d 100644 --- a/src/test/run-pass/dropck-eyepatch-extern-crate.rs +++ b/src/test/ui/run-pass/drop/dropck-eyepatch-extern-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:dropck_eyepatch_extern_crate.rs extern crate dropck_eyepatch_extern_crate as other; diff --git a/src/test/run-pass/dropck-eyepatch-reorder.rs b/src/test/ui/run-pass/drop/dropck-eyepatch-reorder.rs similarity index 99% rename from src/test/run-pass/dropck-eyepatch-reorder.rs rename to src/test/ui/run-pass/drop/dropck-eyepatch-reorder.rs index a99a7232e9eb..6696044a02dd 100644 --- a/src/test/run-pass/dropck-eyepatch-reorder.rs +++ b/src/test/ui/run-pass/drop/dropck-eyepatch-reorder.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(dropck_eyepatch)] // The point of this test is to test uses of `#[may_dangle]` attribute diff --git a/src/test/run-pass/dropck-eyepatch.rs b/src/test/ui/run-pass/drop/dropck-eyepatch.rs similarity index 99% rename from src/test/run-pass/dropck-eyepatch.rs rename to src/test/ui/run-pass/drop/dropck-eyepatch.rs index c0c091d78eb1..fb9af09a7ce9 100644 --- a/src/test/run-pass/dropck-eyepatch.rs +++ b/src/test/ui/run-pass/drop/dropck-eyepatch.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(dropck_eyepatch)] // The point of this test is to illustrate that the `#[may_dangle]` diff --git a/src/test/run-pass/dropck_legal_cycles.rs b/src/test/ui/run-pass/drop/dropck_legal_cycles.rs similarity index 99% rename from src/test/run-pass/dropck_legal_cycles.rs rename to src/test/ui/run-pass/drop/dropck_legal_cycles.rs index 5f915a762d14..2c88cfd5c8f9 100644 --- a/src/test/run-pass/dropck_legal_cycles.rs +++ b/src/test/ui/run-pass/drop/dropck_legal_cycles.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test exercises cases where cyclic structure is legal, // including when the cycles go through data-structures such // as `Vec` or `TypedArena`. diff --git a/src/test/run-pass/dynamic-drop.rs b/src/test/ui/run-pass/drop/dynamic-drop.rs similarity index 99% rename from src/test/run-pass/dynamic-drop.rs rename to src/test/ui/run-pass/drop/dynamic-drop.rs index 765fb06e5f3a..de10c9f2403c 100644 --- a/src/test/run-pass/dynamic-drop.rs +++ b/src/test/ui/run-pass/drop/dynamic-drop.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // revisions:lexical nll #![cfg_attr(nll, feature(nll))] diff --git a/src/test/run-pass/no-drop-flag-size.rs b/src/test/ui/run-pass/drop/no-drop-flag-size.rs similarity index 98% rename from src/test/run-pass/no-drop-flag-size.rs rename to src/test/ui/run-pass/drop/no-drop-flag-size.rs index a606a8a9f4b3..abaaf7d701ea 100644 --- a/src/test/run-pass/no-drop-flag-size.rs +++ b/src/test/ui/run-pass/drop/no-drop-flag-size.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem::size_of; struct Test { diff --git a/src/test/run-pass/nondrop-cycle.rs b/src/test/ui/run-pass/drop/nondrop-cycle.rs similarity index 98% rename from src/test/run-pass/nondrop-cycle.rs rename to src/test/ui/run-pass/drop/nondrop-cycle.rs index a28f2b15b928..7e2bb38f5bd5 100644 --- a/src/test/run-pass/nondrop-cycle.rs +++ b/src/test/ui/run-pass/drop/nondrop-cycle.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::cell::Cell; diff --git a/src/test/run-pass/dst-coerce-custom.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-coerce-custom.rs similarity index 99% rename from src/test/run-pass/dst-coerce-custom.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-coerce-custom.rs index 6eb01e879df5..affc569c63d5 100644 --- a/src/test/run-pass/dst-coerce-custom.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-coerce-custom.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test a very simple custom DST coercion. #![feature(unsize, coerce_unsized)] diff --git a/src/test/run-pass/dst-coerce-rc.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-coerce-rc.rs similarity index 97% rename from src/test/run-pass/dst-coerce-rc.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-coerce-rc.rs index 039f4d8fd510..fb7b2bc8bf7f 100644 --- a/src/test/run-pass/dst-coerce-rc.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-coerce-rc.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] // Test a very simple custom DST coercion. #![feature(core, rc_weak)] diff --git a/src/test/run-pass/dst-coercions.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-coercions.rs similarity index 98% rename from src/test/run-pass/dst-coercions.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-coercions.rs index 6b5bd6ad35e7..21170403d43c 100644 --- a/src/test/run-pass/dst-coercions.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-coercions.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test coercions involving DST and/or raw pointers // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/dst-deref-mut.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-deref-mut.rs similarity index 98% rename from src/test/run-pass/dst-deref-mut.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-deref-mut.rs index 9fb4635765ca..a2c0a8c9beb5 100644 --- a/src/test/run-pass/dst-deref-mut.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-deref-mut.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that a custom deref with a fat pointer return type does not ICE diff --git a/src/test/run-pass/dst-deref.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-deref.rs similarity index 98% rename from src/test/run-pass/dst-deref.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-deref.rs index 4a143873e6e1..db9ef399f0e8 100644 --- a/src/test/run-pass/dst-deref.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-deref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that a custom deref with a fat pointer return type does not ICE diff --git a/src/test/run-pass/dst-field-align.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-field-align.rs similarity index 99% rename from src/test/run-pass/dst-field-align.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-field-align.rs index c36833f2fb62..1537050593c4 100644 --- a/src/test/run-pass/dst-field-align.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-field-align.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo { a: u16, b: T diff --git a/src/test/run-pass/dst-index.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-index.rs similarity index 98% rename from src/test/run-pass/dst-index.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-index.rs index 6bda400a7cdb..56323816b4c3 100644 --- a/src/test/run-pass/dst-index.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-index.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that overloaded index expressions with DST result types // work and don't ICE. diff --git a/src/test/run-pass/dst-irrefutable-bind.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-irrefutable-bind.rs similarity index 98% rename from src/test/run-pass/dst-irrefutable-bind.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-irrefutable-bind.rs index b1d6c732e7fb..031aa7c04e67 100644 --- a/src/test/run-pass/dst-irrefutable-bind.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-irrefutable-bind.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(unsized_tuple_coercion)] struct Test(T); diff --git a/src/test/run-pass/dst-raw.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-raw.rs similarity index 99% rename from src/test/run-pass/dst-raw.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-raw.rs index 9ebfbee8a330..96b19b9e4d9d 100644 --- a/src/test/run-pass/dst-raw.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-raw.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test DST raw pointers diff --git a/src/test/run-pass/dst-struct-sole.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-struct-sole.rs similarity index 99% rename from src/test/run-pass/dst-struct-sole.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-struct-sole.rs index 58d7b35a5275..9959b5bf5bb2 100644 --- a/src/test/run-pass/dst-struct-sole.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-struct-sole.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // As dst-struct.rs, but the unsized field is the only field in the struct. diff --git a/src/test/run-pass/dst-struct.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-struct.rs similarity index 99% rename from src/test/run-pass/dst-struct.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-struct.rs index 40ca84727872..1853c6a04d8b 100644 --- a/src/test/run-pass/dst-struct.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct Fat { diff --git a/src/test/run-pass/dst-trait-tuple.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-trait-tuple.rs similarity index 98% rename from src/test/run-pass/dst-trait-tuple.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-trait-tuple.rs index 9803e26f5f85..4083f0e2b09b 100644 --- a/src/test/run-pass/dst-trait-tuple.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-trait-tuple.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(type_alias_bounds)] #![allow(unused_features)] #![feature(box_syntax)] diff --git a/src/test/run-pass/dst-trait.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-trait.rs similarity index 99% rename from src/test/run-pass/dst-trait.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-trait.rs index a412306b9664..3ce2cffbe094 100644 --- a/src/test/run-pass/dst-trait.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct Fat { diff --git a/src/test/run-pass/dst-tuple-sole.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-tuple-sole.rs similarity index 96% rename from src/test/run-pass/dst-tuple-sole.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-tuple-sole.rs index a788e25218eb..43a1bacec31c 100644 --- a/src/test/run-pass/dst-tuple-sole.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-tuple-sole.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] +#![allow(type_alias_bounds)] + // As dst-tuple.rs, but the unsized field is the only field in the tuple. diff --git a/src/test/run-pass/dst-tuple.rs b/src/test/ui/run-pass/dynamically-sized-types/dst-tuple.rs similarity index 98% rename from src/test/run-pass/dst-tuple.rs rename to src/test/ui/run-pass/dynamically-sized-types/dst-tuple.rs index 7c2125d00f9b..753203d250d9 100644 --- a/src/test/run-pass/dst-tuple.rs +++ b/src/test/ui/run-pass/dynamically-sized-types/dst-tuple.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(type_alias_bounds)] #![feature(box_syntax)] #![feature(unsized_tuple_coercion)] diff --git a/src/test/run-pass/auxiliary/extern-crosscrate-source.rs b/src/test/ui/run-pass/extern/auxiliary/extern-crosscrate-source.rs similarity index 100% rename from src/test/run-pass/auxiliary/extern-crosscrate-source.rs rename to src/test/ui/run-pass/extern/auxiliary/extern-crosscrate-source.rs diff --git a/src/test/run-pass/auxiliary/extern-take-value.rs b/src/test/ui/run-pass/extern/auxiliary/extern-take-value.rs similarity index 100% rename from src/test/run-pass/auxiliary/extern-take-value.rs rename to src/test/ui/run-pass/extern/auxiliary/extern-take-value.rs diff --git a/src/test/run-pass/auxiliary/extern_calling_convention.rs b/src/test/ui/run-pass/extern/auxiliary/extern_calling_convention.rs similarity index 100% rename from src/test/run-pass/auxiliary/extern_calling_convention.rs rename to src/test/ui/run-pass/extern/auxiliary/extern_calling_convention.rs diff --git a/src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs b/src/test/ui/run-pass/extern/auxiliary/extern_mod_ordering_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/extern_mod_ordering_lib.rs rename to src/test/ui/run-pass/extern/auxiliary/extern_mod_ordering_lib.rs diff --git a/src/test/run-pass/auxiliary/fat_drop.rs b/src/test/ui/run-pass/extern/auxiliary/fat_drop.rs similarity index 100% rename from src/test/run-pass/auxiliary/fat_drop.rs rename to src/test/ui/run-pass/extern/auxiliary/fat_drop.rs diff --git a/src/test/run-pass/extern-1.rs b/src/test/ui/run-pass/extern/extern-1.rs similarity index 97% rename from src/test/run-pass/extern-1.rs rename to src/test/ui/run-pass/extern/extern-1.rs index 67f6a3e8fc48..c3168aaf869b 100644 --- a/src/test/run-pass/extern-1.rs +++ b/src/test/ui/run-pass/extern/extern-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 extern fn f() { diff --git a/src/test/run-pass/extern-call-deep.rs b/src/test/ui/run-pass/extern/extern-call-deep.rs similarity index 99% rename from src/test/run-pass/extern-call-deep.rs rename to src/test/ui/run-pass/extern/extern-call-deep.rs index a41ab8da9de1..6e8d94becbd9 100644 --- a/src/test/run-pass/extern-call-deep.rs +++ b/src/test/ui/run-pass/extern/extern-call-deep.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc to test ffi with #![feature(libc)] diff --git a/src/test/run-pass/extern-call-deep2.rs b/src/test/ui/run-pass/extern/extern-call-deep2.rs similarity index 99% rename from src/test/run-pass/extern-call-deep2.rs rename to src/test/ui/run-pass/extern/extern-call-deep2.rs index 3bdc8c18864f..e11e73a2b0fa 100644 --- a/src/test/run-pass/extern-call-deep2.rs +++ b/src/test/ui/run-pass/extern/extern-call-deep2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support #![feature(libc)] diff --git a/src/test/run-pass/extern-call-direct.rs b/src/test/ui/run-pass/extern/extern-call-direct.rs similarity index 98% rename from src/test/run-pass/extern-call-direct.rs rename to src/test/ui/run-pass/extern/extern-call-direct.rs index ec6b6c8d39fa..55300a44c1b2 100644 --- a/src/test/run-pass/extern-call-direct.rs +++ b/src/test/ui/run-pass/extern/extern-call-direct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test direct calls to extern fns. diff --git a/src/test/run-pass/extern-call-indirect.rs b/src/test/ui/run-pass/extern/extern-call-indirect.rs similarity index 99% rename from src/test/run-pass/extern-call-indirect.rs rename to src/test/ui/run-pass/extern/extern-call-indirect.rs index ba108955c28d..1badb10364eb 100644 --- a/src/test/run-pass/extern-call-indirect.rs +++ b/src/test/ui/run-pass/extern/extern-call-indirect.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc to test ffi with #![feature(libc)] diff --git a/src/test/run-pass/extern-call-scrub.rs b/src/test/ui/run-pass/extern/extern-call-scrub.rs similarity index 99% rename from src/test/run-pass/extern-call-scrub.rs rename to src/test/ui/run-pass/extern/extern-call-scrub.rs index a29ea377947c..1e564e668713 100644 --- a/src/test/run-pass/extern-call-scrub.rs +++ b/src/test/ui/run-pass/extern/extern-call-scrub.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This time we're testing repeatedly going up and down both stacks to // make sure the stack pointers are maintained properly in both // directions diff --git a/src/test/run-pass/extern-calling-convention-test.rs b/src/test/ui/run-pass/extern/extern-calling-convention-test.rs similarity index 98% rename from src/test/run-pass/extern-calling-convention-test.rs rename to src/test/ui/run-pass/extern/extern-calling-convention-test.rs index 12f9c22c9182..ed1657db759d 100644 --- a/src/test/run-pass/extern-calling-convention-test.rs +++ b/src/test/ui/run-pass/extern/extern-calling-convention-test.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:extern_calling_convention.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/extern-compare-with-return-type.rs b/src/test/ui/run-pass/extern/extern-compare-with-return-type.rs similarity index 96% rename from src/test/run-pass/extern-compare-with-return-type.rs rename to src/test/ui/run-pass/extern/extern-compare-with-return-type.rs index 6535ae2fca94..451b87f575ac 100644 --- a/src/test/run-pass/extern-compare-with-return-type.rs +++ b/src/test/ui/run-pass/extern/extern-compare-with-return-type.rs @@ -8,8 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that we can compare various kinds of extern fn signatures. - +#![allow(non_camel_case_types)] extern fn voidret1() {} extern fn voidret2() {} diff --git a/src/test/run-pass/extern-crosscrate.rs b/src/test/ui/run-pass/extern/extern-crosscrate.rs similarity index 98% rename from src/test/run-pass/extern-crosscrate.rs rename to src/test/ui/run-pass/extern/extern-crosscrate.rs index 825b502d9548..c6fccbe003c5 100644 --- a/src/test/run-pass/extern-crosscrate.rs +++ b/src/test/ui/run-pass/extern/extern-crosscrate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:extern-crosscrate-source.rs // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/extern-foreign-crate.rs b/src/test/ui/run-pass/extern/extern-foreign-crate.rs similarity index 97% rename from src/test/run-pass/extern-foreign-crate.rs rename to src/test/ui/run-pass/extern/extern-foreign-crate.rs index 1757ff51fed3..615b07619c21 100644 --- a/src/test/run-pass/extern-foreign-crate.rs +++ b/src/test/ui/run-pass/extern/extern-foreign-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 extern crate std as mystd; diff --git a/src/test/run-pass/extern-methods.rs b/src/test/ui/run-pass/extern/extern-methods.rs similarity index 98% rename from src/test/run-pass/extern-methods.rs rename to src/test/ui/run-pass/extern/extern-methods.rs index 2587a9786367..872391612ad2 100644 --- a/src/test/run-pass/extern-methods.rs +++ b/src/test/ui/run-pass/extern/extern-methods.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-arm // ignore-aarch64 diff --git a/src/test/run-pass/extern-mod-abi.rs b/src/test/ui/run-pass/extern/extern-mod-abi.rs similarity index 97% rename from src/test/run-pass/extern-mod-abi.rs rename to src/test/ui/run-pass/extern/extern-mod-abi.rs index 74f47f08703a..fcff3ed251eb 100644 --- a/src/test/run-pass/extern-mod-abi.rs +++ b/src/test/ui/run-pass/extern/extern-mod-abi.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 extern "C" { diff --git a/src/test/run-pass/extern-mod-ordering-exe.rs b/src/test/ui/run-pass/extern/extern-mod-ordering-exe.rs similarity index 98% rename from src/test/run-pass/extern-mod-ordering-exe.rs rename to src/test/ui/run-pass/extern/extern-mod-ordering-exe.rs index 1c64716b822b..42b8791f9210 100644 --- a/src/test/run-pass/extern-mod-ordering-exe.rs +++ b/src/test/ui/run-pass/extern/extern-mod-ordering-exe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:extern_mod_ordering_lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/extern-pass-TwoU16s.rs b/src/test/ui/run-pass/extern/extern-pass-TwoU16s.rs similarity index 96% rename from src/test/run-pass/extern-pass-TwoU16s.rs rename to src/test/ui/run-pass/extern/extern-pass-TwoU16s.rs index a1aa9b69fada..042c27d0902a 100644 --- a/src/test/run-pass/extern-pass-TwoU16s.rs +++ b/src/test/ui/run-pass/extern/extern-pass-TwoU16s.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // ignore-wasm32-bare no libc for ffi testing // Test a foreign function that accepts and returns a struct diff --git a/src/test/run-pass/extern-pass-TwoU32s.rs b/src/test/ui/run-pass/extern/extern-pass-TwoU32s.rs similarity index 96% rename from src/test/run-pass/extern-pass-TwoU32s.rs rename to src/test/ui/run-pass/extern/extern-pass-TwoU32s.rs index 6442f230d302..de1819a1fbd5 100644 --- a/src/test/run-pass/extern-pass-TwoU32s.rs +++ b/src/test/ui/run-pass/extern/extern-pass-TwoU32s.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // ignore-wasm32-bare no libc for ffi testing // Test a foreign function that accepts and returns a struct diff --git a/src/test/run-pass/extern-pass-TwoU64s.rs b/src/test/ui/run-pass/extern/extern-pass-TwoU64s.rs similarity index 96% rename from src/test/run-pass/extern-pass-TwoU64s.rs rename to src/test/ui/run-pass/extern/extern-pass-TwoU64s.rs index bfb649c3f74e..5e4b3823b145 100644 --- a/src/test/run-pass/extern-pass-TwoU64s.rs +++ b/src/test/ui/run-pass/extern/extern-pass-TwoU64s.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // ignore-wasm32-bare no libc for ffi testing // Test a foreign function that accepts and returns a struct diff --git a/src/test/run-pass/extern-pass-TwoU8s.rs b/src/test/ui/run-pass/extern/extern-pass-TwoU8s.rs similarity index 96% rename from src/test/run-pass/extern-pass-TwoU8s.rs rename to src/test/ui/run-pass/extern/extern-pass-TwoU8s.rs index 1f90d9c43667..affcf62af700 100644 --- a/src/test/run-pass/extern-pass-TwoU8s.rs +++ b/src/test/ui/run-pass/extern/extern-pass-TwoU8s.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // ignore-wasm32-bare no libc for ffi testing // Test a foreign function that accepts and returns a struct diff --git a/src/test/run-pass/extern-pass-char.rs b/src/test/ui/run-pass/extern/extern-pass-char.rs similarity index 98% rename from src/test/run-pass/extern-pass-char.rs rename to src/test/ui/run-pass/extern/extern-pass-char.rs index 920e15bf2c11..95999b8d983e 100644 --- a/src/test/run-pass/extern-pass-char.rs +++ b/src/test/ui/run-pass/extern/extern-pass-char.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc for ffi testing // Test a function that takes/returns a u8. diff --git a/src/test/run-pass/extern-pass-double.rs b/src/test/ui/run-pass/extern/extern-pass-double.rs similarity index 98% rename from src/test/run-pass/extern-pass-double.rs rename to src/test/ui/run-pass/extern/extern-pass-double.rs index 9c184477ad34..ce94790c6d35 100644 --- a/src/test/run-pass/extern-pass-double.rs +++ b/src/test/ui/run-pass/extern/extern-pass-double.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc for ffi testing #[link(name = "rust_test_helpers", kind = "static")] diff --git a/src/test/run-pass/extern-pass-empty.rs b/src/test/ui/run-pass/extern/extern-pass-empty.rs similarity index 94% rename from src/test/run-pass/extern-pass-empty.rs rename to src/test/ui/run-pass/extern/extern-pass-empty.rs index f4ee3b6e9e80..ff2e4e61a745 100644 --- a/src/test/run-pass/extern-pass-empty.rs +++ b/src/test/ui/run-pass/extern/extern-pass-empty.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] // FIXME: this test is inherently not FFI-safe. + // Test a foreign function that accepts empty struct. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/extern-pass-u32.rs b/src/test/ui/run-pass/extern/extern-pass-u32.rs similarity index 98% rename from src/test/run-pass/extern-pass-u32.rs rename to src/test/ui/run-pass/extern/extern-pass-u32.rs index 691bd6295b14..9500ad391c7e 100644 --- a/src/test/run-pass/extern-pass-u32.rs +++ b/src/test/ui/run-pass/extern/extern-pass-u32.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc for ffi testing // Test a function that takes/returns a u32. diff --git a/src/test/run-pass/extern-pass-u64.rs b/src/test/ui/run-pass/extern/extern-pass-u64.rs similarity index 98% rename from src/test/run-pass/extern-pass-u64.rs rename to src/test/ui/run-pass/extern/extern-pass-u64.rs index 4b351ed2836c..bc4cf7670878 100644 --- a/src/test/run-pass/extern-pass-u64.rs +++ b/src/test/ui/run-pass/extern/extern-pass-u64.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc for ffi testing // Test a call to a function that takes/returns a u64. diff --git a/src/test/run-pass/extern-prelude-core.rs b/src/test/ui/run-pass/extern/extern-prelude-core.rs similarity index 98% rename from src/test/run-pass/extern-prelude-core.rs rename to src/test/ui/run-pass/extern/extern-prelude-core.rs index d0d01b34c6e9..67579fd9911b 100644 --- a/src/test/run-pass/extern-prelude-core.rs +++ b/src/test/ui/run-pass/extern/extern-prelude-core.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(extern_prelude, lang_items, start, alloc)] #![no_std] diff --git a/src/test/run-pass/extern-prelude-no-speculative.rs b/src/test/ui/run-pass/extern/extern-prelude-no-speculative.rs similarity index 98% rename from src/test/run-pass/extern-prelude-no-speculative.rs rename to src/test/ui/run-pass/extern/extern-prelude-no-speculative.rs index ff3aec439aae..8d4219ccf44e 100644 --- a/src/test/run-pass/extern-prelude-no-speculative.rs +++ b/src/test/ui/run-pass/extern/extern-prelude-no-speculative.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: --extern LooksLikeExternCrate=/path/to/nowhere mod m { diff --git a/src/test/run-pass/extern-prelude-std.rs b/src/test/ui/run-pass/extern/extern-prelude-std.rs similarity index 98% rename from src/test/run-pass/extern-prelude-std.rs rename to src/test/ui/run-pass/extern/extern-prelude-std.rs index de73f1d22783..226635dcb7c7 100644 --- a/src/test/run-pass/extern-prelude-std.rs +++ b/src/test/ui/run-pass/extern/extern-prelude-std.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(extern_prelude)] mod foo { diff --git a/src/test/run-pass/extern-pub.rs b/src/test/ui/run-pass/extern/extern-pub.rs similarity index 97% rename from src/test/run-pass/extern-pub.rs rename to src/test/ui/run-pass/extern/extern-pub.rs index 29bcdef5dc9e..dfe017d4c339 100644 --- a/src/test/run-pass/extern-pub.rs +++ b/src/test/ui/run-pass/extern/extern-pub.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 extern { diff --git a/src/test/run-pass/extern-return-TwoU16s.rs b/src/test/ui/run-pass/extern/extern-return-TwoU16s.rs similarity index 95% rename from src/test/run-pass/extern-return-TwoU16s.rs rename to src/test/ui/run-pass/extern/extern-return-TwoU16s.rs index b9ce3f458868..826b5083676e 100644 --- a/src/test/run-pass/extern-return-TwoU16s.rs +++ b/src/test/ui/run-pass/extern/extern-return-TwoU16s.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // ignore-wasm32-bare no libc to test ffi with pub struct TwoU16s { diff --git a/src/test/run-pass/extern-return-TwoU32s.rs b/src/test/ui/run-pass/extern/extern-return-TwoU32s.rs similarity index 95% rename from src/test/run-pass/extern-return-TwoU32s.rs rename to src/test/ui/run-pass/extern/extern-return-TwoU32s.rs index 686ff16fe4d6..15584f28d07a 100644 --- a/src/test/run-pass/extern-return-TwoU32s.rs +++ b/src/test/ui/run-pass/extern/extern-return-TwoU32s.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // ignore-wasm32-bare no libc to test ffi with pub struct TwoU32s { diff --git a/src/test/run-pass/extern-return-TwoU64s.rs b/src/test/ui/run-pass/extern/extern-return-TwoU64s.rs similarity index 95% rename from src/test/run-pass/extern-return-TwoU64s.rs rename to src/test/ui/run-pass/extern/extern-return-TwoU64s.rs index e754674fd1eb..94378522a1b5 100644 --- a/src/test/run-pass/extern-return-TwoU64s.rs +++ b/src/test/ui/run-pass/extern/extern-return-TwoU64s.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // ignore-wasm32-bare no libc to test ffi with pub struct TwoU64s { diff --git a/src/test/run-pass/extern-return-TwoU8s.rs b/src/test/ui/run-pass/extern/extern-return-TwoU8s.rs similarity index 95% rename from src/test/run-pass/extern-return-TwoU8s.rs rename to src/test/ui/run-pass/extern/extern-return-TwoU8s.rs index 68fe3832e90a..a66098c97747 100644 --- a/src/test/run-pass/extern-return-TwoU8s.rs +++ b/src/test/ui/run-pass/extern/extern-return-TwoU8s.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // ignore-wasm32-bare no libc to test ffi with pub struct TwoU8s { diff --git a/src/test/run-pass/extern-rust.rs b/src/test/ui/run-pass/extern/extern-rust.rs similarity index 98% rename from src/test/run-pass/extern-rust.rs rename to src/test/ui/run-pass/extern/extern-rust.rs index e7f707bc334d..8446d9c40c2b 100644 --- a/src/test/run-pass/extern-rust.rs +++ b/src/test/ui/run-pass/extern/extern-rust.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[repr(C)] diff --git a/src/test/run-pass/extern-take-value.rs b/src/test/ui/run-pass/extern/extern-take-value.rs similarity index 98% rename from src/test/run-pass/extern-take-value.rs rename to src/test/ui/run-pass/extern/extern-take-value.rs index f535e45e6cf6..398a968ac185 100644 --- a/src/test/run-pass/extern-take-value.rs +++ b/src/test/ui/run-pass/extern/extern-take-value.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:extern-take-value.rs extern crate extern_take_value; diff --git a/src/test/run-pass/extern-thiscall.rs b/src/test/ui/run-pass/extern/extern-thiscall.rs similarity index 98% rename from src/test/run-pass/extern-thiscall.rs rename to src/test/ui/run-pass/extern/extern-thiscall.rs index a669f29d098a..66aa261fecb4 100644 --- a/src/test/run-pass/extern-thiscall.rs +++ b/src/test/ui/run-pass/extern/extern-thiscall.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-arm // ignore-aarch64 diff --git a/src/test/run-pass/extern-types-inherent-impl.rs b/src/test/ui/run-pass/extern/extern-types-inherent-impl.rs similarity index 98% rename from src/test/run-pass/extern-types-inherent-impl.rs rename to src/test/ui/run-pass/extern/extern-types-inherent-impl.rs index 4e44af369006..efe55442e0b9 100644 --- a/src/test/run-pass/extern-types-inherent-impl.rs +++ b/src/test/ui/run-pass/extern/extern-types-inherent-impl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that inherent impls can be defined for extern types. #![feature(extern_types)] diff --git a/src/test/run-pass/extern-types-manual-sync-send.rs b/src/test/ui/run-pass/extern/extern-types-manual-sync-send.rs similarity index 98% rename from src/test/run-pass/extern-types-manual-sync-send.rs rename to src/test/ui/run-pass/extern/extern-types-manual-sync-send.rs index c6530c3ea773..707516bd0de5 100644 --- a/src/test/run-pass/extern-types-manual-sync-send.rs +++ b/src/test/ui/run-pass/extern/extern-types-manual-sync-send.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that unsafe impl for Sync/Send can be provided for extern types. #![feature(extern_types)] diff --git a/src/test/run-pass/extern-types-pointer-cast.rs b/src/test/ui/run-pass/extern/extern-types-pointer-cast.rs similarity index 98% rename from src/test/run-pass/extern-types-pointer-cast.rs rename to src/test/ui/run-pass/extern/extern-types-pointer-cast.rs index 0dede8eb70de..7905c7ba0028 100644 --- a/src/test/run-pass/extern-types-pointer-cast.rs +++ b/src/test/ui/run-pass/extern/extern-types-pointer-cast.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that pointers to extern types can be cast from/to usize, // despite being !Sized. diff --git a/src/test/run-pass/extern-types-size_of_val.rs b/src/test/ui/run-pass/extern/extern-types-size_of_val.rs similarity index 98% rename from src/test/run-pass/extern-types-size_of_val.rs rename to src/test/ui/run-pass/extern/extern-types-size_of_val.rs index 0aabce99debe..3f9e603f72ef 100644 --- a/src/test/run-pass/extern-types-size_of_val.rs +++ b/src/test/ui/run-pass/extern/extern-types-size_of_val.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(extern_types)] use std::mem::{size_of_val, align_of_val}; diff --git a/src/test/run-pass/extern-types-thin-pointer.rs b/src/test/ui/run-pass/extern/extern-types-thin-pointer.rs similarity index 99% rename from src/test/run-pass/extern-types-thin-pointer.rs rename to src/test/ui/run-pass/extern/extern-types-thin-pointer.rs index c2444a58b5a1..08fbadf3d2bd 100644 --- a/src/test/run-pass/extern-types-thin-pointer.rs +++ b/src/test/ui/run-pass/extern/extern-types-thin-pointer.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that pointers and references to extern types are thin, ie they have the same size and // alignment as a pointer to (). diff --git a/src/test/run-pass/extern-types-trait-impl.rs b/src/test/ui/run-pass/extern/extern-types-trait-impl.rs similarity index 98% rename from src/test/run-pass/extern-types-trait-impl.rs rename to src/test/ui/run-pass/extern/extern-types-trait-impl.rs index 0f61c936deb6..b8eb4b6a98b3 100644 --- a/src/test/run-pass/extern-types-trait-impl.rs +++ b/src/test/ui/run-pass/extern/extern-types-trait-impl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that traits can be implemented for extern types. #![feature(extern_types)] diff --git a/src/test/run-pass/extern-vectorcall.rs b/src/test/ui/run-pass/extern/extern-vectorcall.rs similarity index 98% rename from src/test/run-pass/extern-vectorcall.rs rename to src/test/ui/run-pass/extern/extern-vectorcall.rs index 90c3459036b6..00f453c7166d 100644 --- a/src/test/run-pass/extern-vectorcall.rs +++ b/src/test/ui/run-pass/extern/extern-vectorcall.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-arm // ignore-aarch64 diff --git a/src/test/run-pass/extern_fat_drop.rs b/src/test/ui/run-pass/extern/extern_fat_drop.rs similarity index 98% rename from src/test/run-pass/extern_fat_drop.rs rename to src/test/ui/run-pass/extern/extern_fat_drop.rs index 123458ff97e1..0373abcda721 100644 --- a/src/test/run-pass/extern_fat_drop.rs +++ b/src/test/ui/run-pass/extern/extern_fat_drop.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:fat_drop.rs extern crate fat_drop; diff --git a/src/test/run-pass/auto-loop.rs b/src/test/ui/run-pass/for-loop-while/auto-loop.rs similarity index 98% rename from src/test/run-pass/auto-loop.rs rename to src/test/ui/run-pass/for-loop-while/auto-loop.rs index b0afae79c369..0bc046cbcb74 100644 --- a/src/test/run-pass/auto-loop.rs +++ b/src/test/ui/run-pass/for-loop-while/auto-loop.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut sum = 0; diff --git a/src/test/run-pass/break-value.rs b/src/test/ui/run-pass/for-loop-while/break-value.rs similarity index 97% rename from src/test/run-pass/break-value.rs rename to src/test/ui/run-pass/for-loop-while/break-value.rs index e5a035fb562b..c77e9a209dd6 100644 --- a/src/test/run-pass/break-value.rs +++ b/src/test/ui/run-pass/for-loop-while/break-value.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn int_id(x: isize) -> isize { return x; } diff --git a/src/test/run-pass/break.rs b/src/test/ui/run-pass/for-loop-while/break.rs similarity index 98% rename from src/test/run-pass/break.rs rename to src/test/ui/run-pass/for-loop-while/break.rs index 9a32fbc10314..cffec6601046 100644 --- a/src/test/run-pass/break.rs +++ b/src/test/ui/run-pass/for-loop-while/break.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut i = 0; diff --git a/src/test/run-pass/for-destruct.rs b/src/test/ui/run-pass/for-loop-while/for-destruct.rs similarity index 98% rename from src/test/run-pass/for-destruct.rs rename to src/test/ui/run-pass/for-loop-while/for-destruct.rs index ba78ff4d5393..97fa90530b63 100644 --- a/src/test/run-pass/for-destruct.rs +++ b/src/test/ui/run-pass/for-loop-while/for-destruct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Pair { x: isize, y: isize } diff --git a/src/test/run-pass/for-loop-goofiness.rs b/src/test/ui/run-pass/for-loop-while/for-loop-goofiness.rs similarity index 98% rename from src/test/run-pass/for-loop-goofiness.rs rename to src/test/ui/run-pass/for-loop-while/for-loop-goofiness.rs index 411183e4f74a..ade51c4abbc2 100644 --- a/src/test/run-pass/for-loop-goofiness.rs +++ b/src/test/ui/run-pass/for-loop-while/for-loop-goofiness.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum BogusOption { None, diff --git a/src/test/run-pass/for-loop-has-unit-body.rs b/src/test/ui/run-pass/for-loop-while/for-loop-has-unit-body.rs similarity index 98% rename from src/test/run-pass/for-loop-has-unit-body.rs rename to src/test/ui/run-pass/for-loop-while/for-loop-has-unit-body.rs index 4036fc848006..a94894a47981 100644 --- a/src/test/run-pass/for-loop-has-unit-body.rs +++ b/src/test/ui/run-pass/for-loop-while/for-loop-has-unit-body.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { // Check that the tail statement in the body unifies with something for _ in 0..3 { diff --git a/src/test/run-pass/for-loop-into-iterator.rs b/src/test/ui/run-pass/for-loop-while/for-loop-into-iterator.rs similarity index 98% rename from src/test/run-pass/for-loop-into-iterator.rs rename to src/test/ui/run-pass/for-loop-while/for-loop-into-iterator.rs index 7efd15f222e3..ef116b9f3d72 100644 --- a/src/test/run-pass/for-loop-into-iterator.rs +++ b/src/test/ui/run-pass/for-loop-while/for-loop-into-iterator.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that for loops can do what RFC #235 claims diff --git a/src/test/run-pass/for-loop-lifetime-of-unbound-values.rs b/src/test/ui/run-pass/for-loop-while/for-loop-lifetime-of-unbound-values.rs similarity index 99% rename from src/test/run-pass/for-loop-lifetime-of-unbound-values.rs rename to src/test/ui/run-pass/for-loop-while/for-loop-lifetime-of-unbound-values.rs index 7a088b513347..fb12a449a7af 100644 --- a/src/test/run-pass/for-loop-lifetime-of-unbound-values.rs +++ b/src/test/ui/run-pass/for-loop-while/for-loop-lifetime-of-unbound-values.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test when destructors run in a for loop. The intention is // that the value for each iteration is dropped *after* the loop // body has executed. This is true even when the value is assigned diff --git a/src/test/run-pass/for-loop-macro.rs b/src/test/ui/run-pass/for-loop-while/for-loop-macro.rs similarity index 98% rename from src/test/run-pass/for-loop-macro.rs rename to src/test/ui/run-pass/for-loop-while/for-loop-macro.rs index 17c5a98246b1..ac29efbb7c8a 100644 --- a/src/test/run-pass/for-loop-macro.rs +++ b/src/test/ui/run-pass/for-loop-while/for-loop-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! var { ( $name:ident ) => ( $name ); } diff --git a/src/test/run-pass/for-loop-mut-ref-element.rs b/src/test/ui/run-pass/for-loop-while/for-loop-mut-ref-element.rs similarity index 98% rename from src/test/run-pass/for-loop-mut-ref-element.rs rename to src/test/ui/run-pass/for-loop-while/for-loop-mut-ref-element.rs index 556c846b0b8e..e80f244bd262 100644 --- a/src/test/run-pass/for-loop-mut-ref-element.rs +++ b/src/test/ui/run-pass/for-loop-while/for-loop-mut-ref-element.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that for loops can bind elements as mutable references fn main() { diff --git a/src/test/run-pass/for-loop-no-std.rs b/src/test/ui/run-pass/for-loop-while/for-loop-no-std.rs similarity index 98% rename from src/test/run-pass/for-loop-no-std.rs rename to src/test/ui/run-pass/for-loop-while/for-loop-no-std.rs index 856857156c94..dc03a500f8c4 100644 --- a/src/test/run-pass/for-loop-no-std.rs +++ b/src/test/ui/run-pass/for-loop-while/for-loop-no-std.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(lang_items, start, alloc)] #![no_std] diff --git a/src/test/run-pass/for-loop-panic.rs b/src/test/ui/run-pass/for-loop-while/for-loop-panic.rs similarity index 97% rename from src/test/run-pass/for-loop-panic.rs rename to src/test/ui/run-pass/for-loop-while/for-loop-panic.rs index 001ca1a02f63..18c52237c2e1 100644 --- a/src/test/run-pass/for-loop-panic.rs +++ b/src/test/ui/run-pass/for-loop-while/for-loop-panic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x: Vec = Vec::new(); for _ in &x { panic!("moop"); } } diff --git a/src/test/run-pass/for-loop-unconstrained-element-type-i32-fallback.rs b/src/test/ui/run-pass/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs similarity index 98% rename from src/test/run-pass/for-loop-unconstrained-element-type-i32-fallback.rs rename to src/test/ui/run-pass/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs index 0bfc4d2264c6..408900ea7064 100644 --- a/src/test/run-pass/for-loop-unconstrained-element-type-i32-fallback.rs +++ b/src/test/ui/run-pass/for-loop-while/for-loop-unconstrained-element-type-i32-fallback.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the type of `sum` falls back to `i32` here, // and that the for loop desugaring doesn't interfere with // that. diff --git a/src/test/run-pass/foreach-external-iterators-break.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-break.rs similarity index 98% rename from src/test/run-pass/foreach-external-iterators-break.rs rename to src/test/ui/run-pass/for-loop-while/foreach-external-iterators-break.rs index e63c29eb0173..1668031cb89b 100644 --- a/src/test/run-pass/foreach-external-iterators-break.rs +++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-break.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = [1; 100]; diff --git a/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs similarity index 98% rename from src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs rename to src/test/ui/run-pass/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs index 232af7eca419..15df3bed0306 100644 --- a/src/test/run-pass/foreach-external-iterators-hashmap-break-restart.rs +++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-hashmap-break-restart.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::HashMap; diff --git a/src/test/run-pass/foreach-external-iterators-hashmap.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-hashmap.rs similarity index 98% rename from src/test/run-pass/foreach-external-iterators-hashmap.rs rename to src/test/ui/run-pass/for-loop-while/foreach-external-iterators-hashmap.rs index 2ef420187ded..1364b4ca97cf 100644 --- a/src/test/run-pass/foreach-external-iterators-hashmap.rs +++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-hashmap.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::HashMap; diff --git a/src/test/run-pass/foreach-external-iterators-loop.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-loop.rs similarity index 98% rename from src/test/run-pass/foreach-external-iterators-loop.rs rename to src/test/ui/run-pass/for-loop-while/foreach-external-iterators-loop.rs index 7248537d6a1b..fe96bf1a3b7c 100644 --- a/src/test/run-pass/foreach-external-iterators-loop.rs +++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-loop.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = [1; 100]; diff --git a/src/test/run-pass/foreach-external-iterators-nested.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-nested.rs similarity index 98% rename from src/test/run-pass/foreach-external-iterators-nested.rs rename to src/test/ui/run-pass/for-loop-while/foreach-external-iterators-nested.rs index ea55c90bdf12..0465e3219488 100644 --- a/src/test/run-pass/foreach-external-iterators-nested.rs +++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators-nested.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = [1; 100]; diff --git a/src/test/run-pass/foreach-external-iterators.rs b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators.rs similarity index 98% rename from src/test/run-pass/foreach-external-iterators.rs rename to src/test/ui/run-pass/for-loop-while/foreach-external-iterators.rs index 9b847517ec8f..906156c35f7d 100644 --- a/src/test/run-pass/foreach-external-iterators.rs +++ b/src/test/ui/run-pass/for-loop-while/foreach-external-iterators.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = [1; 100]; diff --git a/src/test/run-pass/foreach-nested.rs b/src/test/ui/run-pass/for-loop-while/foreach-nested.rs similarity index 98% rename from src/test/run-pass/foreach-nested.rs rename to src/test/ui/run-pass/for-loop-while/foreach-nested.rs index 2c4d0cc7648c..ca1da10a5dfa 100644 --- a/src/test/run-pass/foreach-nested.rs +++ b/src/test/ui/run-pass/for-loop-while/foreach-nested.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn two(mut it: F) where F: FnMut(isize) { it(0); it(1); } diff --git a/src/test/run-pass/foreach-put-structured.rs b/src/test/ui/run-pass/for-loop-while/foreach-put-structured.rs similarity index 98% rename from src/test/run-pass/foreach-put-structured.rs rename to src/test/ui/run-pass/for-loop-while/foreach-put-structured.rs index 028e31d76aa8..d8ccdd8959f8 100644 --- a/src/test/run-pass/foreach-put-structured.rs +++ b/src/test/ui/run-pass/for-loop-while/foreach-put-structured.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn pairs(mut it: F) where F: FnMut((isize, isize)) { diff --git a/src/test/run-pass/foreach-simple-outer-slot.rs b/src/test/ui/run-pass/for-loop-while/foreach-simple-outer-slot.rs similarity index 98% rename from src/test/run-pass/foreach-simple-outer-slot.rs rename to src/test/ui/run-pass/for-loop-while/foreach-simple-outer-slot.rs index 674c2e344823..d00b7e9d0fcc 100644 --- a/src/test/run-pass/foreach-simple-outer-slot.rs +++ b/src/test/ui/run-pass/for-loop-while/foreach-simple-outer-slot.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/label_break_value.rs b/src/test/ui/run-pass/for-loop-while/label_break_value.rs similarity index 99% rename from src/test/run-pass/label_break_value.rs rename to src/test/ui/run-pass/for-loop-while/label_break_value.rs index 444845e24dc7..831b23b03c32 100644 --- a/src/test/run-pass/label_break_value.rs +++ b/src/test/ui/run-pass/for-loop-while/label_break_value.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(label_break_value)] // Test control flow to follow label_break_value semantics diff --git a/src/test/run-pass/labeled-break.rs b/src/test/ui/run-pass/for-loop-while/labeled-break.rs similarity index 98% rename from src/test/run-pass/labeled-break.rs rename to src/test/ui/run-pass/for-loop-while/labeled-break.rs index fe2f35c5119e..d00b943313e4 100644 --- a/src/test/run-pass/labeled-break.rs +++ b/src/test/ui/run-pass/for-loop-while/labeled-break.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/linear-for-loop.rs b/src/test/ui/run-pass/for-loop-while/linear-for-loop.rs similarity index 98% rename from src/test/run-pass/linear-for-loop.rs rename to src/test/ui/run-pass/for-loop-while/linear-for-loop.rs index fc6d435b034b..e1a708222905 100644 --- a/src/test/run-pass/linear-for-loop.rs +++ b/src/test/ui/run-pass/for-loop-while/linear-for-loop.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = vec![1, 2, 3]; let mut y = 0; diff --git a/src/test/run-pass/liveness-assign-imm-local-after-loop.rs b/src/test/ui/run-pass/for-loop-while/liveness-assign-imm-local-after-loop.rs similarity index 96% rename from src/test/run-pass/liveness-assign-imm-local-after-loop.rs rename to src/test/ui/run-pass/for-loop-while/liveness-assign-imm-local-after-loop.rs index dfa080550469..fd0b234c7b32 100644 --- a/src/test/run-pass/liveness-assign-imm-local-after-loop.rs +++ b/src/test/ui/run-pass/for-loop-while/liveness-assign-imm-local-after-loop.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 -#![allow(dead_assignment)] #![allow(unreachable_code)] #![allow(unused_variables)] diff --git a/src/test/run-pass/liveness-loop-break.rs b/src/test/ui/run-pass/for-loop-while/liveness-loop-break.rs similarity index 98% rename from src/test/run-pass/liveness-loop-break.rs rename to src/test/ui/run-pass/for-loop-while/liveness-loop-break.rs index 0dba1830cbd2..7323f9147fa7 100644 --- a/src/test/run-pass/liveness-loop-break.rs +++ b/src/test/ui/run-pass/for-loop-while/liveness-loop-break.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn test() { let v; loop { diff --git a/src/test/run-pass/liveness-move-in-loop.rs b/src/test/ui/run-pass/for-loop-while/liveness-move-in-loop.rs similarity index 98% rename from src/test/run-pass/liveness-move-in-loop.rs rename to src/test/ui/run-pass/for-loop-while/liveness-move-in-loop.rs index f9bb45ee4009..b5da1c1e2216 100644 --- a/src/test/run-pass/liveness-move-in-loop.rs +++ b/src/test/ui/run-pass/for-loop-while/liveness-move-in-loop.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/loop-break-cont-1.rs b/src/test/ui/run-pass/for-loop-while/loop-break-cont-1.rs similarity index 97% rename from src/test/run-pass/loop-break-cont-1.rs rename to src/test/ui/run-pass/for-loop-while/loop-break-cont-1.rs index 5abac0e65a36..f56b2b4ef4d1 100644 --- a/src/test/run-pass/loop-break-cont-1.rs +++ b/src/test/ui/run-pass/for-loop-while/loop-break-cont-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let _i = 0_usize; diff --git a/src/test/run-pass/loop-break-cont.rs b/src/test/ui/run-pass/for-loop-while/loop-break-cont.rs similarity index 98% rename from src/test/run-pass/loop-break-cont.rs rename to src/test/ui/run-pass/for-loop-while/loop-break-cont.rs index a15efa2d8ee8..fb32132b493c 100644 --- a/src/test/run-pass/loop-break-cont.rs +++ b/src/test/ui/run-pass/for-loop-while/loop-break-cont.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut i = 0_usize; loop { diff --git a/src/test/run-pass/loop-break-value.rs b/src/test/ui/run-pass/for-loop-while/loop-break-value.rs similarity index 99% rename from src/test/run-pass/loop-break-value.rs rename to src/test/ui/run-pass/for-loop-while/loop-break-value.rs index 39053769b24b..9f23b4e93e68 100644 --- a/src/test/run-pass/loop-break-value.rs +++ b/src/test/ui/run-pass/for-loop-while/loop-break-value.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(never_type)] #[allow(unused)] diff --git a/src/test/run-pass/loop-diverges.rs b/src/test/ui/run-pass/for-loop-while/loop-diverges.rs similarity index 98% rename from src/test/run-pass/loop-diverges.rs rename to src/test/ui/run-pass/for-loop-while/loop-diverges.rs index c2ad9a6ef73e..86ff4c054387 100644 --- a/src/test/run-pass/loop-diverges.rs +++ b/src/test/ui/run-pass/for-loop-while/loop-diverges.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 /* Make sure a loop{} can be the tailexpr in the body diff --git a/src/test/run-pass/loop-label-shadowing.rs b/src/test/ui/run-pass/for-loop-while/loop-label-shadowing.rs similarity index 98% rename from src/test/run-pass/loop-label-shadowing.rs rename to src/test/ui/run-pass/for-loop-while/loop-label-shadowing.rs index 399920a7e315..18cad7541aae 100644 --- a/src/test/run-pass/loop-label-shadowing.rs +++ b/src/test/ui/run-pass/for-loop-while/loop-label-shadowing.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #12512. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/loop-labeled-break-value.rs b/src/test/ui/run-pass/for-loop-while/loop-labeled-break-value.rs similarity index 87% rename from src/test/run-pass/loop-labeled-break-value.rs rename to src/test/ui/run-pass/for-loop-while/loop-labeled-break-value.rs index 4f03b45b116e..a8fe26abf9af 100644 --- a/src/test/run-pass/loop-labeled-break-value.rs +++ b/src/test/ui/run-pass/for-loop-while/loop-labeled-break-value.rs @@ -8,13 +8,14 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() { 'outer: loop { let _: i32 = loop { break 'outer }; } - 'outer: loop { - let _: i32 = loop { loop { break 'outer } }; + 'outer2: loop { + let _: i32 = loop { loop { break 'outer2 } }; } } diff --git a/src/test/run-pass/loop-no-reinit-needed-post-bot.rs b/src/test/ui/run-pass/for-loop-while/loop-no-reinit-needed-post-bot.rs similarity index 98% rename from src/test/run-pass/loop-no-reinit-needed-post-bot.rs rename to src/test/ui/run-pass/for-loop-while/loop-no-reinit-needed-post-bot.rs index 689e17c170d9..95bb8e8aa64d 100644 --- a/src/test/run-pass/loop-no-reinit-needed-post-bot.rs +++ b/src/test/ui/run-pass/for-loop-while/loop-no-reinit-needed-post-bot.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct S; diff --git a/src/test/run-pass/loop-scope.rs b/src/test/ui/run-pass/for-loop-while/loop-scope.rs similarity index 98% rename from src/test/run-pass/loop-scope.rs rename to src/test/ui/run-pass/for-loop-while/loop-scope.rs index 6916bfb8c616..e8987b1a593c 100644 --- a/src/test/run-pass/loop-scope.rs +++ b/src/test/ui/run-pass/for-loop-while/loop-scope.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = vec![10, 20, 30]; diff --git a/src/test/run-pass/while-cont.rs b/src/test/ui/run-pass/for-loop-while/while-cont.rs similarity index 98% rename from src/test/run-pass/while-cont.rs rename to src/test/ui/run-pass/for-loop-while/while-cont.rs index 3e1a232115f7..23d74f440bab 100644 --- a/src/test/run-pass/while-cont.rs +++ b/src/test/ui/run-pass/for-loop-while/while-cont.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #825: Should recheck the loop condition after continuing pub fn main() { let mut i = 1; diff --git a/src/test/run-pass/while-flow-graph.rs b/src/test/ui/run-pass/for-loop-while/while-flow-graph.rs similarity index 98% rename from src/test/run-pass/while-flow-graph.rs rename to src/test/ui/run-pass/for-loop-while/while-flow-graph.rs index 102a5a7558e0..9abdf45d18d9 100644 --- a/src/test/run-pass/while-flow-graph.rs +++ b/src/test/ui/run-pass/for-loop-while/while-flow-graph.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/while-label.rs b/src/test/ui/run-pass/for-loop-while/while-label.rs similarity index 98% rename from src/test/run-pass/while-label.rs rename to src/test/ui/run-pass/for-loop-while/while-label.rs index 8cbb845836f3..da0cf295ba0f 100644 --- a/src/test/run-pass/while-label.rs +++ b/src/test/ui/run-pass/for-loop-while/while-label.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { diff --git a/src/test/run-pass/while-let.rs b/src/test/ui/run-pass/for-loop-while/while-let.rs similarity index 94% rename from src/test/run-pass/while-let.rs rename to src/test/ui/run-pass/for-loop-while/while-let.rs index aed6986c5fe5..ea334df54c45 100644 --- a/src/test/run-pass/while-let.rs +++ b/src/test/ui/run-pass/for-loop-while/while-let.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::BinaryHeap; @@ -35,9 +36,9 @@ pub fn main() { pq = make_pq(); sum = 0; - 'a: while let Some(x) = pq.pop() { + 'a2: while let Some(x) = pq.pop() { if x == 3 { - continue 'a; + continue 'a2; } sum += x; } diff --git a/src/test/run-pass/while-loop-constraints-2.rs b/src/test/ui/run-pass/for-loop-while/while-loop-constraints-2.rs similarity index 96% rename from src/test/run-pass/while-loop-constraints-2.rs rename to src/test/ui/run-pass/for-loop-while/while-loop-constraints-2.rs index 6e9e7bc24d6a..802f7be543ac 100644 --- a/src/test/run-pass/while-loop-constraints-2.rs +++ b/src/test/ui/run-pass/for-loop-while/while-loop-constraints-2.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![allow(dead_assignment)] +// run-pass #![allow(unused_variables)] pub fn main() { diff --git a/src/test/run-pass/while-prelude-drop.rs b/src/test/ui/run-pass/for-loop-while/while-prelude-drop.rs similarity index 95% rename from src/test/run-pass/while-prelude-drop.rs rename to src/test/ui/run-pass/for-loop-while/while-prelude-drop.rs index 39ed4f53cf7e..8c6c89943986 100644 --- a/src/test/run-pass/while-prelude-drop.rs +++ b/src/test/ui/run-pass/for-loop-while/while-prelude-drop.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + use std::string::String; #[derive(PartialEq)] diff --git a/src/test/run-pass/while-with-break.rs b/src/test/ui/run-pass/for-loop-while/while-with-break.rs similarity index 98% rename from src/test/run-pass/while-with-break.rs rename to src/test/ui/run-pass/for-loop-while/while-with-break.rs index 4c599e9c4289..0981ce91f3cf 100644 --- a/src/test/run-pass/while-with-break.rs +++ b/src/test/ui/run-pass/for-loop-while/while-with-break.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut i: isize = 90; diff --git a/src/test/run-pass/while.rs b/src/test/ui/run-pass/for-loop-while/while.rs similarity index 98% rename from src/test/run-pass/while.rs rename to src/test/ui/run-pass/for-loop-while/while.rs index bf56e76687fa..ba71ba1fd52a 100644 --- a/src/test/run-pass/while.rs +++ b/src/test/ui/run-pass/for-loop-while/while.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { diff --git a/src/test/run-pass/auxiliary/fn-abi.rs b/src/test/ui/run-pass/foreign/auxiliary/fn-abi.rs similarity index 100% rename from src/test/run-pass/auxiliary/fn-abi.rs rename to src/test/ui/run-pass/foreign/auxiliary/fn-abi.rs diff --git a/src/test/ui/run-pass/foreign/auxiliary/foreign_lib.rs b/src/test/ui/run-pass/foreign/auxiliary/foreign_lib.rs new file mode 100644 index 000000000000..cef36274c625 --- /dev/null +++ b/src/test/ui/run-pass/foreign/auxiliary/foreign_lib.rs @@ -0,0 +1,48 @@ +// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_name="foreign_lib"] + +#![feature(libc)] + +pub mod rustrt { + extern crate libc; + + #[link(name = "rust_test_helpers", kind = "static")] + extern { + pub fn rust_get_test_int() -> libc::intptr_t; + } +} + +pub mod rustrt2 { + extern crate libc; + + extern { + pub fn rust_get_test_int() -> libc::intptr_t; + } +} + +pub mod rustrt3 { + // Different type, but same ABI (on all supported platforms). + // Ensures that we don't ICE or trigger LLVM asserts when + // importing the same symbol under different types. + // See https://github.com/rust-lang/rust/issues/32740. + extern { + pub fn rust_get_test_int() -> *const u8; + } +} + +pub fn local_uses() { + unsafe { + let x = rustrt::rust_get_test_int(); + assert_eq!(x, rustrt2::rust_get_test_int()); + assert_eq!(x as *const _, rustrt3::rust_get_test_int()); + } +} diff --git a/src/test/run-pass/foreign-call-no-runtime.rs b/src/test/ui/run-pass/foreign/foreign-call-no-runtime.rs similarity index 99% rename from src/test/run-pass/foreign-call-no-runtime.rs rename to src/test/ui/run-pass/foreign/foreign-call-no-runtime.rs index dd5c075c39b1..4837f78ce3b0 100644 --- a/src/test/run-pass/foreign-call-no-runtime.rs +++ b/src/test/ui/run-pass/foreign/foreign-call-no-runtime.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support #![feature(libc)] diff --git a/src/test/run-pass/foreign-dupe.rs b/src/test/ui/run-pass/foreign/foreign-dupe.rs similarity index 98% rename from src/test/run-pass/foreign-dupe.rs rename to src/test/ui/run-pass/foreign/foreign-dupe.rs index b79e6e98fc05..296459c399f0 100644 --- a/src/test/run-pass/foreign-dupe.rs +++ b/src/test/ui/run-pass/foreign/foreign-dupe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:foreign_lib.rs // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/foreign-fn-linkname.rs b/src/test/ui/run-pass/foreign/foreign-fn-linkname.rs similarity index 98% rename from src/test/run-pass/foreign-fn-linkname.rs rename to src/test/ui/run-pass/foreign/foreign-fn-linkname.rs index fd827efbfdd4..75876607603d 100644 --- a/src/test/run-pass/foreign-fn-linkname.rs +++ b/src/test/ui/run-pass/foreign/foreign-fn-linkname.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc to test ffi with #![feature(libc)] diff --git a/src/test/run-pass/foreign-fn-with-byval.rs b/src/test/ui/run-pass/foreign/foreign-fn-with-byval.rs similarity index 96% rename from src/test/run-pass/foreign-fn-with-byval.rs rename to src/test/ui/run-pass/foreign/foreign-fn-with-byval.rs index 65efa571a9b4..1c8d1bd2566d 100644 --- a/src/test/run-pass/foreign-fn-with-byval.rs +++ b/src/test/ui/run-pass/foreign/foreign-fn-with-byval.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // ignore-wasm32-bare no libc to test ffi with #[derive(Copy, Clone)] diff --git a/src/test/run-pass/foreign-int-types.rs b/src/test/ui/run-pass/foreign/foreign-int-types.rs similarity index 98% rename from src/test/run-pass/foreign-int-types.rs rename to src/test/ui/run-pass/foreign/foreign-int-types.rs index 5ea0ef6c7ba3..d7bcf6559905 100644 --- a/src/test/run-pass/foreign-int-types.rs +++ b/src/test/ui/run-pass/foreign/foreign-int-types.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![forbid(improper_ctypes)] #![allow(dead_code)] diff --git a/src/test/run-pass/foreign-mod-src/compiletest-ignore-dir b/src/test/ui/run-pass/foreign/foreign-mod-src/compiletest-ignore-dir similarity index 100% rename from src/test/run-pass/foreign-mod-src/compiletest-ignore-dir rename to src/test/ui/run-pass/foreign/foreign-mod-src/compiletest-ignore-dir diff --git a/src/test/run-pass/foreign-mod-src/inner.rs b/src/test/ui/run-pass/foreign/foreign-mod-src/inner.rs similarity index 98% rename from src/test/run-pass/foreign-mod-src/inner.rs rename to src/test/ui/run-pass/foreign/foreign-mod-src/inner.rs index 2fd316ce3480..3c5f6ab80644 100644 --- a/src/test/run-pass/foreign-mod-src/inner.rs +++ b/src/test/ui/run-pass/foreign/foreign-mod-src/inner.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/foreign-mod-unused-const.rs b/src/test/ui/run-pass/foreign/foreign-mod-unused-const.rs similarity index 97% rename from src/test/run-pass/foreign-mod-unused-const.rs rename to src/test/ui/run-pass/foreign/foreign-mod-unused-const.rs index 5e9e529669a0..61d537c692ce 100644 --- a/src/test/run-pass/foreign-mod-unused-const.rs +++ b/src/test/ui/run-pass/foreign/foreign-mod-unused-const.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 mod foo { diff --git a/src/test/run-pass/foreign-no-abi.rs b/src/test/ui/run-pass/foreign/foreign-no-abi.rs similarity index 98% rename from src/test/run-pass/foreign-no-abi.rs rename to src/test/ui/run-pass/foreign/foreign-no-abi.rs index b516cdf4416b..1d35f08a11fd 100644 --- a/src/test/run-pass/foreign-no-abi.rs +++ b/src/test/ui/run-pass/foreign/foreign-no-abi.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ABI is cdecl by default // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/foreign-src/compiletest-ignore-dir b/src/test/ui/run-pass/foreign/foreign-src/compiletest-ignore-dir similarity index 100% rename from src/test/run-pass/foreign-src/compiletest-ignore-dir rename to src/test/ui/run-pass/foreign/foreign-src/compiletest-ignore-dir diff --git a/src/test/run-pass/foreign-src/foreign.rs b/src/test/ui/run-pass/foreign/foreign-src/foreign.rs similarity index 98% rename from src/test/run-pass/foreign-src/foreign.rs rename to src/test/ui/run-pass/foreign/foreign-src/foreign.rs index 2e07795ec27e..5cf8f5a22ddb 100644 --- a/src/test/run-pass/foreign-src/foreign.rs +++ b/src/test/ui/run-pass/foreign/foreign-src/foreign.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/foreign-truncated-arguments.rs b/src/test/ui/run-pass/foreign/foreign-truncated-arguments.rs similarity index 98% rename from src/test/run-pass/foreign-truncated-arguments.rs rename to src/test/ui/run-pass/foreign/foreign-truncated-arguments.rs index a983a4a95988..5e7d4487382f 100644 --- a/src/test/run-pass/foreign-truncated-arguments.rs +++ b/src/test/ui/run-pass/foreign/foreign-truncated-arguments.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -O // Regression test for https://github.com/rust-lang/rust/issues/33868 diff --git a/src/test/run-pass/foreign2.rs b/src/test/ui/run-pass/foreign/foreign2.rs similarity index 98% rename from src/test/run-pass/foreign2.rs rename to src/test/ui/run-pass/foreign/foreign2.rs index d69d6976e4a9..307e6b182e7a 100644 --- a/src/test/run-pass/foreign2.rs +++ b/src/test/ui/run-pass/foreign/foreign2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc to test ffi with // pretty-expanded FIXME #23616 diff --git a/src/test/ui/run-pass/functions-closures/auxiliary/fn-abi.rs b/src/test/ui/run-pass/functions-closures/auxiliary/fn-abi.rs new file mode 100644 index 000000000000..5d380ea6a5ac --- /dev/null +++ b/src/test/ui/run-pass/functions-closures/auxiliary/fn-abi.rs @@ -0,0 +1,12 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#[no_mangle] +pub extern fn foo() {} diff --git a/src/test/run-pass/call-closure-from-overloaded-op.rs b/src/test/ui/run-pass/functions-closures/call-closure-from-overloaded-op.rs similarity index 98% rename from src/test/run-pass/call-closure-from-overloaded-op.rs rename to src/test/ui/run-pass/functions-closures/call-closure-from-overloaded-op.rs index e35398a22917..d31420f338d6 100644 --- a/src/test/run-pass/call-closure-from-overloaded-op.rs +++ b/src/test/ui/run-pass/functions-closures/call-closure-from-overloaded-op.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo() -> isize { 22 } diff --git a/src/test/run-pass/capture-clauses-boxed-closures.rs b/src/test/ui/run-pass/functions-closures/capture-clauses-boxed-closures.rs similarity index 98% rename from src/test/run-pass/capture-clauses-boxed-closures.rs rename to src/test/ui/run-pass/functions-closures/capture-clauses-boxed-closures.rs index 45cec79e1a30..21b71c9c3804 100644 --- a/src/test/run-pass/capture-clauses-boxed-closures.rs +++ b/src/test/ui/run-pass/functions-closures/capture-clauses-boxed-closures.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn each(x: &[T], mut f: F) where F: FnMut(&T) { for val in x { diff --git a/src/test/run-pass/capture-clauses-unboxed-closures.rs b/src/test/ui/run-pass/functions-closures/capture-clauses-unboxed-closures.rs similarity index 98% rename from src/test/run-pass/capture-clauses-unboxed-closures.rs rename to src/test/ui/run-pass/functions-closures/capture-clauses-unboxed-closures.rs index e8a9dc7b8f36..d18d8d37c028 100644 --- a/src/test/run-pass/capture-clauses-unboxed-closures.rs +++ b/src/test/ui/run-pass/functions-closures/capture-clauses-unboxed-closures.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn each<'a,T,F:FnMut(&'a T)>(x: &'a [T], mut f: F) { for val in x { f(val) diff --git a/src/test/run-pass/clone-closure.rs b/src/test/ui/run-pass/functions-closures/clone-closure.rs similarity index 98% rename from src/test/run-pass/clone-closure.rs rename to src/test/ui/run-pass/functions-closures/clone-closure.rs index 0fe3711d8d32..49350266a6e7 100644 --- a/src/test/run-pass/clone-closure.rs +++ b/src/test/ui/run-pass/functions-closures/clone-closure.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that closures implement `Clone`. #[derive(Clone)] diff --git a/src/test/run-pass/closure-bounds-can-capture-chan.rs b/src/test/ui/run-pass/functions-closures/closure-bounds-can-capture-chan.rs similarity index 98% rename from src/test/run-pass/closure-bounds-can-capture-chan.rs rename to src/test/ui/run-pass/functions-closures/closure-bounds-can-capture-chan.rs index 5268e855d5fd..7c1230d4e90f 100644 --- a/src/test/run-pass/closure-bounds-can-capture-chan.rs +++ b/src/test/ui/run-pass/functions-closures/closure-bounds-can-capture-chan.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::sync::mpsc::channel; diff --git a/src/test/run-pass/closure-expected-type/README.md b/src/test/ui/run-pass/functions-closures/closure-expected-type/README.md similarity index 100% rename from src/test/run-pass/closure-expected-type/README.md rename to src/test/ui/run-pass/functions-closures/closure-expected-type/README.md diff --git a/src/test/run-pass/closure-expected-type/expect-infer-supply-two-infers.rs b/src/test/ui/run-pass/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs similarity index 98% rename from src/test/run-pass/closure-expected-type/expect-infer-supply-two-infers.rs rename to src/test/ui/run-pass/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs index 8a90a491f7e5..a58b9ba567b6 100644 --- a/src/test/run-pass/closure-expected-type/expect-infer-supply-two-infers.rs +++ b/src/test/ui/run-pass/functions-closures/closure-expected-type/expect-infer-supply-two-infers.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn with_closure(_: F) where F: FnOnce(Vec, A) { diff --git a/src/test/run-pass/closure-expected-type/issue-38714.rs b/src/test/ui/run-pass/functions-closures/closure-expected-type/issue-38714.rs similarity index 98% rename from src/test/run-pass/closure-expected-type/issue-38714.rs rename to src/test/ui/run-pass/functions-closures/closure-expected-type/issue-38714.rs index a1d512105c93..3304b2e2600d 100644 --- a/src/test/run-pass/closure-expected-type/issue-38714.rs +++ b/src/test/ui/run-pass/functions-closures/closure-expected-type/issue-38714.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct UsizeRef<'a> { a: &'a usize } diff --git a/src/test/run-pass/closure-expected-type/supply-just-return-type.rs b/src/test/ui/run-pass/functions-closures/closure-expected-type/supply-just-return-type.rs similarity index 99% rename from src/test/run-pass/closure-expected-type/supply-just-return-type.rs rename to src/test/ui/run-pass/functions-closures/closure-expected-type/supply-just-return-type.rs index 0b930b338fd7..30e81746db64 100644 --- a/src/test/run-pass/closure-expected-type/supply-just-return-type.rs +++ b/src/test/ui/run-pass/functions-closures/closure-expected-type/supply-just-return-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn with_closure(f: F) -> Result where F: FnOnce(&char) -> Result, { diff --git a/src/test/run-pass/closure-expected-type/supply-nothing.rs b/src/test/ui/run-pass/functions-closures/closure-expected-type/supply-nothing.rs similarity index 98% rename from src/test/run-pass/closure-expected-type/supply-nothing.rs rename to src/test/ui/run-pass/functions-closures/closure-expected-type/supply-nothing.rs index 15d8b393c152..9035bca50b9e 100644 --- a/src/test/run-pass/closure-expected-type/supply-nothing.rs +++ b/src/test/ui/run-pass/functions-closures/closure-expected-type/supply-nothing.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn with_closure(f: F) -> u32 where F: FnOnce(&u32, &u32) -> u32 { diff --git a/src/test/run-pass/closure-immediate.rs b/src/test/ui/run-pass/functions-closures/closure-immediate.rs similarity index 98% rename from src/test/run-pass/closure-immediate.rs rename to src/test/ui/run-pass/functions-closures/closure-immediate.rs index e566c1058359..9a729532effb 100644 --- a/src/test/run-pass/closure-immediate.rs +++ b/src/test/ui/run-pass/functions-closures/closure-immediate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // After the work to reoptimize structs, it became possible for immediate logic to fail. // This test verifies that it actually works. diff --git a/src/test/run-pass/closure-inference.rs b/src/test/ui/run-pass/functions-closures/closure-inference.rs similarity index 98% rename from src/test/run-pass/closure-inference.rs rename to src/test/ui/run-pass/functions-closures/closure-inference.rs index 630a510ca651..e8554d276502 100644 --- a/src/test/run-pass/closure-inference.rs +++ b/src/test/ui/run-pass/functions-closures/closure-inference.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo(i: isize) -> isize { i + 1 } diff --git a/src/test/run-pass/closure-inference2.rs b/src/test/ui/run-pass/functions-closures/closure-inference2.rs similarity index 98% rename from src/test/run-pass/closure-inference2.rs rename to src/test/ui/run-pass/functions-closures/closure-inference2.rs index 2f24cd4ce404..65da36e206b9 100644 --- a/src/test/run-pass/closure-inference2.rs +++ b/src/test/ui/run-pass/functions-closures/closure-inference2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test a rather underspecified example: diff --git a/src/test/run-pass/closure-reform.rs b/src/test/ui/run-pass/functions-closures/closure-reform.rs similarity index 99% rename from src/test/run-pass/closure-reform.rs rename to src/test/ui/run-pass/functions-closures/closure-reform.rs index a37733bdc2df..52e0e56026bb 100644 --- a/src/test/run-pass/closure-reform.rs +++ b/src/test/ui/run-pass/functions-closures/closure-reform.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass /* Any copyright is dedicated to the Public Domain. * http://creativecommons.org/publicdomain/zero/1.0/ */ diff --git a/src/test/run-pass/closure-returning-closure.rs b/src/test/ui/run-pass/functions-closures/closure-returning-closure.rs similarity index 97% rename from src/test/run-pass/closure-returning-closure.rs rename to src/test/ui/run-pass/functions-closures/closure-returning-closure.rs index 2c00f770cd91..08e7ebe55883 100644 --- a/src/test/run-pass/closure-returning-closure.rs +++ b/src/test/ui/run-pass/functions-closures/closure-returning-closure.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let f = |_||x, y| x+y; assert_eq!(f(())(1, 2), 3); diff --git a/src/test/run-pass/closure-to-fn-coercion.rs b/src/test/ui/run-pass/functions-closures/closure-to-fn-coercion.rs similarity index 99% rename from src/test/run-pass/closure-to-fn-coercion.rs rename to src/test/ui/run-pass/functions-closures/closure-to-fn-coercion.rs index 343209143cc2..15a46f0eca53 100644 --- a/src/test/run-pass/closure-to-fn-coercion.rs +++ b/src/test/ui/run-pass/functions-closures/closure-to-fn-coercion.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; const FOO: fn(u8) -> u8 = |v: u8| { v }; diff --git a/src/test/run-pass/closure_to_fn_coercion-expected-types.rs b/src/test/ui/run-pass/functions-closures/closure_to_fn_coercion-expected-types.rs similarity index 97% rename from src/test/run-pass/closure_to_fn_coercion-expected-types.rs rename to src/test/ui/run-pass/functions-closures/closure_to_fn_coercion-expected-types.rs index 41da3089c884..e2e2b3251779 100644 --- a/src/test/run-pass/closure_to_fn_coercion-expected-types.rs +++ b/src/test/ui/run-pass/functions-closures/closure_to_fn_coercion-expected-types.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass // Ensure that we deduce expected argument types when a `fn()` type is expected (#41755) fn foo(f: fn(Vec) -> usize) { } diff --git a/src/test/run-pass/copy-closure.rs b/src/test/ui/run-pass/functions-closures/copy-closure.rs similarity index 98% rename from src/test/run-pass/copy-closure.rs rename to src/test/ui/run-pass/functions-closures/copy-closure.rs index a211d6fc3a38..73971431d584 100644 --- a/src/test/run-pass/copy-closure.rs +++ b/src/test/ui/run-pass/functions-closures/copy-closure.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that closures implement `Copy`. fn call T>(f: F) -> T { f() } diff --git a/src/test/run-pass/fn-abi.rs b/src/test/ui/run-pass/functions-closures/fn-abi.rs similarity index 98% rename from src/test/run-pass/fn-abi.rs rename to src/test/ui/run-pass/functions-closures/fn-abi.rs index 0e3005a2aaa6..4e97dec2189f 100644 --- a/src/test/run-pass/fn-abi.rs +++ b/src/test/ui/run-pass/functions-closures/fn-abi.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Ensure that declarations and types which use `extern fn` both have the same // ABI (#9309). diff --git a/src/test/run-pass/fn-bare-assign.rs b/src/test/ui/run-pass/functions-closures/fn-bare-assign.rs similarity index 98% rename from src/test/run-pass/fn-bare-assign.rs rename to src/test/ui/run-pass/functions-closures/fn-bare-assign.rs index 2d3d4cbffd00..4bf83461ed23 100644 --- a/src/test/run-pass/fn-bare-assign.rs +++ b/src/test/ui/run-pass/functions-closures/fn-bare-assign.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn f(i: isize, called: &mut bool) { assert_eq!(i, 10); diff --git a/src/test/run-pass/fn-bare-coerce-to-block.rs b/src/test/ui/run-pass/functions-closures/fn-bare-coerce-to-block.rs similarity index 98% rename from src/test/run-pass/fn-bare-coerce-to-block.rs rename to src/test/ui/run-pass/functions-closures/fn-bare-coerce-to-block.rs index 4ec32d23467f..4aba898a7683 100644 --- a/src/test/run-pass/fn-bare-coerce-to-block.rs +++ b/src/test/ui/run-pass/functions-closures/fn-bare-coerce-to-block.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn bare() {} diff --git a/src/test/run-pass/fn-bare-item.rs b/src/test/ui/run-pass/functions-closures/fn-bare-item.rs similarity index 97% rename from src/test/run-pass/fn-bare-item.rs rename to src/test/ui/run-pass/functions-closures/fn-bare-item.rs index 455b71aff877..0a8241d6fcee 100644 --- a/src/test/run-pass/fn-bare-item.rs +++ b/src/test/ui/run-pass/functions-closures/fn-bare-item.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn f() { println!("This is a bare function"); } diff --git a/src/test/run-pass/fn-bare-size.rs b/src/test/ui/run-pass/functions-closures/fn-bare-size.rs similarity index 98% rename from src/test/run-pass/fn-bare-size.rs rename to src/test/ui/run-pass/functions-closures/fn-bare-size.rs index 3ed4f103af08..eff13b7521f0 100644 --- a/src/test/run-pass/fn-bare-size.rs +++ b/src/test/ui/run-pass/functions-closures/fn-bare-size.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; diff --git a/src/test/run-pass/fn-bare-spawn.rs b/src/test/ui/run-pass/functions-closures/fn-bare-spawn.rs similarity index 98% rename from src/test/run-pass/fn-bare-spawn.rs rename to src/test/ui/run-pass/functions-closures/fn-bare-spawn.rs index e6ee77cb62bb..50dc51f82e66 100644 --- a/src/test/run-pass/fn-bare-spawn.rs +++ b/src/test/ui/run-pass/functions-closures/fn-bare-spawn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This is what the signature to spawn should look like with bare functions diff --git a/src/test/run-pass/fn-coerce-field.rs b/src/test/ui/run-pass/functions-closures/fn-coerce-field.rs similarity index 93% rename from src/test/run-pass/fn-coerce-field.rs rename to src/test/ui/run-pass/functions-closures/fn-coerce-field.rs index 74d107d15ab0..5845af6b60d4 100644 --- a/src/test/run-pass/fn-coerce-field.rs +++ b/src/test/ui/run-pass/functions-closures/fn-coerce-field.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_camel_case_types)] struct r where F: FnOnce() { field: F, diff --git a/src/test/run-pass/fn-item-type-cast.rs b/src/test/ui/run-pass/functions-closures/fn-item-type-cast.rs similarity index 98% rename from src/test/run-pass/fn-item-type-cast.rs rename to src/test/ui/run-pass/functions-closures/fn-item-type-cast.rs index 9a8a8d4782ed..0c032bd79fd7 100644 --- a/src/test/run-pass/fn-item-type-cast.rs +++ b/src/test/ui/run-pass/functions-closures/fn-item-type-cast.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test explicit coercions from a fn item type to a fn pointer type. diff --git a/src/test/run-pass/fn-item-type-coerce.rs b/src/test/ui/run-pass/functions-closures/fn-item-type-coerce.rs similarity index 98% rename from src/test/run-pass/fn-item-type-coerce.rs rename to src/test/ui/run-pass/functions-closures/fn-item-type-coerce.rs index 67899bfd683d..3b0cd1ec1e58 100644 --- a/src/test/run-pass/fn-item-type-coerce.rs +++ b/src/test/ui/run-pass/functions-closures/fn-item-type-coerce.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test implicit coercions from a fn item type to a fn pointer type. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/fn-item-type-zero-sized.rs b/src/test/ui/run-pass/functions-closures/fn-item-type-zero-sized.rs similarity index 98% rename from src/test/run-pass/fn-item-type-zero-sized.rs rename to src/test/ui/run-pass/functions-closures/fn-item-type-zero-sized.rs index 5fdaf083d078..0e952fe2761f 100644 --- a/src/test/run-pass/fn-item-type-zero-sized.rs +++ b/src/test/ui/run-pass/functions-closures/fn-item-type-zero-sized.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that fn item types are zero-sized. use std::mem::{size_of, size_of_val}; diff --git a/src/test/run-pass/fn-lval.rs b/src/test/ui/run-pass/functions-closures/fn-lval.rs similarity index 98% rename from src/test/run-pass/fn-lval.rs rename to src/test/ui/run-pass/functions-closures/fn-lval.rs index 13c96f434689..806ae182256d 100644 --- a/src/test/run-pass/fn-lval.rs +++ b/src/test/ui/run-pass/functions-closures/fn-lval.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/fn-type-infer.rs b/src/test/ui/run-pass/functions-closures/fn-type-infer.rs similarity index 98% rename from src/test/run-pass/fn-type-infer.rs rename to src/test/ui/run-pass/functions-closures/fn-type-infer.rs index ad6c10611aaa..5eea37cdc8c1 100644 --- a/src/test/run-pass/fn-type-infer.rs +++ b/src/test/ui/run-pass/functions-closures/fn-type-infer.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(unused_variables)] diff --git a/src/test/run-pass/implied-bounds-closure-arg-outlives.rs b/src/test/ui/run-pass/functions-closures/implied-bounds-closure-arg-outlives.rs similarity index 99% rename from src/test/run-pass/implied-bounds-closure-arg-outlives.rs rename to src/test/ui/run-pass/functions-closures/implied-bounds-closure-arg-outlives.rs index 0e5cc574f002..4277dcc149e5 100644 --- a/src/test/run-pass/implied-bounds-closure-arg-outlives.rs +++ b/src/test/ui/run-pass/functions-closures/implied-bounds-closure-arg-outlives.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to handle the relationships between free // regions bound in a closure callback. diff --git a/src/test/run-pass/nullable-pointer-opt-closures.rs b/src/test/ui/run-pass/functions-closures/nullable-pointer-opt-closures.rs similarity index 99% rename from src/test/run-pass/nullable-pointer-opt-closures.rs rename to src/test/ui/run-pass/functions-closures/nullable-pointer-opt-closures.rs index ac5634e6cdd1..2122bb897a03 100644 --- a/src/test/run-pass/nullable-pointer-opt-closures.rs +++ b/src/test/ui/run-pass/functions-closures/nullable-pointer-opt-closures.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; diff --git a/src/test/run-pass/parallel-codegen-closures.rs b/src/test/ui/run-pass/functions-closures/parallel-codegen-closures.rs similarity index 95% rename from src/test/run-pass/parallel-codegen-closures.rs rename to src/test/ui/run-pass/functions-closures/parallel-codegen-closures.rs index 27b9eeccbeb1..0b8604f66f9b 100644 --- a/src/test/run-pass/parallel-codegen-closures.rs +++ b/src/test/ui/run-pass/functions-closures/parallel-codegen-closures.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // Tests parallel codegen - this can fail if the symbol for the anonymous // closure in `sum` pollutes the second codegen unit from the first. diff --git a/src/test/run-pass/return-from-closure.rs b/src/test/ui/run-pass/functions-closures/return-from-closure.rs similarity index 95% rename from src/test/run-pass/return-from-closure.rs rename to src/test/ui/run-pass/functions-closures/return-from-closure.rs index 76eddd05382f..c66bdb5fa8b0 100644 --- a/src/test/run-pass/return-from-closure.rs +++ b/src/test/ui/run-pass/functions-closures/return-from-closure.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] // just to make sure that `return` is only returning from the closure, // not the surrounding function. diff --git a/src/test/run-pass/generator/auxiliary/xcrate-reachable.rs b/src/test/ui/run-pass/generator/auxiliary/xcrate-reachable.rs similarity index 100% rename from src/test/run-pass/generator/auxiliary/xcrate-reachable.rs rename to src/test/ui/run-pass/generator/auxiliary/xcrate-reachable.rs diff --git a/src/test/run-pass/generator/auxiliary/xcrate.rs b/src/test/ui/run-pass/generator/auxiliary/xcrate.rs similarity index 100% rename from src/test/run-pass/generator/auxiliary/xcrate.rs rename to src/test/ui/run-pass/generator/auxiliary/xcrate.rs diff --git a/src/test/run-pass/generator/borrow-in-tail-expr.rs b/src/test/ui/run-pass/generator/borrow-in-tail-expr.rs similarity index 97% rename from src/test/run-pass/generator/borrow-in-tail-expr.rs rename to src/test/ui/run-pass/generator/borrow-in-tail-expr.rs index 486fe3c900d8..3ac501d01176 100644 --- a/src/test/run-pass/generator/borrow-in-tail-expr.rs +++ b/src/test/ui/run-pass/generator/borrow-in-tail-expr.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators)] fn main() { diff --git a/src/test/run-pass/generator/conditional-drop.rs b/src/test/ui/run-pass/generator/conditional-drop.rs similarity index 99% rename from src/test/run-pass/generator/conditional-drop.rs rename to src/test/ui/run-pass/generator/conditional-drop.rs index 3d39c46186be..ca8689ca842d 100644 --- a/src/test/run-pass/generator/conditional-drop.rs +++ b/src/test/ui/run-pass/generator/conditional-drop.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators, generator_trait)] use std::ops::Generator; diff --git a/src/test/run-pass/generator/control-flow.rs b/src/test/ui/run-pass/generator/control-flow.rs similarity index 99% rename from src/test/run-pass/generator/control-flow.rs rename to src/test/ui/run-pass/generator/control-flow.rs index 09971410e556..b1560b83cdcb 100644 --- a/src/test/run-pass/generator/control-flow.rs +++ b/src/test/ui/run-pass/generator/control-flow.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators, generator_trait)] use std::ops::{GeneratorState, Generator}; diff --git a/src/test/run-pass/generator/drop-env.rs b/src/test/ui/run-pass/generator/drop-env.rs similarity index 99% rename from src/test/run-pass/generator/drop-env.rs rename to src/test/ui/run-pass/generator/drop-env.rs index ef4dc24472e6..9bdee0270979 100644 --- a/src/test/run-pass/generator/drop-env.rs +++ b/src/test/ui/run-pass/generator/drop-env.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators, generator_trait)] use std::ops::Generator; diff --git a/src/test/run-pass/generator/issue-44197.rs b/src/test/ui/run-pass/generator/issue-44197.rs similarity index 98% rename from src/test/run-pass/generator/issue-44197.rs rename to src/test/ui/run-pass/generator/issue-44197.rs index 272b7eb7bfdd..7ddc3c6e83ce 100644 --- a/src/test/run-pass/generator/issue-44197.rs +++ b/src/test/ui/run-pass/generator/issue-44197.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators, generator_trait)] use std::ops::{ Generator, GeneratorState }; diff --git a/src/test/run-pass/generator/issue-52398.rs b/src/test/ui/run-pass/generator/issue-52398.rs similarity index 98% rename from src/test/run-pass/generator/issue-52398.rs rename to src/test/ui/run-pass/generator/issue-52398.rs index 0fb8f277ea9d..9ed65a0eee06 100644 --- a/src/test/run-pass/generator/issue-52398.rs +++ b/src/test/ui/run-pass/generator/issue-52398.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators)] use std::cell::RefCell; diff --git a/src/test/run-pass/generator/iterator-count.rs b/src/test/ui/run-pass/generator/iterator-count.rs similarity index 99% rename from src/test/run-pass/generator/iterator-count.rs rename to src/test/ui/run-pass/generator/iterator-count.rs index 3564ddaa8068..b9d877b64985 100644 --- a/src/test/run-pass/generator/iterator-count.rs +++ b/src/test/ui/run-pass/generator/iterator-count.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators, generator_trait)] use std::ops::{GeneratorState, Generator}; diff --git a/src/test/run-pass/generator/live-upvar-across-yield.rs b/src/test/ui/run-pass/generator/live-upvar-across-yield.rs similarity index 98% rename from src/test/run-pass/generator/live-upvar-across-yield.rs rename to src/test/ui/run-pass/generator/live-upvar-across-yield.rs index 28e7da232ce0..f560c521533e 100644 --- a/src/test/run-pass/generator/live-upvar-across-yield.rs +++ b/src/test/ui/run-pass/generator/live-upvar-across-yield.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators, generator_trait)] use std::ops::Generator; diff --git a/src/test/run-pass/generator/match-bindings.rs b/src/test/ui/run-pass/generator/match-bindings.rs similarity index 98% rename from src/test/run-pass/generator/match-bindings.rs rename to src/test/ui/run-pass/generator/match-bindings.rs index 231aa1b42f02..10d8bb8c9a7e 100644 --- a/src/test/run-pass/generator/match-bindings.rs +++ b/src/test/ui/run-pass/generator/match-bindings.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators)] enum Enum { diff --git a/src/test/run-pass/generator/nested_generators.rs b/src/test/ui/run-pass/generator/nested_generators.rs similarity index 98% rename from src/test/run-pass/generator/nested_generators.rs rename to src/test/ui/run-pass/generator/nested_generators.rs index 29808da85a7a..e73f3f197dbc 100644 --- a/src/test/run-pass/generator/nested_generators.rs +++ b/src/test/ui/run-pass/generator/nested_generators.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators)] #![feature(generator_trait)] diff --git a/src/test/run-pass/generator/panic-drops.rs b/src/test/ui/run-pass/generator/panic-drops.rs similarity index 99% rename from src/test/run-pass/generator/panic-drops.rs rename to src/test/ui/run-pass/generator/panic-drops.rs index 3d7b60ab6b90..34efd43c5055 100644 --- a/src/test/run-pass/generator/panic-drops.rs +++ b/src/test/ui/run-pass/generator/panic-drops.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // ignore-wasm32-bare compiled as panic=abort by default #![feature(generators, generator_trait)] diff --git a/src/test/run-pass/generator/panic-safe.rs b/src/test/ui/run-pass/generator/panic-safe.rs similarity index 98% rename from src/test/run-pass/generator/panic-safe.rs rename to src/test/ui/run-pass/generator/panic-safe.rs index ace5cdde51d8..f1aa5de96895 100644 --- a/src/test/run-pass/generator/panic-safe.rs +++ b/src/test/ui/run-pass/generator/panic-safe.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // ignore-wasm32-bare compiled with panic=abort by default #![feature(generators, generator_trait)] diff --git a/src/test/run-pass/generator/reborrow-mut-upvar.rs b/src/test/ui/run-pass/generator/reborrow-mut-upvar.rs similarity index 98% rename from src/test/run-pass/generator/reborrow-mut-upvar.rs rename to src/test/ui/run-pass/generator/reborrow-mut-upvar.rs index 8353066bfbe8..582b5ad575be 100644 --- a/src/test/run-pass/generator/reborrow-mut-upvar.rs +++ b/src/test/ui/run-pass/generator/reborrow-mut-upvar.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators)] fn _run(bar: &mut i32) { diff --git a/src/test/run-pass/generator/resume-after-return.rs b/src/test/ui/run-pass/generator/resume-after-return.rs similarity index 98% rename from src/test/run-pass/generator/resume-after-return.rs rename to src/test/ui/run-pass/generator/resume-after-return.rs index 06e7615d2619..67c653f102d7 100644 --- a/src/test/run-pass/generator/resume-after-return.rs +++ b/src/test/ui/run-pass/generator/resume-after-return.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // ignore-wasm32-bare compiled with panic=abort by default #![feature(generators, generator_trait)] diff --git a/src/test/run-pass/generator/smoke.rs b/src/test/ui/run-pass/generator/smoke.rs similarity index 99% rename from src/test/run-pass/generator/smoke.rs rename to src/test/ui/run-pass/generator/smoke.rs index 7395c8484c16..2651000e8b41 100644 --- a/src/test/run-pass/generator/smoke.rs +++ b/src/test/ui/run-pass/generator/smoke.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // ignore-emscripten no threads support // compile-flags: --test diff --git a/src/test/run-pass/generator/static-generators.rs b/src/test/ui/run-pass/generator/static-generators.rs similarity index 98% rename from src/test/run-pass/generator/static-generators.rs rename to src/test/ui/run-pass/generator/static-generators.rs index ebc070eee09c..9c659b53a065 100644 --- a/src/test/run-pass/generator/static-generators.rs +++ b/src/test/ui/run-pass/generator/static-generators.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators, generator_trait)] use std::ops::{Generator, GeneratorState}; diff --git a/src/test/run-pass/generator/too-live-local-in-immovable-gen.rs b/src/test/ui/run-pass/generator/too-live-local-in-immovable-gen.rs similarity index 98% rename from src/test/run-pass/generator/too-live-local-in-immovable-gen.rs rename to src/test/ui/run-pass/generator/too-live-local-in-immovable-gen.rs index 2314533a6815..81a5f571202f 100644 --- a/src/test/run-pass/generator/too-live-local-in-immovable-gen.rs +++ b/src/test/ui/run-pass/generator/too-live-local-in-immovable-gen.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators)] fn main() { diff --git a/src/test/run-pass/generator/xcrate-reachable.rs b/src/test/ui/run-pass/generator/xcrate-reachable.rs similarity index 98% rename from src/test/run-pass/generator/xcrate-reachable.rs rename to src/test/ui/run-pass/generator/xcrate-reachable.rs index 2fc39ba18691..c14b3c3328a0 100644 --- a/src/test/run-pass/generator/xcrate-reachable.rs +++ b/src/test/ui/run-pass/generator/xcrate-reachable.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:xcrate-reachable.rs #![feature(generator_trait)] diff --git a/src/test/run-pass/generator/xcrate.rs b/src/test/ui/run-pass/generator/xcrate.rs similarity index 98% rename from src/test/run-pass/generator/xcrate.rs rename to src/test/ui/run-pass/generator/xcrate.rs index 04791d513567..af4a84dd1dba 100644 --- a/src/test/run-pass/generator/xcrate.rs +++ b/src/test/ui/run-pass/generator/xcrate.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:xcrate.rs #![feature(generators, generator_trait)] diff --git a/src/test/run-pass/generator/yield-in-args-rev.rs b/src/test/ui/run-pass/generator/yield-in-args-rev.rs similarity index 98% rename from src/test/run-pass/generator/yield-in-args-rev.rs rename to src/test/ui/run-pass/generator/yield-in-args-rev.rs index df00329799e9..3048b1225d31 100644 --- a/src/test/run-pass/generator/yield-in-args-rev.rs +++ b/src/test/ui/run-pass/generator/yield-in-args-rev.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that a borrow that occurs after a yield in the same // argument list is not treated as live across the yield by // type-checking. diff --git a/src/test/run-pass/generator/yield-in-box.rs b/src/test/ui/run-pass/generator/yield-in-box.rs similarity index 98% rename from src/test/run-pass/generator/yield-in-box.rs rename to src/test/ui/run-pass/generator/yield-in-box.rs index d68007be05c8..a5ba3a25e87c 100644 --- a/src/test/run-pass/generator/yield-in-box.rs +++ b/src/test/ui/run-pass/generator/yield-in-box.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that box-statements with yields in them work. #![feature(generators, box_syntax)] diff --git a/src/test/run-pass/generator/yield-in-initializer.rs b/src/test/ui/run-pass/generator/yield-in-initializer.rs similarity index 98% rename from src/test/run-pass/generator/yield-in-initializer.rs rename to src/test/ui/run-pass/generator/yield-in-initializer.rs index 3042061226b3..00045e6d3f6a 100644 --- a/src/test/run-pass/generator/yield-in-initializer.rs +++ b/src/test/ui/run-pass/generator/yield-in-initializer.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(generators)] fn main() { diff --git a/src/test/run-pass/generator/yield-subtype.rs b/src/test/ui/run-pass/generator/yield-subtype.rs similarity index 98% rename from src/test/run-pass/generator/yield-subtype.rs rename to src/test/ui/run-pass/generator/yield-subtype.rs index c41341690441..62d3a59ab788 100644 --- a/src/test/run-pass/generator/yield-subtype.rs +++ b/src/test/ui/run-pass/generator/yield-subtype.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // revisions:lexical nll //[nll]compile-flags: -Z disable-nll-user-type-assert #![cfg_attr(nll, feature(nll))] diff --git a/src/test/run-pass/auxiliary/default_type_params_xc.rs b/src/test/ui/run-pass/generics/auxiliary/default_type_params_xc.rs similarity index 100% rename from src/test/run-pass/auxiliary/default_type_params_xc.rs rename to src/test/ui/run-pass/generics/auxiliary/default_type_params_xc.rs diff --git a/src/test/run-pass/generic-alias-unique.rs b/src/test/ui/run-pass/generics/generic-alias-unique.rs similarity index 98% rename from src/test/run-pass/generic-alias-unique.rs rename to src/test/ui/run-pass/generics/generic-alias-unique.rs index c4fd31196153..a141ae049cc7 100644 --- a/src/test/run-pass/generic-alias-unique.rs +++ b/src/test/ui/run-pass/generics/generic-alias-unique.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn id(t: T) -> T { return t; } diff --git a/src/test/run-pass/generic-default-type-params-cross-crate.rs b/src/test/ui/run-pass/generics/generic-default-type-params-cross-crate.rs similarity index 98% rename from src/test/run-pass/generic-default-type-params-cross-crate.rs rename to src/test/ui/run-pass/generics/generic-default-type-params-cross-crate.rs index 4cf9f93bcacc..762ea4c6760b 100644 --- a/src/test/run-pass/generic-default-type-params-cross-crate.rs +++ b/src/test/ui/run-pass/generics/generic-default-type-params-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:default_type_params_xc.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/generic-default-type-params.rs b/src/test/ui/run-pass/generics/generic-default-type-params.rs similarity index 99% rename from src/test/run-pass/generic-default-type-params.rs rename to src/test/ui/run-pass/generics/generic-default-type-params.rs index e30cb7657988..6a5ae7b664f4 100644 --- a/src/test/run-pass/generic-default-type-params.rs +++ b/src/test/ui/run-pass/generics/generic-default-type-params.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo { a: A } diff --git a/src/test/run-pass/generic-derived-type.rs b/src/test/ui/run-pass/generics/generic-derived-type.rs similarity index 98% rename from src/test/run-pass/generic-derived-type.rs rename to src/test/ui/run-pass/generics/generic-derived-type.rs index 74a71873e287..76f638ca75e1 100644 --- a/src/test/run-pass/generic-derived-type.rs +++ b/src/test/ui/run-pass/generics/generic-derived-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn g(x: X) -> X { return x; } #[derive(Clone)] diff --git a/src/test/run-pass/generic-exterior-unique.rs b/src/test/ui/run-pass/generics/generic-exterior-unique.rs similarity index 98% rename from src/test/run-pass/generic-exterior-unique.rs rename to src/test/ui/run-pass/generics/generic-exterior-unique.rs index 64091d2926c9..960d578138f9 100644 --- a/src/test/run-pass/generic-exterior-unique.rs +++ b/src/test/ui/run-pass/generics/generic-exterior-unique.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct Recbox {x: Box} diff --git a/src/test/run-pass/generic-extern-mangle.rs b/src/test/ui/run-pass/generics/generic-extern-mangle.rs similarity index 98% rename from src/test/run-pass/generic-extern-mangle.rs rename to src/test/ui/run-pass/generics/generic-extern-mangle.rs index debe3706891c..b935922a0cd4 100644 --- a/src/test/run-pass/generic-extern-mangle.rs +++ b/src/test/ui/run-pass/generics/generic-extern-mangle.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Add; extern "C" fn foo(a: T, b: T) -> T::Output { a + b } diff --git a/src/test/run-pass/generic-fn-infer.rs b/src/test/ui/run-pass/generics/generic-fn-infer.rs similarity index 98% rename from src/test/run-pass/generic-fn-infer.rs rename to src/test/ui/run-pass/generics/generic-fn-infer.rs index bff86207f786..5db9228cc3c2 100644 --- a/src/test/run-pass/generic-fn-infer.rs +++ b/src/test/ui/run-pass/generics/generic-fn-infer.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/generic-fn-twice.rs b/src/test/ui/run-pass/generics/generic-fn-twice.rs similarity index 98% rename from src/test/run-pass/generic-fn-twice.rs rename to src/test/ui/run-pass/generics/generic-fn-twice.rs index b37c73f7f759..d385a153830f 100644 --- a/src/test/run-pass/generic-fn-twice.rs +++ b/src/test/ui/run-pass/generics/generic-fn-twice.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/generic-fn-unique.rs b/src/test/ui/run-pass/generics/generic-fn-unique.rs similarity index 98% rename from src/test/run-pass/generic-fn-unique.rs rename to src/test/ui/run-pass/generics/generic-fn-unique.rs index 3585cd2e0797..0e0ffa63f61f 100644 --- a/src/test/run-pass/generic-fn-unique.rs +++ b/src/test/ui/run-pass/generics/generic-fn-unique.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn f(x: Box) -> Box { return x; } diff --git a/src/test/run-pass/generic-fn.rs b/src/test/ui/run-pass/generics/generic-fn.rs similarity index 97% rename from src/test/run-pass/generic-fn.rs rename to src/test/ui/run-pass/generics/generic-fn.rs index 0ba0ed4bf7f9..ae26ea1b155f 100644 --- a/src/test/run-pass/generic-fn.rs +++ b/src/test/ui/run-pass/generics/generic-fn.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![allow(dead_assignment)] +// run-pass fn id(x: T) -> T { return x; } diff --git a/src/test/run-pass/generic-ivec-leak.rs b/src/test/ui/run-pass/generics/generic-ivec-leak.rs similarity index 92% rename from src/test/run-pass/generic-ivec-leak.rs rename to src/test/ui/run-pass/generics/generic-ivec-leak.rs index d439c6238018..555f5297dde9 100644 --- a/src/test/run-pass/generic-ivec-leak.rs +++ b/src/test/ui/run-pass/generics/generic-ivec-leak.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] enum wrapper { wrapped(T), } pub fn main() { let _w = wrapper::wrapped(vec![1, 2, 3, 4, 5]); } diff --git a/src/test/run-pass/generic-newtype-struct.rs b/src/test/ui/run-pass/generics/generic-newtype-struct.rs similarity index 97% rename from src/test/run-pass/generic-newtype-struct.rs rename to src/test/ui/run-pass/generics/generic-newtype-struct.rs index 24b517280007..fc54a3bab548 100644 --- a/src/test/run-pass/generic-newtype-struct.rs +++ b/src/test/ui/run-pass/generics/generic-newtype-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct S(T); diff --git a/src/test/run-pass/generic-object.rs b/src/test/ui/run-pass/generics/generic-object.rs similarity index 98% rename from src/test/run-pass/generic-object.rs rename to src/test/ui/run-pass/generics/generic-object.rs index 7e737fe00afd..4745b8d2cb8c 100644 --- a/src/test/run-pass/generic-object.rs +++ b/src/test/ui/run-pass/generics/generic-object.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] trait Foo { diff --git a/src/test/run-pass/generic-recursive-tag.rs b/src/test/ui/run-pass/generics/generic-recursive-tag.rs similarity index 94% rename from src/test/run-pass/generic-recursive-tag.rs rename to src/test/ui/run-pass/generics/generic-recursive-tag.rs index ca2bf0ac2245..3830177f0ada 100644 --- a/src/test/run-pass/generic-recursive-tag.rs +++ b/src/test/ui/run-pass/generics/generic-recursive-tag.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] #![feature(box_syntax)] enum list { cons(Box, Box>), nil, } diff --git a/src/test/run-pass/generic-static-methods.rs b/src/test/ui/run-pass/generics/generic-static-methods.rs similarity index 95% rename from src/test/run-pass/generic-static-methods.rs rename to src/test/ui/run-pass/generics/generic-static-methods.rs index ad501ec7e9ba..2fe903866c23 100644 --- a/src/test/run-pass/generic-static-methods.rs +++ b/src/test/ui/run-pass/generics/generic-static-methods.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] trait vec_utils { diff --git a/src/test/run-pass/generic-tag-corruption.rs b/src/test/ui/run-pass/generics/generic-tag-corruption.rs similarity index 93% rename from src/test/run-pass/generic-tag-corruption.rs rename to src/test/ui/run-pass/generics/generic-tag-corruption.rs index d61ae520ada8..6f02be5d1065 100644 --- a/src/test/run-pass/generic-tag-corruption.rs +++ b/src/test/ui/run-pass/generics/generic-tag-corruption.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - +// run-pass +#![allow(non_camel_case_types)] // This used to cause memory corruption in stage 0. diff --git a/src/test/run-pass/generic-tag-local.rs b/src/test/ui/run-pass/generics/generic-tag-local.rs similarity index 92% rename from src/test/run-pass/generic-tag-local.rs rename to src/test/ui/run-pass/generics/generic-tag-local.rs index 9518d590279f..a0429693fd9a 100644 --- a/src/test/run-pass/generic-tag-local.rs +++ b/src/test/ui/run-pass/generics/generic-tag-local.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - +// run-pass +#![allow(non_camel_case_types)] // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/generic-tag-match.rs b/src/test/ui/run-pass/generics/generic-tag-match.rs similarity index 94% rename from src/test/run-pass/generic-tag-match.rs rename to src/test/ui/run-pass/generics/generic-tag-match.rs index 830c982e13c8..7f0bfe8ba314 100644 --- a/src/test/run-pass/generic-tag-match.rs +++ b/src/test/ui/run-pass/generics/generic-tag-match.rs @@ -8,7 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![allow(dead_assignment)] +// run-pass +#![allow(non_camel_case_types)] enum foo { arm(T), } diff --git a/src/test/run-pass/generic-tag-values.rs b/src/test/ui/run-pass/generics/generic-tag-values.rs similarity index 95% rename from src/test/run-pass/generic-tag-values.rs rename to src/test/ui/run-pass/generics/generic-tag-values.rs index 1acb23209009..66a1268e2f8b 100644 --- a/src/test/run-pass/generic-tag-values.rs +++ b/src/test/ui/run-pass/generics/generic-tag-values.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + enum noption { some(T), } struct Pair { x: isize, y: isize } diff --git a/src/test/run-pass/generic-tag.rs b/src/test/ui/run-pass/generics/generic-tag.rs similarity index 93% rename from src/test/run-pass/generic-tag.rs rename to src/test/ui/run-pass/generics/generic-tag.rs index a79465c8cd86..54a006a163e5 100644 --- a/src/test/run-pass/generic-tag.rs +++ b/src/test/ui/run-pass/generics/generic-tag.rs @@ -8,9 +8,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 -#![allow(dead_assignment)] #![allow(unused_variables)] #![feature(box_syntax)] diff --git a/src/test/run-pass/generic-temporary.rs b/src/test/ui/run-pass/generics/generic-temporary.rs similarity index 98% rename from src/test/run-pass/generic-temporary.rs rename to src/test/ui/run-pass/generics/generic-temporary.rs index 80a6efe7a0ef..32ff16710cff 100644 --- a/src/test/run-pass/generic-temporary.rs +++ b/src/test/ui/run-pass/generics/generic-temporary.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn mk() -> isize { return 1; } diff --git a/src/test/run-pass/generic-tup.rs b/src/test/ui/run-pass/generics/generic-tup.rs similarity index 98% rename from src/test/run-pass/generic-tup.rs rename to src/test/ui/run-pass/generics/generic-tup.rs index cd0e344b89c9..677e2f8349fb 100644 --- a/src/test/run-pass/generic-tup.rs +++ b/src/test/ui/run-pass/generics/generic-tup.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn get_third(t: (T, T, T)) -> T { let (_, _, x) = t; return x; } pub fn main() { diff --git a/src/test/run-pass/generic-type-synonym.rs b/src/test/ui/run-pass/generics/generic-type-synonym.rs similarity index 98% rename from src/test/run-pass/generic-type-synonym.rs rename to src/test/ui/run-pass/generics/generic-type-synonym.rs index 2b3bd5ead94a..518480301b95 100644 --- a/src/test/run-pass/generic-type-synonym.rs +++ b/src/test/ui/run-pass/generics/generic-type-synonym.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/generic-type.rs b/src/test/ui/run-pass/generics/generic-type.rs similarity index 98% rename from src/test/run-pass/generic-type.rs rename to src/test/ui/run-pass/generics/generic-type.rs index 8e7a3add3434..4f83d437dc64 100644 --- a/src/test/run-pass/generic-type.rs +++ b/src/test/ui/run-pass/generics/generic-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/generic-unique.rs b/src/test/ui/run-pass/generics/generic-unique.rs similarity index 98% rename from src/test/run-pass/generic-unique.rs rename to src/test/ui/run-pass/generics/generic-unique.rs index 1b1355ea336a..c21a0be3d39c 100644 --- a/src/test/run-pass/generic-unique.rs +++ b/src/test/ui/run-pass/generics/generic-unique.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct Triple { x: T, y: T, z: T } diff --git a/src/test/run-pass/hrtb-binder-levels-in-object-types.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs similarity index 98% rename from src/test/run-pass/hrtb-binder-levels-in-object-types.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs index bcd519bc25d2..641912269a16 100644 --- a/src/test/run-pass/hrtb-binder-levels-in-object-types.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-binder-levels-in-object-types.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we handle binder levels in object types correctly. // Initially, the reference to `'tcx` in the object type // `&Typer<'tcx>` was getting an incorrect binder level, yielding diff --git a/src/test/run-pass/hrtb-debruijn-object-types-in-closures.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs similarity index 98% rename from src/test/run-pass/hrtb-debruijn-object-types-in-closures.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs index 6761cc12876f..19c7c8c489ae 100644 --- a/src/test/run-pass/hrtb-debruijn-object-types-in-closures.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-debruijn-object-types-in-closures.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Typer<'tcx> { diff --git a/src/test/run-pass/hrtb-fn-like-trait-object.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs similarity index 98% rename from src/test/run-pass/hrtb-fn-like-trait-object.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs index 8e2e21bed0a7..bd61c42dd374 100644 --- a/src/test/run-pass/hrtb-fn-like-trait-object.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait-object.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A basic test of using a higher-ranked trait bound. diff --git a/src/test/run-pass/hrtb-fn-like-trait.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait.rs similarity index 98% rename from src/test/run-pass/hrtb-fn-like-trait.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait.rs index 71e314b51325..24ae5e1f3433 100644 --- a/src/test/run-pass/hrtb-fn-like-trait.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-fn-like-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A basic test of using a higher-ranked trait bound. diff --git a/src/test/run-pass/hrtb-opt-in-copy.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-opt-in-copy.rs similarity index 98% rename from src/test/run-pass/hrtb-opt-in-copy.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-opt-in-copy.rs index f0214d3f37b6..3eafc5aabda4 100644 --- a/src/test/run-pass/hrtb-opt-in-copy.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-opt-in-copy.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we handle binder levels correctly when checking whether a // type can implement `Copy`. In particular, we had a bug where we failed to // liberate the late-bound regions from the impl, and thus wound up diff --git a/src/test/run-pass/hrtb-parse.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-parse.rs similarity index 99% rename from src/test/run-pass/hrtb-parse.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-parse.rs index cdffaef66eb2..cdc83b047881 100644 --- a/src/test/run-pass/hrtb-parse.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-parse.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can parse all the various places that a `for` keyword // can appear representing universal quantification. diff --git a/src/test/run-pass/hrtb-precedence-of-plus-where-clause.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs similarity index 98% rename from src/test/run-pass/hrtb-precedence-of-plus-where-clause.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs index 46ea25629619..32abdde39ab3 100644 --- a/src/test/run-pass/hrtb-precedence-of-plus-where-clause.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus-where-clause.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 // Test that `F : Fn(isize) -> isize + Send` is interpreted as two diff --git a/src/test/run-pass/hrtb-precedence-of-plus.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs similarity index 98% rename from src/test/run-pass/hrtb-precedence-of-plus.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs index 511d32348576..5d29115d35e7 100644 --- a/src/test/run-pass/hrtb-precedence-of-plus.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-precedence-of-plus.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 // Test that `Fn(isize) -> isize + 'static` parses as `(Fn(isize) -> isize) + diff --git a/src/test/run-pass/hrtb-resolve-lifetime.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs similarity index 98% rename from src/test/run-pass/hrtb-resolve-lifetime.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs index bdbcda89099e..3f940cd4cd78 100644 --- a/src/test/run-pass/hrtb-resolve-lifetime.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-resolve-lifetime.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A basic test of using a higher-ranked trait bound. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/hrtb-trait-object-paren-notation.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs similarity index 98% rename from src/test/run-pass/hrtb-trait-object-paren-notation.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs index 5b9d4a834d87..5dc548fd341f 100644 --- a/src/test/run-pass/hrtb-trait-object-paren-notation.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-trait-object-paren-notation.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A basic test of using a higher-ranked trait bound. trait FnLike { diff --git a/src/test/run-pass/hrtb-trait-object-passed-to-closure.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs similarity index 98% rename from src/test/run-pass/hrtb-trait-object-passed-to-closure.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs index 48d0959630f7..2274fdc5684a 100644 --- a/src/test/run-pass/hrtb-trait-object-passed-to-closure.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-trait-object-passed-to-closure.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that `&PrinterSupport`, which is really short for `&'a // PrinterSupport<'b>`, gets properly expanded when it appears in a // closure type. This used to result in messed up De Bruijn indices. diff --git a/src/test/run-pass/hrtb-type-outlives.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-type-outlives.rs similarity index 99% rename from src/test/run-pass/hrtb-type-outlives.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-type-outlives.rs index 083f042fec26..f36533629cdb 100644 --- a/src/test/run-pass/hrtb-type-outlives.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-type-outlives.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test what happens when a HR obligation is applied to an impl with // "outlives" bounds. Currently we're pretty conservative here; this // will probably improve in time. diff --git a/src/test/run-pass/hrtb-unboxed-closure-trait.rs b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs similarity index 98% rename from src/test/run-pass/hrtb-unboxed-closure-trait.rs rename to src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs index 6666b61a4a72..56af5df0105d 100644 --- a/src/test/run-pass/hrtb-unboxed-closure-trait.rs +++ b/src/test/ui/run-pass/higher-rank-trait-bounds/hrtb-unboxed-closure-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test HRTB used with the `Fn` trait. fn foo(f: F) { diff --git a/src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs b/src/test/ui/run-pass/hygiene/auxiliary/legacy_interaction.rs similarity index 98% rename from src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs rename to src/test/ui/run-pass/hygiene/auxiliary/legacy_interaction.rs index c614ee4d5750..75f81c56db22 100644 --- a/src/test/run-pass/hygiene/auxiliary/legacy_interaction.rs +++ b/src/test/ui/run-pass/hygiene/auxiliary/legacy_interaction.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic #[macro_export] diff --git a/src/test/run-pass/hygiene/auxiliary/my_crate.rs b/src/test/ui/run-pass/hygiene/auxiliary/my_crate.rs similarity index 97% rename from src/test/run-pass/hygiene/auxiliary/my_crate.rs rename to src/test/ui/run-pass/hygiene/auxiliary/my_crate.rs index e10d20b6d47c..10dbaa9e9adc 100644 --- a/src/test/run-pass/hygiene/auxiliary/my_crate.rs +++ b/src/test/ui/run-pass/hygiene/auxiliary/my_crate.rs @@ -8,4 +8,5 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn f() {} diff --git a/src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs b/src/test/ui/run-pass/hygiene/auxiliary/unhygienic_example.rs similarity index 98% rename from src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs rename to src/test/ui/run-pass/hygiene/auxiliary/unhygienic_example.rs index 298e0209a098..589e8b579b77 100644 --- a/src/test/run-pass/hygiene/auxiliary/unhygienic_example.rs +++ b/src/test/ui/run-pass/hygiene/auxiliary/unhygienic_example.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![crate_type = "lib"] extern crate my_crate; diff --git a/src/test/run-pass/hygiene/auxiliary/xcrate.rs b/src/test/ui/run-pass/hygiene/auxiliary/xcrate.rs similarity index 98% rename from src/test/run-pass/hygiene/auxiliary/xcrate.rs rename to src/test/ui/run-pass/hygiene/auxiliary/xcrate.rs index 2ccd043097f8..f469d87f423d 100644 --- a/src/test/run-pass/hygiene/auxiliary/xcrate.rs +++ b/src/test/ui/run-pass/hygiene/auxiliary/xcrate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(decl_macro)] #![allow(unused)] diff --git a/src/test/run-pass/hygiene-dodging-1.rs b/src/test/ui/run-pass/hygiene/hygiene-dodging-1.rs similarity index 98% rename from src/test/run-pass/hygiene-dodging-1.rs rename to src/test/ui/run-pass/hygiene/hygiene-dodging-1.rs index 83f09850f777..bbb46d85d18d 100644 --- a/src/test/run-pass/hygiene-dodging-1.rs +++ b/src/test/ui/run-pass/hygiene/hygiene-dodging-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod x { pub fn g() -> usize {14} diff --git a/src/test/run-pass/hygiene.rs b/src/test/ui/run-pass/hygiene/hygiene.rs similarity index 99% rename from src/test/run-pass/hygiene.rs rename to src/test/ui/run-pass/hygiene/hygiene.rs index 91648ee57982..c6b5f9c39749 100644 --- a/src/test/run-pass/hygiene.rs +++ b/src/test/ui/run-pass/hygiene/hygiene.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused)] fn f() { diff --git a/src/test/run-pass/hygienic-labels-in-let.rs b/src/test/ui/run-pass/hygiene/hygienic-labels-in-let.rs similarity index 99% rename from src/test/run-pass/hygienic-labels-in-let.rs rename to src/test/ui/run-pass/hygiene/hygienic-labels-in-let.rs index 2aa5f59cda62..d68809a1c6e6 100644 --- a/src/test/run-pass/hygienic-labels-in-let.rs +++ b/src/test/ui/run-pass/hygiene/hygienic-labels-in-let.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that labels injected by macros do not break hygiene. This // checks cases where the macros invocations are under the rhs of a // let statement. diff --git a/src/test/ui/run-pass/hygiene/hygienic-labels-in-let.stderr b/src/test/ui/run-pass/hygiene/hygienic-labels-in-let.stderr new file mode 100644 index 000000000000..d96b99746a74 --- /dev/null +++ b/src/test/ui/run-pass/hygiene/hygienic-labels-in-let.stderr @@ -0,0 +1,300 @@ +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:23:9 + | +LL | 'x: loop { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: loop { + | -- first declared here +LL | // this 'x should refer to the outer loop, lexically +LL | loop_x!(break 'x); + | ------------------ in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:55:9 + | +LL | 'x: loop { + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:55:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:23:9 + | +LL | 'x: loop { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: loop { + | -- first declared here +... +LL | loop_x!(break 'x); + | ------------------ in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:23:9 + | +LL | 'x: loop { $e } + | ^^ + | | + | first declared here + | lifetime 'x already in scope +... +LL | loop_x!(break 'x); + | ------------------ in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:23:9 + | +LL | 'x: loop { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +LL | // ditto +LL | loop_x!(break 'x); + | ------------------ in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:65:9 + | +LL | 'x: loop { + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:65:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:65:9 + | +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:65:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:30:9 + | +LL | 'x: while 1 + 1 == 2 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: loop { + | -- first declared here +... +LL | while_true!(break 'x); + | ---------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:30:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: while 1 + 1 == 2 { $e } + | ^^ lifetime 'x already in scope +... +LL | while_true!(break 'x); + | ---------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:30:9 + | +LL | 'x: while 1 + 1 == 2 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | while_true!(break 'x); + | ---------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:30:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: while 1 + 1 == 2 { $e } + | ^^ lifetime 'x already in scope +... +LL | while_true!(break 'x); + | ---------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:30:9 + | +LL | 'x: while 1 + 1 == 2 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +LL | // ditto +LL | while_true!(break 'x); + | ---------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:75:9 + | +LL | 'x: loop { + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:75:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:75:9 + | +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:75:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:75:9 + | +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:75:9 + | +LL | 'x: while 1 + 1 == 2 { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:37:9 + | +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: loop { + | -- first declared here +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:37:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:37:9 + | +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:37:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:37:9 + | +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:37:9 + | +LL | 'x: while 1 + 1 == 2 { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels-in-let.rs:37:9 + | +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +LL | // ditto +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + diff --git a/src/test/run-pass/hygienic-labels.rs b/src/test/ui/run-pass/hygiene/hygienic-labels.rs similarity index 99% rename from src/test/run-pass/hygienic-labels.rs rename to src/test/ui/run-pass/hygiene/hygienic-labels.rs index a5882f022920..723ffb30b7f8 100644 --- a/src/test/run-pass/hygienic-labels.rs +++ b/src/test/ui/run-pass/hygiene/hygienic-labels.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that labels injected by macros do not break hygiene. // Issue #24278: The label/lifetime shadowing checker from #24162 diff --git a/src/test/ui/run-pass/hygiene/hygienic-labels.stderr b/src/test/ui/run-pass/hygiene/hygienic-labels.stderr new file mode 100644 index 000000000000..45c0cacde9a0 --- /dev/null +++ b/src/test/ui/run-pass/hygiene/hygienic-labels.stderr @@ -0,0 +1,299 @@ +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:21:9 + | +LL | 'x: loop { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +LL | // this 'x should refer to the outer loop, lexically +LL | loop_x!(break 'x); + | ------------------ in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:46:5 + | +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | 'x: loop { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:46:5 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: loop { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:21:9 + | +LL | 'x: loop { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | loop_x!(break 'x); + | ------------------ in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:21:9 + | +LL | 'x: loop { $e } + | ^^ + | | + | first declared here + | lifetime 'x already in scope +... +LL | loop_x!(break 'x); + | ------------------ in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:21:9 + | +LL | 'x: loop { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: loop { + | -- first declared here +LL | // ditto +LL | loop_x!(break 'x); + | ------------------ in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:52:5 + | +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | 'x: while 1 + 1 == 2 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:52:5 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: while 1 + 1 == 2 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:52:5 + | +LL | 'x: loop { + | -- first declared here +... +LL | 'x: while 1 + 1 == 2 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:52:5 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: while 1 + 1 == 2 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:35:9 + | +LL | 'x: while 1 + 1 == 2 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | while_x!(break 'x); + | ------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:35:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: while 1 + 1 == 2 { $e } + | ^^ lifetime 'x already in scope +... +LL | while_x!(break 'x); + | ------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:35:9 + | +LL | 'x: while 1 + 1 == 2 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: loop { + | -- first declared here +... +LL | while_x!(break 'x); + | ------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:35:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: while 1 + 1 == 2 { $e } + | ^^ lifetime 'x already in scope +... +LL | while_x!(break 'x); + | ------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:35:9 + | +LL | 'x: while 1 + 1 == 2 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: while 1 + 1 == 2 { + | -- first declared here +LL | while_x!(break 'x); + | ------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:57:5 + | +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:57:5 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:57:5 + | +LL | 'x: loop { + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:57:5 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:57:5 + | +LL | 'x: while 1 + 1 == 2 { + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:57:5 + | +LL | 'x: while 1 + 1 == 2 { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { + | ^^ lifetime 'x already in scope + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:28:9 + | +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:28:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:28:9 + | +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: loop { + | -- first declared here +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:28:9 + | +LL | 'x: loop { $e } + | -- first declared here +... +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:28:9 + | +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: while 1 + 1 == 2 { + | -- first declared here +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:28:9 + | +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: while 1 + 1 == 2 { $e } + | -- first declared here +... +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + +warning: label name `'x` shadows a label name that is already in scope + --> $DIR/hygienic-labels.rs:28:9 + | +LL | 'x: for _ in 0..1 { $e } + | ^^ lifetime 'x already in scope +... +LL | 'x: for _ in 0..1 { + | -- first declared here +LL | // ditto +LL | run_once!(continue 'x); + | ----------------------- in this macro invocation + diff --git a/src/test/run-pass/hygiene/issue-44128.rs b/src/test/ui/run-pass/hygiene/issue-44128.rs similarity index 98% rename from src/test/run-pass/hygiene/issue-44128.rs rename to src/test/ui/run-pass/hygiene/issue-44128.rs index 213ee1edff4e..879cd851434d 100644 --- a/src/test/run-pass/hygiene/issue-44128.rs +++ b/src/test/ui/run-pass/hygiene/issue-44128.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(decl_macro)] pub macro create_struct($a:ident) { diff --git a/src/test/run-pass/hygiene/issue-47311.rs b/src/test/ui/run-pass/hygiene/issue-47311.rs similarity index 98% rename from src/test/run-pass/hygiene/issue-47311.rs rename to src/test/ui/run-pass/hygiene/issue-47311.rs index 3b6890cdce63..43c4fc747e7e 100644 --- a/src/test/run-pass/hygiene/issue-47311.rs +++ b/src/test/ui/run-pass/hygiene/issue-47311.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/issue-47312.rs b/src/test/ui/run-pass/hygiene/issue-47312.rs similarity index 98% rename from src/test/run-pass/hygiene/issue-47312.rs rename to src/test/ui/run-pass/hygiene/issue-47312.rs index 5e83f3808d8c..68166912f5f9 100644 --- a/src/test/run-pass/hygiene/issue-47312.rs +++ b/src/test/ui/run-pass/hygiene/issue-47312.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/items.rs b/src/test/ui/run-pass/hygiene/items.rs similarity index 98% rename from src/test/run-pass/hygiene/items.rs rename to src/test/ui/run-pass/hygiene/items.rs index 121c341a124c..1c2155238926 100644 --- a/src/test/run-pass/hygiene/items.rs +++ b/src/test/ui/run-pass/hygiene/items.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/legacy_interaction.rs b/src/test/ui/run-pass/hygiene/legacy_interaction.rs similarity index 99% rename from src/test/run-pass/hygiene/legacy_interaction.rs rename to src/test/ui/run-pass/hygiene/legacy_interaction.rs index 683a15b99aeb..d0845b5802bc 100644 --- a/src/test/run-pass/hygiene/legacy_interaction.rs +++ b/src/test/ui/run-pass/hygiene/legacy_interaction.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic // aux-build:legacy_interaction.rs diff --git a/src/test/run-pass/hygiene/lexical.rs b/src/test/ui/run-pass/hygiene/lexical.rs similarity index 98% rename from src/test/run-pass/hygiene/lexical.rs rename to src/test/ui/run-pass/hygiene/lexical.rs index cb02a17fec38..9dc116d3af76 100644 --- a/src/test/run-pass/hygiene/lexical.rs +++ b/src/test/ui/run-pass/hygiene/lexical.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/specialization.rs b/src/test/ui/run-pass/hygiene/specialization.rs similarity index 98% rename from src/test/run-pass/hygiene/specialization.rs rename to src/test/ui/run-pass/hygiene/specialization.rs index 3d46d2ec99ef..a1ab5b78ca05 100644 --- a/src/test/run-pass/hygiene/specialization.rs +++ b/src/test/ui/run-pass/hygiene/specialization.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/trait_items.rs b/src/test/ui/run-pass/hygiene/trait_items.rs similarity index 98% rename from src/test/run-pass/hygiene/trait_items.rs rename to src/test/ui/run-pass/hygiene/trait_items.rs index 2344c97ce1b1..4007f5b5c8f0 100644 --- a/src/test/run-pass/hygiene/trait_items.rs +++ b/src/test/ui/run-pass/hygiene/trait_items.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/ty_params.rs b/src/test/ui/run-pass/hygiene/ty_params.rs similarity index 98% rename from src/test/run-pass/hygiene/ty_params.rs rename to src/test/ui/run-pass/hygiene/ty_params.rs index 510528ede40c..a057f2fc5ce7 100644 --- a/src/test/run-pass/hygiene/ty_params.rs +++ b/src/test/ui/run-pass/hygiene/ty_params.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic #![feature(decl_macro)] diff --git a/src/test/run-pass/hygiene/wrap_unhygienic_example.rs b/src/test/ui/run-pass/hygiene/wrap_unhygienic_example.rs similarity index 99% rename from src/test/run-pass/hygiene/wrap_unhygienic_example.rs rename to src/test/ui/run-pass/hygiene/wrap_unhygienic_example.rs index 552069502143..9516bfe50b6c 100644 --- a/src/test/run-pass/hygiene/wrap_unhygienic_example.rs +++ b/src/test/ui/run-pass/hygiene/wrap_unhygienic_example.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic // aux-build:my_crate.rs diff --git a/src/test/run-pass/hygiene/xcrate.rs b/src/test/ui/run-pass/hygiene/xcrate.rs similarity index 98% rename from src/test/run-pass/hygiene/xcrate.rs rename to src/test/ui/run-pass/hygiene/xcrate.rs index 6df3a34d3c87..3e330fe3862e 100644 --- a/src/test/run-pass/hygiene/xcrate.rs +++ b/src/test/ui/run-pass/hygiene/xcrate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty pretty-printing is unhygienic // aux-build:xcrate.rs diff --git a/src/test/run-pass/impl-trait/auto-trait-leak.rs b/src/test/ui/run-pass/impl-trait/auto-trait-leak.rs similarity index 98% rename from src/test/run-pass/impl-trait/auto-trait-leak.rs rename to src/test/ui/run-pass/impl-trait/auto-trait-leak.rs index 62fbae7b40c0..fb252b01f857 100644 --- a/src/test/run-pass/impl-trait/auto-trait-leak.rs +++ b/src/test/ui/run-pass/impl-trait/auto-trait-leak.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Fast path, main can see the concrete type returned. fn before() -> impl FnMut(i32) { let mut p = Box::new(0); diff --git a/src/test/run-pass/impl-trait/auxiliary/xcrate.rs b/src/test/ui/run-pass/impl-trait/auxiliary/xcrate.rs similarity index 100% rename from src/test/run-pass/impl-trait/auxiliary/xcrate.rs rename to src/test/ui/run-pass/impl-trait/auxiliary/xcrate.rs diff --git a/src/test/run-pass/impl-trait/bounds_regression.rs b/src/test/ui/run-pass/impl-trait/bounds_regression.rs similarity index 98% rename from src/test/run-pass/impl-trait/bounds_regression.rs rename to src/test/ui/run-pass/impl-trait/bounds_regression.rs index cc931a68edd0..b6abfdebfa85 100644 --- a/src/test/run-pass/impl-trait/bounds_regression.rs +++ b/src/test/ui/run-pass/impl-trait/bounds_regression.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + pub trait FakeGenerator { type Yield; type Return; diff --git a/src/test/run-pass/impl-trait/equality.rs b/src/test/ui/run-pass/impl-trait/equality.rs similarity index 99% rename from src/test/run-pass/impl-trait/equality.rs rename to src/test/ui/run-pass/impl-trait/equality.rs index 034d3d7c80f3..5026f10b6f86 100644 --- a/src/test/run-pass/impl-trait/equality.rs +++ b/src/test/ui/run-pass/impl-trait/equality.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(specialization)] trait Foo: std::fmt::Debug + Eq {} diff --git a/src/test/run-pass/impl-trait/example-calendar.rs b/src/test/ui/run-pass/impl-trait/example-calendar.rs similarity index 99% rename from src/test/run-pass/impl-trait/example-calendar.rs rename to src/test/ui/run-pass/impl-trait/example-calendar.rs index fce31256db49..6cf06d156210 100644 --- a/src/test/run-pass/impl-trait/example-calendar.rs +++ b/src/test/ui/run-pass/impl-trait/example-calendar.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // revisions: normal nll //[nll] compile-flags:-Zborrowck=mir diff --git a/src/test/run-pass/impl-trait/example-st.rs b/src/test/ui/run-pass/impl-trait/example-st.rs similarity index 98% rename from src/test/run-pass/impl-trait/example-st.rs rename to src/test/ui/run-pass/impl-trait/example-st.rs index a06bde7f532d..014af37ccf98 100644 --- a/src/test/run-pass/impl-trait/example-st.rs +++ b/src/test/ui/run-pass/impl-trait/example-st.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + struct State; type Error = (); diff --git a/src/test/run-pass/impl-trait/existential-minimal.rs b/src/test/ui/run-pass/impl-trait/existential-minimal.rs similarity index 97% rename from src/test/run-pass/impl-trait/existential-minimal.rs rename to src/test/ui/run-pass/impl-trait/existential-minimal.rs index 4e9d786dda05..bae4c685e7c4 100644 --- a/src/test/run-pass/impl-trait/existential-minimal.rs +++ b/src/test/ui/run-pass/impl-trait/existential-minimal.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + fn main() {} fn foo() -> impl std::fmt::Debug { "cake" } diff --git a/src/test/run-pass/impl-trait/issue-42479.rs b/src/test/ui/run-pass/impl-trait/issue-42479.rs similarity index 98% rename from src/test/run-pass/impl-trait/issue-42479.rs rename to src/test/ui/run-pass/impl-trait/issue-42479.rs index df7a6c130922..1da5cd36ca94 100644 --- a/src/test/run-pass/impl-trait/issue-42479.rs +++ b/src/test/ui/run-pass/impl-trait/issue-42479.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::iter::once; struct Foo { diff --git a/src/test/run-pass/impl-trait/issue-49376.rs b/src/test/ui/run-pass/impl-trait/issue-49376.rs similarity index 98% rename from src/test/run-pass/impl-trait/issue-49376.rs rename to src/test/ui/run-pass/impl-trait/issue-49376.rs index b687b485fce2..10379dad37d9 100644 --- a/src/test/run-pass/impl-trait/issue-49376.rs +++ b/src/test/ui/run-pass/impl-trait/issue-49376.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Tests for nested self-reference which caused a stack overflow. use std::fmt::Debug; diff --git a/src/test/run-pass/impl-trait/lifetimes.rs b/src/test/ui/run-pass/impl-trait/lifetimes.rs similarity index 99% rename from src/test/run-pass/impl-trait/lifetimes.rs rename to src/test/ui/run-pass/impl-trait/lifetimes.rs index d126d795d909..e5a98962ff3a 100644 --- a/src/test/run-pass/impl-trait/lifetimes.rs +++ b/src/test/ui/run-pass/impl-trait/lifetimes.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![allow(warnings)] use std::fmt::Debug; diff --git a/src/test/run-pass/impl-trait/nesting.rs b/src/test/ui/run-pass/impl-trait/nesting.rs similarity index 98% rename from src/test/run-pass/impl-trait/nesting.rs rename to src/test/ui/run-pass/impl-trait/nesting.rs index 73e6c1c0d1d6..f721ace0afe8 100644 --- a/src/test/run-pass/impl-trait/nesting.rs +++ b/src/test/ui/run-pass/impl-trait/nesting.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + fn foo(t: T) -> impl Into<[T; { const FOO: usize = 1; FOO }]> { [t] } diff --git a/src/test/run-pass/impl-trait/universal_hrtb_anon.rs b/src/test/ui/run-pass/impl-trait/universal_hrtb_anon.rs similarity index 97% rename from src/test/run-pass/impl-trait/universal_hrtb_anon.rs rename to src/test/ui/run-pass/impl-trait/universal_hrtb_anon.rs index 9fc74757da0b..b78ec557d090 100644 --- a/src/test/run-pass/impl-trait/universal_hrtb_anon.rs +++ b/src/test/ui/run-pass/impl-trait/universal_hrtb_anon.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + fn hrtb(f: impl Fn(&u32) -> u32) -> u32 { f(&22) + f(&44) } diff --git a/src/test/run-pass/impl-trait/universal_hrtb_named.rs b/src/test/ui/run-pass/impl-trait/universal_hrtb_named.rs similarity index 97% rename from src/test/run-pass/impl-trait/universal_hrtb_named.rs rename to src/test/ui/run-pass/impl-trait/universal_hrtb_named.rs index 3aefc79ebf78..0bec594346bb 100644 --- a/src/test/run-pass/impl-trait/universal_hrtb_named.rs +++ b/src/test/ui/run-pass/impl-trait/universal_hrtb_named.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + fn hrtb(f: impl for<'a> Fn(&'a u32) -> &'a u32) -> u32 { f(&22) + f(&44) } diff --git a/src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs b/src/test/ui/run-pass/impl-trait/universal_in_adt_in_parameters.rs similarity index 98% rename from src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs rename to src/test/ui/run-pass/impl-trait/universal_in_adt_in_parameters.rs index 57452a2e475c..95e6a3efdf09 100644 --- a/src/test/run-pass/impl-trait/universal_in_adt_in_parameters.rs +++ b/src/test/ui/run-pass/impl-trait/universal_in_adt_in_parameters.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::fmt::Display; fn check_display_eq(iter: &Vec) { diff --git a/src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs b/src/test/ui/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs similarity index 99% rename from src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs rename to src/test/ui/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs index fea946f12584..b9c68c280f10 100644 --- a/src/test/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs +++ b/src/test/ui/run-pass/impl-trait/universal_in_impl_trait_in_parameters.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::fmt::Display; fn check_display_eq(iter: impl IntoIterator) { diff --git a/src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs b/src/test/ui/run-pass/impl-trait/universal_in_trait_defn_parameters.rs similarity index 98% rename from src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs rename to src/test/ui/run-pass/impl-trait/universal_in_trait_defn_parameters.rs index d3611e02e025..6fb44147c1cd 100644 --- a/src/test/run-pass/impl-trait/universal_in_trait_defn_parameters.rs +++ b/src/test/ui/run-pass/impl-trait/universal_in_trait_defn_parameters.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::fmt::Debug; trait InTraitDefnParameters { diff --git a/src/test/run-pass/impl-trait/universal_multiple_bounds.rs b/src/test/ui/run-pass/impl-trait/universal_multiple_bounds.rs similarity index 98% rename from src/test/run-pass/impl-trait/universal_multiple_bounds.rs rename to src/test/ui/run-pass/impl-trait/universal_multiple_bounds.rs index 594207feb09a..9b1c2b92446f 100644 --- a/src/test/run-pass/impl-trait/universal_multiple_bounds.rs +++ b/src/test/ui/run-pass/impl-trait/universal_multiple_bounds.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::fmt::Display; fn foo(f: impl Display + Clone) -> String { diff --git a/src/test/run-pass/impl-trait/xcrate.rs b/src/test/ui/run-pass/impl-trait/xcrate.rs similarity index 98% rename from src/test/run-pass/impl-trait/xcrate.rs rename to src/test/ui/run-pass/impl-trait/xcrate.rs index 35ae185b3e1d..aa5d3298f697 100644 --- a/src/test/run-pass/impl-trait/xcrate.rs +++ b/src/test/ui/run-pass/impl-trait/xcrate.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:xcrate.rs extern crate xcrate; diff --git a/src/test/run-pass/impl-trait/xcrate_simple.rs b/src/test/ui/run-pass/impl-trait/xcrate_simple.rs similarity index 97% rename from src/test/run-pass/impl-trait/xcrate_simple.rs rename to src/test/ui/run-pass/impl-trait/xcrate_simple.rs index 8d4086cc8804..8b7c8ada1c01 100644 --- a/src/test/run-pass/impl-trait/xcrate_simple.rs +++ b/src/test/ui/run-pass/impl-trait/xcrate_simple.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:xcrate.rs extern crate xcrate; diff --git a/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs b/src/test/ui/run-pass/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs similarity index 100% rename from src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs rename to src/test/ui/run-pass/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans.rs diff --git a/src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs b/src/test/ui/run-pass/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs similarity index 100% rename from src/test/run-pass/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs rename to src/test/ui/run-pass/imports/import-crate-with-invalid-spans/auxiliary/crate_with_invalid_spans_macros.rs diff --git a/src/test/run-pass/import-crate-with-invalid-spans/main.rs b/src/test/ui/run-pass/imports/import-crate-with-invalid-spans/main.rs similarity index 98% rename from src/test/run-pass/import-crate-with-invalid-spans/main.rs rename to src/test/ui/run-pass/imports/import-crate-with-invalid-spans/main.rs index 2f80a0954dc0..990758d52ff7 100644 --- a/src/test/run-pass/import-crate-with-invalid-spans/main.rs +++ b/src/test/ui/run-pass/imports/import-crate-with-invalid-spans/main.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:crate_with_invalid_spans.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/import-from.rs b/src/test/ui/run-pass/imports/import-from.rs similarity index 98% rename from src/test/run-pass/import-from.rs rename to src/test/ui/run-pass/imports/import-from.rs index 9ac35fbb3875..5f498a48584f 100644 --- a/src/test/run-pass/import-from.rs +++ b/src/test/ui/run-pass/imports/import-from.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use spam::{ham, eggs}; diff --git a/src/test/run-pass/import-glob-0.rs b/src/test/ui/run-pass/imports/import-glob-0.rs similarity index 98% rename from src/test/run-pass/import-glob-0.rs rename to src/test/ui/run-pass/imports/import-glob-0.rs index a57b8de629eb..f72fb1f0b135 100644 --- a/src/test/run-pass/import-glob-0.rs +++ b/src/test/ui/run-pass/imports/import-glob-0.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use module_of_many_things::*; use dug::too::greedily::and::too::deep::*; diff --git a/src/test/run-pass/import-glob-1.rs b/src/test/ui/run-pass/imports/import-glob-1.rs similarity index 98% rename from src/test/run-pass/import-glob-1.rs rename to src/test/ui/run-pass/imports/import-glob-1.rs index a7949e7d6e3b..b1f40d749178 100644 --- a/src/test/run-pass/import-glob-1.rs +++ b/src/test/ui/run-pass/imports/import-glob-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This should resolve fine. Prior to fix, the last import // was being tried too early, and marked as unrsolved before // the glob import had a chance to be resolved. diff --git a/src/test/run-pass/import-glob-crate.rs b/src/test/ui/run-pass/imports/import-glob-crate.rs similarity index 98% rename from src/test/run-pass/import-glob-crate.rs rename to src/test/ui/run-pass/imports/import-glob-crate.rs index fec46c7e1f82..4ec5e1bd9457 100644 --- a/src/test/run-pass/import-glob-crate.rs +++ b/src/test/ui/run-pass/imports/import-glob-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem::*; pub fn main() { diff --git a/src/test/run-pass/import-in-block.rs b/src/test/ui/run-pass/imports/import-in-block.rs similarity index 98% rename from src/test/run-pass/import-in-block.rs rename to src/test/ui/run-pass/imports/import-in-block.rs index 532cdbbee3cd..655bd31b4de8 100644 --- a/src/test/run-pass/import-in-block.rs +++ b/src/test/ui/run-pass/imports/import-in-block.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/import-prefix-macro.rs b/src/test/ui/run-pass/imports/import-prefix-macro.rs similarity index 98% rename from src/test/run-pass/import-prefix-macro.rs rename to src/test/ui/run-pass/imports/import-prefix-macro.rs index cfe4ff78e625..ceb662c6e3d0 100644 --- a/src/test/run-pass/import-prefix-macro.rs +++ b/src/test/ui/run-pass/imports/import-prefix-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod a { pub mod b { pub mod c { diff --git a/src/test/run-pass/import-rename.rs b/src/test/ui/run-pass/imports/import-rename.rs similarity index 98% rename from src/test/run-pass/import-rename.rs rename to src/test/ui/run-pass/imports/import-rename.rs index f293c284f946..8d4757f0a477 100644 --- a/src/test/run-pass/import-rename.rs +++ b/src/test/ui/run-pass/imports/import-rename.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use foo::{x, y as fooy}; use Maybe::{Yes as MaybeYes}; diff --git a/src/test/run-pass/import-trailing-comma.rs b/src/test/ui/run-pass/imports/import-trailing-comma.rs similarity index 98% rename from src/test/run-pass/import-trailing-comma.rs rename to src/test/ui/run-pass/imports/import-trailing-comma.rs index c47448536223..6c3371b46c73 100644 --- a/src/test/run-pass/import-trailing-comma.rs +++ b/src/test/ui/run-pass/imports/import-trailing-comma.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use foo::bar::{baz, quux,}; diff --git a/src/test/run-pass/import.rs b/src/test/ui/run-pass/imports/import.rs similarity index 98% rename from src/test/run-pass/import.rs rename to src/test/ui/run-pass/imports/import.rs index c2b459d28872..cb2152f5faca 100644 --- a/src/test/run-pass/import.rs +++ b/src/test/ui/run-pass/imports/import.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod foo { pub fn x(y: isize) { println!("{}", y); } } diff --git a/src/test/run-pass/import2.rs b/src/test/ui/run-pass/imports/import2.rs similarity index 97% rename from src/test/run-pass/import2.rs rename to src/test/ui/run-pass/imports/import2.rs index 4086acc0a8eb..aaf65fc1c8ca 100644 --- a/src/test/run-pass/import2.rs +++ b/src/test/ui/run-pass/imports/import2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use zed::bar; diff --git a/src/test/run-pass/import3.rs b/src/test/ui/run-pass/imports/import3.rs similarity index 98% rename from src/test/run-pass/import3.rs rename to src/test/ui/run-pass/imports/import3.rs index 2c09eff7b12e..38e316f550b0 100644 --- a/src/test/run-pass/import3.rs +++ b/src/test/ui/run-pass/imports/import3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused_imports)] use baz::zed; diff --git a/src/test/run-pass/import4.rs b/src/test/ui/run-pass/imports/import4.rs similarity index 97% rename from src/test/run-pass/import4.rs rename to src/test/ui/run-pass/imports/import4.rs index 229813ff55ce..057e1cb5e017 100644 --- a/src/test/run-pass/import4.rs +++ b/src/test/ui/run-pass/imports/import4.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use zed::bar; diff --git a/src/test/run-pass/import5.rs b/src/test/ui/run-pass/imports/import5.rs similarity index 98% rename from src/test/run-pass/import5.rs rename to src/test/ui/run-pass/imports/import5.rs index 0cad094d55dd..614c8c435c91 100644 --- a/src/test/run-pass/import5.rs +++ b/src/test/ui/run-pass/imports/import5.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use foo::bar; mod foo { pub use foo::zed::bar; diff --git a/src/test/run-pass/import6.rs b/src/test/ui/run-pass/imports/import6.rs similarity index 98% rename from src/test/run-pass/import6.rs rename to src/test/ui/run-pass/imports/import6.rs index 545bd7cee5ea..d98d5b3b0e16 100644 --- a/src/test/run-pass/import6.rs +++ b/src/test/ui/run-pass/imports/import6.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused_imports)] use foo::zed; diff --git a/src/test/run-pass/import7.rs b/src/test/ui/run-pass/imports/import7.rs similarity index 98% rename from src/test/run-pass/import7.rs rename to src/test/ui/run-pass/imports/import7.rs index 4b9d1328951f..67e41824e0dc 100644 --- a/src/test/run-pass/import7.rs +++ b/src/test/ui/run-pass/imports/import7.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused_imports)] use foo::zed; diff --git a/src/test/run-pass/import8.rs b/src/test/ui/run-pass/imports/import8.rs similarity index 98% rename from src/test/run-pass/import8.rs rename to src/test/ui/run-pass/imports/import8.rs index 0f3891bf0671..71dd7acac5ad 100644 --- a/src/test/run-pass/import8.rs +++ b/src/test/ui/run-pass/imports/import8.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use foo::x; use foo::x as z; diff --git a/src/test/run-pass/imports.rs b/src/test/ui/run-pass/imports/imports.rs similarity index 99% rename from src/test/run-pass/imports.rs rename to src/test/ui/run-pass/imports/imports.rs index f845a2ee5716..7ca7ea1fd8c2 100644 --- a/src/test/run-pass/imports.rs +++ b/src/test/ui/run-pass/imports/imports.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused)] // Like other items, private imports can be imported and used non-lexically in paths. diff --git a/src/test/run-pass/auxiliary/cci_intrinsic.rs b/src/test/ui/run-pass/intrinsics/auxiliary/cci_intrinsic.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_intrinsic.rs rename to src/test/ui/run-pass/intrinsics/auxiliary/cci_intrinsic.rs diff --git a/src/test/run-pass/intrinsic-alignment.rs b/src/test/ui/run-pass/intrinsics/intrinsic-alignment.rs similarity index 99% rename from src/test/run-pass/intrinsic-alignment.rs rename to src/test/ui/run-pass/intrinsics/intrinsic-alignment.rs index 5a6a6e0163ed..0c1f7724ca86 100644 --- a/src/test/run-pass/intrinsic-alignment.rs +++ b/src/test/ui/run-pass/intrinsics/intrinsic-alignment.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare seems not important to test here #![feature(intrinsics, main)] diff --git a/src/test/run-pass/intrinsic-assume.rs b/src/test/ui/run-pass/intrinsics/intrinsic-assume.rs similarity index 98% rename from src/test/run-pass/intrinsic-assume.rs rename to src/test/ui/run-pass/intrinsics/intrinsic-assume.rs index 41ef62b0ced3..e428c0e50abe 100644 --- a/src/test/run-pass/intrinsic-assume.rs +++ b/src/test/ui/run-pass/intrinsics/intrinsic-assume.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(core_intrinsics)] use std::intrinsics::assume; diff --git a/src/test/run-pass/intrinsic-atomics-cc.rs b/src/test/ui/run-pass/intrinsics/intrinsic-atomics-cc.rs similarity index 98% rename from src/test/run-pass/intrinsic-atomics-cc.rs rename to src/test/ui/run-pass/intrinsics/intrinsic-atomics-cc.rs index abb85cc7f194..ce8b07c90750 100644 --- a/src/test/run-pass/intrinsic-atomics-cc.rs +++ b/src/test/ui/run-pass/intrinsics/intrinsic-atomics-cc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_intrinsic.rs diff --git a/src/test/run-pass/intrinsic-atomics.rs b/src/test/ui/run-pass/intrinsics/intrinsic-atomics.rs similarity index 99% rename from src/test/run-pass/intrinsic-atomics.rs rename to src/test/ui/run-pass/intrinsics/intrinsic-atomics.rs index 4b11158e8c3d..d238a57a076e 100644 --- a/src/test/run-pass/intrinsic-atomics.rs +++ b/src/test/ui/run-pass/intrinsics/intrinsic-atomics.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] #![feature(intrinsics)] diff --git a/src/test/run-pass/intrinsic-move-val-cleanups.rs b/src/test/ui/run-pass/intrinsics/intrinsic-move-val-cleanups.rs similarity index 99% rename from src/test/run-pass/intrinsic-move-val-cleanups.rs rename to src/test/ui/run-pass/intrinsics/intrinsic-move-val-cleanups.rs index 8f22579423fd..5b04daeb3320 100644 --- a/src/test/run-pass/intrinsic-move-val-cleanups.rs +++ b/src/test/ui/run-pass/intrinsics/intrinsic-move-val-cleanups.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support +#![allow(stable_features)] // This test is checking that the move_val_init intrinsic is // respecting cleanups for both of its argument expressions. diff --git a/src/test/run-pass/intrinsic-move-val.rs b/src/test/ui/run-pass/intrinsics/intrinsic-move-val.rs similarity index 99% rename from src/test/run-pass/intrinsic-move-val.rs rename to src/test/ui/run-pass/intrinsics/intrinsic-move-val.rs index ea42b59f1f2b..dcc495e59236 100644 --- a/src/test/run-pass/intrinsic-move-val.rs +++ b/src/test/ui/run-pass/intrinsics/intrinsic-move-val.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] #![feature(intrinsics)] diff --git a/src/test/run-pass/intrinsic-uninit.rs b/src/test/ui/run-pass/intrinsics/intrinsic-uninit.rs similarity index 98% rename from src/test/run-pass/intrinsic-uninit.rs rename to src/test/ui/run-pass/intrinsics/intrinsic-uninit.rs index 3d2c1ec5c197..0f58bdbb9c58 100644 --- a/src/test/run-pass/intrinsic-uninit.rs +++ b/src/test/ui/run-pass/intrinsics/intrinsic-uninit.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(intrinsics)] diff --git a/src/test/run-pass/intrinsic-unreachable.rs b/src/test/ui/run-pass/intrinsics/intrinsic-unreachable.rs similarity index 98% rename from src/test/run-pass/intrinsic-unreachable.rs rename to src/test/ui/run-pass/intrinsics/intrinsic-unreachable.rs index 0ce446e445c7..586d0a352f93 100644 --- a/src/test/run-pass/intrinsic-unreachable.rs +++ b/src/test/ui/run-pass/intrinsics/intrinsic-unreachable.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(core_intrinsics)] use std::intrinsics; diff --git a/src/test/run-pass/intrinsics-integer.rs b/src/test/ui/run-pass/intrinsics/intrinsics-integer.rs similarity index 99% rename from src/test/run-pass/intrinsics-integer.rs rename to src/test/ui/run-pass/intrinsics/intrinsics-integer.rs index 7a8ff1befc7f..97c1c93cfd47 100644 --- a/src/test/run-pass/intrinsics-integer.rs +++ b/src/test/ui/run-pass/intrinsics/intrinsics-integer.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no i128 support #![feature(intrinsics)] diff --git a/src/test/run-pass/intrinsics-math.rs b/src/test/ui/run-pass/intrinsics/intrinsics-math.rs similarity index 99% rename from src/test/run-pass/intrinsics-math.rs rename to src/test/ui/run-pass/intrinsics/intrinsics-math.rs index 5132405a9d58..d08386beb9e1 100644 --- a/src/test/run-pass/intrinsics-math.rs +++ b/src/test/ui/run-pass/intrinsics/intrinsics-math.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten fma not implemented in emscripten macro_rules! assert_approx_eq { diff --git a/src/test/run-pass/auxiliary/cgu_test.rs b/src/test/ui/run-pass/issues/auxiliary/cgu_test.rs similarity index 100% rename from src/test/run-pass/auxiliary/cgu_test.rs rename to src/test/ui/run-pass/issues/auxiliary/cgu_test.rs diff --git a/src/test/run-pass/auxiliary/cgu_test_a.rs b/src/test/ui/run-pass/issues/auxiliary/cgu_test_a.rs similarity index 100% rename from src/test/run-pass/auxiliary/cgu_test_a.rs rename to src/test/ui/run-pass/issues/auxiliary/cgu_test_a.rs diff --git a/src/test/run-pass/auxiliary/cgu_test_b.rs b/src/test/ui/run-pass/issues/auxiliary/cgu_test_b.rs similarity index 100% rename from src/test/run-pass/auxiliary/cgu_test_b.rs rename to src/test/ui/run-pass/issues/auxiliary/cgu_test_b.rs diff --git a/src/test/run-pass/auxiliary/i8.rs b/src/test/ui/run-pass/issues/auxiliary/i8.rs similarity index 100% rename from src/test/run-pass/auxiliary/i8.rs rename to src/test/ui/run-pass/issues/auxiliary/i8.rs diff --git a/src/test/run-pass/auxiliary/iss.rs b/src/test/ui/run-pass/issues/auxiliary/iss.rs similarity index 100% rename from src/test/run-pass/auxiliary/iss.rs rename to src/test/ui/run-pass/issues/auxiliary/iss.rs diff --git a/src/test/run-pass/auxiliary/issue-10028.rs b/src/test/ui/run-pass/issues/auxiliary/issue-10028.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-10028.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-10028.rs diff --git a/src/test/run-pass/auxiliary/issue-11224.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11224.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-11224.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-11224.rs diff --git a/src/test/run-pass/auxiliary/issue-11225-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11225-1.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-11225-1.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-11225-1.rs diff --git a/src/test/run-pass/auxiliary/issue-11225-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11225-2.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-11225-2.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-11225-2.rs diff --git a/src/test/run-pass/auxiliary/issue-11225-3.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11225-3.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-11225-3.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-11225-3.rs diff --git a/src/test/run-pass/auxiliary/issue-11508.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11508.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-11508.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-11508.rs diff --git a/src/test/run-pass/auxiliary/issue-11529.rs b/src/test/ui/run-pass/issues/auxiliary/issue-11529.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-11529.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-11529.rs diff --git a/src/test/run-pass/auxiliary/issue-12133-dylib.rs b/src/test/ui/run-pass/issues/auxiliary/issue-12133-dylib.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-12133-dylib.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-12133-dylib.rs diff --git a/src/test/run-pass/auxiliary/issue-12133-dylib2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-12133-dylib2.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-12133-dylib2.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-12133-dylib2.rs diff --git a/src/test/run-pass/auxiliary/issue-12133-rlib.rs b/src/test/ui/run-pass/issues/auxiliary/issue-12133-rlib.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-12133-rlib.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-12133-rlib.rs diff --git a/src/test/run-pass/auxiliary/issue-12660-aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue-12660-aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-12660-aux.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-12660-aux.rs diff --git a/src/test/run-pass/auxiliary/issue-13620-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-13620-1.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-13620-1.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-13620-1.rs diff --git a/src/test/run-pass/auxiliary/issue-13620-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-13620-2.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-13620-2.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-13620-2.rs diff --git a/src/test/run-pass/auxiliary/issue-13872-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-13872-1.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-13872-1.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-13872-1.rs diff --git a/src/test/run-pass/auxiliary/issue-13872-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-13872-2.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-13872-2.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-13872-2.rs diff --git a/src/test/run-pass/auxiliary/issue-13872-3.rs b/src/test/ui/run-pass/issues/auxiliary/issue-13872-3.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-13872-3.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-13872-3.rs diff --git a/src/test/run-pass/auxiliary/issue-14344-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-14344-1.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-14344-1.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-14344-1.rs diff --git a/src/test/run-pass/auxiliary/issue-14344-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-14344-2.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-14344-2.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-14344-2.rs diff --git a/src/test/run-pass/auxiliary/issue-14421.rs b/src/test/ui/run-pass/issues/auxiliary/issue-14421.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-14421.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-14421.rs diff --git a/src/test/run-pass/auxiliary/issue-14422.rs b/src/test/ui/run-pass/issues/auxiliary/issue-14422.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-14422.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-14422.rs diff --git a/src/test/run-pass/auxiliary/issue-15562.rs b/src/test/ui/run-pass/issues/auxiliary/issue-15562.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-15562.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-15562.rs diff --git a/src/test/run-pass/auxiliary/issue-16643.rs b/src/test/ui/run-pass/issues/auxiliary/issue-16643.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-16643.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-16643.rs diff --git a/src/test/run-pass/auxiliary/issue-17662.rs b/src/test/ui/run-pass/issues/auxiliary/issue-17662.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-17662.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-17662.rs diff --git a/src/test/run-pass/auxiliary/issue-17718-aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue-17718-aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-17718-aux.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-17718-aux.rs diff --git a/src/test/run-pass/auxiliary/issue-18501.rs b/src/test/ui/run-pass/issues/auxiliary/issue-18501.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-18501.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-18501.rs diff --git a/src/test/run-pass/auxiliary/issue-18514.rs b/src/test/ui/run-pass/issues/auxiliary/issue-18514.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-18514.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-18514.rs diff --git a/src/test/run-pass/auxiliary/issue-18711.rs b/src/test/ui/run-pass/issues/auxiliary/issue-18711.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-18711.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-18711.rs diff --git a/src/test/run-pass/auxiliary/issue-18913-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-18913-1.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-18913-1.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-18913-1.rs diff --git a/src/test/run-pass/auxiliary/issue-18913-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-18913-2.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-18913-2.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-18913-2.rs diff --git a/src/test/run-pass/auxiliary/issue-19340-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-19340-1.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-19340-1.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-19340-1.rs diff --git a/src/test/run-pass/auxiliary/issue-2380.rs b/src/test/ui/run-pass/issues/auxiliary/issue-2380.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-2380.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-2380.rs diff --git a/src/test/run-pass/auxiliary/issue-2414-a.rs b/src/test/ui/run-pass/issues/auxiliary/issue-2414-a.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-2414-a.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-2414-a.rs diff --git a/src/test/run-pass/auxiliary/issue-2414-b.rs b/src/test/ui/run-pass/issues/auxiliary/issue-2414-b.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-2414-b.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-2414-b.rs diff --git a/src/test/run-pass/auxiliary/issue-25185-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-25185-1.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-25185-1.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-25185-1.rs diff --git a/src/test/run-pass/auxiliary/issue-25185-2.rs b/src/test/ui/run-pass/issues/auxiliary/issue-25185-2.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-25185-2.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-25185-2.rs diff --git a/src/test/run-pass/auxiliary/issue-2526.rs b/src/test/ui/run-pass/issues/auxiliary/issue-2526.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-2526.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-2526.rs diff --git a/src/test/run-pass/auxiliary/issue-25467.rs b/src/test/ui/run-pass/issues/auxiliary/issue-25467.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-25467.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-25467.rs diff --git a/src/test/run-pass/auxiliary/issue-2631-a.rs b/src/test/ui/run-pass/issues/auxiliary/issue-2631-a.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-2631-a.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-2631-a.rs diff --git a/src/test/run-pass/auxiliary/issue-29485.rs b/src/test/ui/run-pass/issues/auxiliary/issue-29485.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-29485.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-29485.rs diff --git a/src/test/run-pass/auxiliary/issue-3012-1.rs b/src/test/ui/run-pass/issues/auxiliary/issue-3012-1.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-3012-1.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-3012-1.rs diff --git a/src/test/run-pass/auxiliary/issue-36954.rs b/src/test/ui/run-pass/issues/auxiliary/issue-36954.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-36954.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-36954.rs diff --git a/src/test/run-pass/auxiliary/issue-41394.rs b/src/test/ui/run-pass/issues/auxiliary/issue-41394.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-41394.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-41394.rs diff --git a/src/test/run-pass/auxiliary/issue-4208-cc.rs b/src/test/ui/run-pass/issues/auxiliary/issue-4208-cc.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-4208-cc.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-4208-cc.rs diff --git a/src/test/run-pass/auxiliary/issue-4545.rs b/src/test/ui/run-pass/issues/auxiliary/issue-4545.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-4545.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-4545.rs diff --git a/src/test/run-pass/auxiliary/issue-48984-aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue-48984-aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-48984-aux.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-48984-aux.rs diff --git a/src/test/run-pass/auxiliary/issue-5518.rs b/src/test/ui/run-pass/issues/auxiliary/issue-5518.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-5518.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-5518.rs diff --git a/src/test/run-pass/auxiliary/issue-5521.rs b/src/test/ui/run-pass/issues/auxiliary/issue-5521.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-5521.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-5521.rs diff --git a/src/test/run-pass/auxiliary/issue-7178.rs b/src/test/ui/run-pass/issues/auxiliary/issue-7178.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-7178.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-7178.rs diff --git a/src/test/run-pass/auxiliary/issue-7899.rs b/src/test/ui/run-pass/issues/auxiliary/issue-7899.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-7899.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-7899.rs diff --git a/src/test/run-pass/auxiliary/issue-8044.rs b/src/test/ui/run-pass/issues/auxiliary/issue-8044.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-8044.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-8044.rs diff --git a/src/test/run-pass/auxiliary/issue-8259.rs b/src/test/ui/run-pass/issues/auxiliary/issue-8259.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-8259.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-8259.rs diff --git a/src/test/run-pass/auxiliary/issue-9906.rs b/src/test/ui/run-pass/issues/auxiliary/issue-9906.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-9906.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-9906.rs diff --git a/src/test/run-pass/auxiliary/issue-9968.rs b/src/test/ui/run-pass/issues/auxiliary/issue-9968.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue-9968.rs rename to src/test/ui/run-pass/issues/auxiliary/issue-9968.rs diff --git a/src/test/run-pass/auxiliary/issue13507.rs b/src/test/ui/run-pass/issues/auxiliary/issue13507.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue13507.rs rename to src/test/ui/run-pass/issues/auxiliary/issue13507.rs diff --git a/src/test/run-pass/auxiliary/issue2170lib.rs b/src/test/ui/run-pass/issues/auxiliary/issue2170lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue2170lib.rs rename to src/test/ui/run-pass/issues/auxiliary/issue2170lib.rs diff --git a/src/test/run-pass/auxiliary/issue34796aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue34796aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue34796aux.rs rename to src/test/ui/run-pass/issues/auxiliary/issue34796aux.rs diff --git a/src/test/run-pass/auxiliary/issue_10031_aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue_10031_aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_10031_aux.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_10031_aux.rs diff --git a/src/test/run-pass/auxiliary/issue_12612_1.rs b/src/test/ui/run-pass/issues/auxiliary/issue_12612_1.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_12612_1.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_12612_1.rs diff --git a/src/test/run-pass/auxiliary/issue_12612_2.rs b/src/test/ui/run-pass/issues/auxiliary/issue_12612_2.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_12612_2.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_12612_2.rs diff --git a/src/test/run-pass/auxiliary/issue_19293.rs b/src/test/ui/run-pass/issues/auxiliary/issue_19293.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_19293.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_19293.rs diff --git a/src/test/run-pass/auxiliary/issue_20389.rs b/src/test/ui/run-pass/issues/auxiliary/issue_20389.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_20389.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_20389.rs diff --git a/src/test/run-pass/auxiliary/issue_2316_a.rs b/src/test/ui/run-pass/issues/auxiliary/issue_2316_a.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_2316_a.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_2316_a.rs diff --git a/src/test/run-pass/auxiliary/issue_2316_b.rs b/src/test/ui/run-pass/issues/auxiliary/issue_2316_b.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_2316_b.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_2316_b.rs diff --git a/src/test/run-pass/auxiliary/issue_2472_b.rs b/src/test/ui/run-pass/issues/auxiliary/issue_2472_b.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_2472_b.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_2472_b.rs diff --git a/src/test/run-pass/auxiliary/issue_2723_a.rs b/src/test/ui/run-pass/issues/auxiliary/issue_2723_a.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_2723_a.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_2723_a.rs diff --git a/src/test/run-pass/auxiliary/issue_3136_a.rc b/src/test/ui/run-pass/issues/auxiliary/issue_3136_a.rc similarity index 100% rename from src/test/run-pass/auxiliary/issue_3136_a.rc rename to src/test/ui/run-pass/issues/auxiliary/issue_3136_a.rc diff --git a/src/test/run-pass/auxiliary/issue_3136_a.rs b/src/test/ui/run-pass/issues/auxiliary/issue_3136_a.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_3136_a.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_3136_a.rs diff --git a/src/test/run-pass/auxiliary/issue_38190.rs b/src/test/ui/run-pass/issues/auxiliary/issue_38190.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_38190.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_38190.rs diff --git a/src/test/run-pass/auxiliary/issue_38226_aux.rs b/src/test/ui/run-pass/issues/auxiliary/issue_38226_aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_38226_aux.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_38226_aux.rs diff --git a/src/test/run-pass/auxiliary/issue_38715-modern.rs b/src/test/ui/run-pass/issues/auxiliary/issue_38715-modern.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_38715-modern.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_38715-modern.rs diff --git a/src/test/run-pass/auxiliary/issue_38715.rs b/src/test/ui/run-pass/issues/auxiliary/issue_38715.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_38715.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_38715.rs diff --git a/src/test/run-pass/auxiliary/issue_3979_traits.rs b/src/test/ui/run-pass/issues/auxiliary/issue_3979_traits.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_3979_traits.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_3979_traits.rs diff --git a/src/test/run-pass/auxiliary/issue_39823.rs b/src/test/ui/run-pass/issues/auxiliary/issue_39823.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_39823.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_39823.rs diff --git a/src/test/run-pass/auxiliary/issue_40469.rs b/src/test/ui/run-pass/issues/auxiliary/issue_40469.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_40469.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_40469.rs diff --git a/src/test/run-pass/auxiliary/issue_41053.rs b/src/test/ui/run-pass/issues/auxiliary/issue_41053.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_41053.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_41053.rs diff --git a/src/test/run-pass/auxiliary/issue_42007_s.rs b/src/test/ui/run-pass/issues/auxiliary/issue_42007_s.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_42007_s.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_42007_s.rs diff --git a/src/test/run-pass/auxiliary/issue_8401.rs b/src/test/ui/run-pass/issues/auxiliary/issue_8401.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_8401.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_8401.rs diff --git a/src/test/run-pass/auxiliary/issue_9123.rs b/src/test/ui/run-pass/issues/auxiliary/issue_9123.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_9123.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_9123.rs diff --git a/src/test/run-pass/auxiliary/issue_9155.rs b/src/test/ui/run-pass/issues/auxiliary/issue_9155.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_9155.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_9155.rs diff --git a/src/test/run-pass/auxiliary/issue_9188.rs b/src/test/ui/run-pass/issues/auxiliary/issue_9188.rs similarity index 100% rename from src/test/run-pass/auxiliary/issue_9188.rs rename to src/test/ui/run-pass/issues/auxiliary/issue_9188.rs diff --git a/src/test/run-pass/issue-10025.rs b/src/test/ui/run-pass/issues/issue-10025.rs similarity index 98% rename from src/test/run-pass/issue-10025.rs rename to src/test/ui/run-pass/issues/issue-10025.rs index 1ca2476a1013..bd286bca9384 100644 --- a/src/test/run-pass/issue-10025.rs +++ b/src/test/ui/run-pass/issues/issue-10025.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 unsafe extern fn foo() {} diff --git a/src/test/run-pass/issue-10028.rs b/src/test/ui/run-pass/issues/issue-10028.rs similarity index 98% rename from src/test/run-pass/issue-10028.rs rename to src/test/ui/run-pass/issues/issue-10028.rs index 53d6f67f119e..b89ecb0b9df4 100644 --- a/src/test/run-pass/issue-10028.rs +++ b/src/test/ui/run-pass/issues/issue-10028.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-10028.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-10031.rs b/src/test/ui/run-pass/issues/issue-10031.rs similarity index 98% rename from src/test/run-pass/issue-10031.rs rename to src/test/ui/run-pass/issues/issue-10031.rs index 4dc1487b9af9..215760343f03 100644 --- a/src/test/run-pass/issue-10031.rs +++ b/src/test/ui/run-pass/issues/issue-10031.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_10031_aux.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-10228.rs b/src/test/ui/run-pass/issues/issue-10228.rs similarity index 98% rename from src/test/run-pass/issue-10228.rs rename to src/test/ui/run-pass/issues/issue-10228.rs index b5c97bd10edf..7ed8f5be936a 100644 --- a/src/test/run-pass/issue-10228.rs +++ b/src/test/ui/run-pass/issues/issue-10228.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 enum StdioContainer { diff --git a/src/test/run-pass/issue-10392.rs b/src/test/ui/run-pass/issues/issue-10392.rs similarity index 98% rename from src/test/run-pass/issue-10392.rs rename to src/test/ui/run-pass/issues/issue-10392.rs index 1a5f423b0fd8..65c88f445c29 100644 --- a/src/test/run-pass/issue-10392.rs +++ b/src/test/ui/run-pass/issues/issue-10392.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct A { foo: isize } struct B { a: isize, b: isize, c: isize } diff --git a/src/test/run-pass/issue-10396.rs b/src/test/ui/run-pass/issues/issue-10396.rs similarity index 98% rename from src/test/run-pass/issue-10396.rs rename to src/test/ui/run-pass/issues/issue-10396.rs index b487608d4e66..f0b3b276fcf3 100644 --- a/src/test/run-pass/issue-10396.rs +++ b/src/test/ui/run-pass/issues/issue-10396.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] enum Foo<'s> { V(&'s str) diff --git a/src/test/run-pass/issue-10436.rs b/src/test/ui/run-pass/issues/issue-10436.rs similarity index 98% rename from src/test/run-pass/issue-10436.rs rename to src/test/ui/run-pass/issues/issue-10436.rs index 81a955b0f22e..f7f890d8188f 100644 --- a/src/test/run-pass/issue-10436.rs +++ b/src/test/ui/run-pass/issues/issue-10436.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn works(x: T) -> Vec { vec![x] } fn also_works(x: T) -> Vec { vec![x] } diff --git a/src/test/run-pass/issue-10456.rs b/src/test/ui/run-pass/issues/issue-10456.rs similarity index 98% rename from src/test/run-pass/issue-10456.rs rename to src/test/ui/run-pass/issues/issue-10456.rs index 10b416230543..66b813f82a4b 100644 --- a/src/test/run-pass/issue-10456.rs +++ b/src/test/ui/run-pass/issues/issue-10456.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub struct Foo; diff --git a/src/test/run-pass/issue-10626.rs b/src/test/ui/run-pass/issues/issue-10626.rs similarity index 98% rename from src/test/run-pass/issue-10626.rs rename to src/test/ui/run-pass/issues/issue-10626.rs index 9262fc342f75..75c2368d9dae 100644 --- a/src/test/run-pass/issue-10626.rs +++ b/src/test/ui/run-pass/issues/issue-10626.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-10638.rs b/src/test/ui/run-pass/issues/issue-10638.rs similarity index 98% rename from src/test/run-pass/issue-10638.rs rename to src/test/ui/run-pass/issues/issue-10638.rs index 379bdffbbb22..8648a54159f6 100644 --- a/src/test/run-pass/issue-10638.rs +++ b/src/test/ui/run-pass/issues/issue-10638.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-10682.rs b/src/test/ui/run-pass/issues/issue-10682.rs similarity index 98% rename from src/test/run-pass/issue-10682.rs rename to src/test/ui/run-pass/issues/issue-10682.rs index 67b73bdadbb6..e7c23b393f0c 100644 --- a/src/test/run-pass/issue-10682.rs +++ b/src/test/ui/run-pass/issues/issue-10682.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #10682 // Nested `proc` usage can't use outer owned data diff --git a/src/test/run-pass/issue-10683.rs b/src/test/ui/run-pass/issues/issue-10683.rs similarity index 98% rename from src/test/run-pass/issue-10683.rs rename to src/test/ui/run-pass/issues/issue-10683.rs index d3ba477fa573..f25072538ad0 100644 --- a/src/test/run-pass/issue-10683.rs +++ b/src/test/ui/run-pass/issues/issue-10683.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 static NAME: &'static str = "hello world"; diff --git a/src/test/run-pass/issue-10718.rs b/src/test/ui/run-pass/issues/issue-10718.rs similarity index 97% rename from src/test/run-pass/issue-10718.rs rename to src/test/ui/run-pass/issues/issue-10718.rs index fedd94e22e7b..546c06d04512 100644 --- a/src/test/run-pass/issue-10718.rs +++ b/src/test/ui/run-pass/issues/issue-10718.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn f(p: F) { diff --git a/src/test/run-pass/issue-10734.rs b/src/test/ui/run-pass/issues/issue-10734.rs similarity index 96% rename from src/test/run-pass/issue-10734.rs rename to src/test/ui/run-pass/issues/issue-10734.rs index a521e5d4b6c3..6504cca474f1 100644 --- a/src/test/run-pass/issue-10734.rs +++ b/src/test/ui/run-pass/issues/issue-10734.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + static mut drop_count: usize = 0; struct Foo { diff --git a/src/test/run-pass/issue-10763.rs b/src/test/ui/run-pass/issues/issue-10763.rs similarity index 97% rename from src/test/run-pass/issue-10763.rs rename to src/test/ui/run-pass/issues/issue-10763.rs index 3789b93ad76c..9f03cd34114f 100644 --- a/src/test/run-pass/issue-10763.rs +++ b/src/test/ui/run-pass/issues/issue-10763.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 extern "Rust" fn foo() {} diff --git a/src/test/run-pass/issue-10764.rs b/src/test/ui/run-pass/issues/issue-10764.rs similarity index 97% rename from src/test/run-pass/issue-10764.rs rename to src/test/ui/run-pass/issues/issue-10764.rs index cfabf699fa27..0d912ed467ae 100644 --- a/src/test/run-pass/issue-10764.rs +++ b/src/test/ui/run-pass/issues/issue-10764.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 extern "Rust" fn main() {} diff --git a/src/test/run-pass/issue-10767.rs b/src/test/ui/run-pass/issues/issue-10767.rs similarity index 98% rename from src/test/run-pass/issue-10767.rs rename to src/test/ui/run-pass/issues/issue-10767.rs index 2184aa00fa40..58cb663a7219 100644 --- a/src/test/run-pass/issue-10767.rs +++ b/src/test/ui/run-pass/issues/issue-10767.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-10802.rs b/src/test/ui/run-pass/issues/issue-10802.rs similarity index 99% rename from src/test/run-pass/issue-10802.rs rename to src/test/ui/run-pass/issues/issue-10802.rs index 1e700d4e18b2..3967ee445838 100644 --- a/src/test/run-pass/issue-10802.rs +++ b/src/test/ui/run-pass/issues/issue-10802.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct DroppableStruct; diff --git a/src/test/run-pass/issue-10806.rs b/src/test/ui/run-pass/issues/issue-10806.rs similarity index 98% rename from src/test/run-pass/issue-10806.rs rename to src/test/ui/run-pass/issues/issue-10806.rs index 49883f15d319..3cfbd7039540 100644 --- a/src/test/run-pass/issue-10806.rs +++ b/src/test/ui/run-pass/issues/issue-10806.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-10853.rs b/src/test/ui/run-pass/issues/issue-10853.rs similarity index 98% rename from src/test/run-pass/issue-10853.rs rename to src/test/ui/run-pass/issues/issue-10853.rs index 2e6d27803790..4a67d256f5de 100644 --- a/src/test/run-pass/issue-10853.rs +++ b/src/test/ui/run-pass/issues/issue-10853.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![deny(missing_docs)] diff --git a/src/test/run-pass/issue-10902.rs b/src/test/ui/run-pass/issues/issue-10902.rs similarity index 98% rename from src/test/run-pass/issue-10902.rs rename to src/test/ui/run-pass/issues/issue-10902.rs index 9f0417a8be9b..f27b4576d033 100644 --- a/src/test/run-pass/issue-10902.rs +++ b/src/test/ui/run-pass/issues/issue-10902.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub mod two_tuple { diff --git a/src/test/run-pass/issue-11047.rs b/src/test/ui/run-pass/issues/issue-11047.rs similarity index 98% rename from src/test/run-pass/issue-11047.rs rename to src/test/ui/run-pass/issues/issue-11047.rs index 1d97d579a612..6ff9367aed54 100644 --- a/src/test/run-pass/issue-11047.rs +++ b/src/test/ui/run-pass/issues/issue-11047.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that static methods can be invoked on `type` aliases #![allow(unused_variables)] diff --git a/src/test/run-pass/issue-11085.rs b/src/test/ui/run-pass/issues/issue-11085.rs similarity index 98% rename from src/test/run-pass/issue-11085.rs rename to src/test/ui/run-pass/issues/issue-11085.rs index c024c6297bf1..76a047e2a207 100644 --- a/src/test/run-pass/issue-11085.rs +++ b/src/test/ui/run-pass/issues/issue-11085.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: --cfg foo // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-1112.rs b/src/test/ui/run-pass/issues/issue-1112.rs similarity index 98% rename from src/test/run-pass/issue-1112.rs rename to src/test/ui/run-pass/issues/issue-1112.rs index 72d1a43e8831..ee1711b13333 100644 --- a/src/test/run-pass/issue-1112.rs +++ b/src/test/ui/run-pass/issues/issue-1112.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #1112 // Alignment of interior pointers to dynamic-size types diff --git a/src/test/run-pass/issue-11205.rs b/src/test/ui/run-pass/issues/issue-11205.rs similarity index 99% rename from src/test/run-pass/issue-11205.rs rename to src/test/ui/run-pass/issues/issue-11205.rs index 25c66bf8d485..bb7d1768f04e 100644 --- a/src/test/run-pass/issue-11205.rs +++ b/src/test/ui/run-pass/issues/issue-11205.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(dead_code)] diff --git a/src/test/run-pass/issue-11224.rs b/src/test/ui/run-pass/issues/issue-11224.rs similarity index 98% rename from src/test/run-pass/issue-11224.rs rename to src/test/ui/run-pass/issues/issue-11224.rs index 14017ee17892..944983a24530 100644 --- a/src/test/run-pass/issue-11224.rs +++ b/src/test/ui/run-pass/issues/issue-11224.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-11224.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-11225-1.rs b/src/test/ui/run-pass/issues/issue-11225-1.rs similarity index 98% rename from src/test/run-pass/issue-11225-1.rs rename to src/test/ui/run-pass/issues/issue-11225-1.rs index 60789be62b35..3c67d9cdd374 100644 --- a/src/test/run-pass/issue-11225-1.rs +++ b/src/test/ui/run-pass/issues/issue-11225-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-11225-1.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-11225-2.rs b/src/test/ui/run-pass/issues/issue-11225-2.rs similarity index 98% rename from src/test/run-pass/issue-11225-2.rs rename to src/test/ui/run-pass/issues/issue-11225-2.rs index 540183b7ef43..9e66e6e86722 100644 --- a/src/test/run-pass/issue-11225-2.rs +++ b/src/test/ui/run-pass/issues/issue-11225-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-11225-2.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-11225-3.rs b/src/test/ui/run-pass/issues/issue-11225-3.rs similarity index 98% rename from src/test/run-pass/issue-11225-3.rs rename to src/test/ui/run-pass/issues/issue-11225-3.rs index 317c3d3222d3..d6e9b1378a0a 100644 --- a/src/test/run-pass/issue-11225-3.rs +++ b/src/test/ui/run-pass/issues/issue-11225-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-11225-3.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-11267.rs b/src/test/ui/run-pass/issues/issue-11267.rs similarity index 98% rename from src/test/run-pass/issue-11267.rs rename to src/test/ui/run-pass/issues/issue-11267.rs index 1a1227c79201..37bf64c17eb4 100644 --- a/src/test/run-pass/issue-11267.rs +++ b/src/test/ui/run-pass/issues/issue-11267.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that unary structs can be mutably borrowed. struct Empty; diff --git a/src/test/run-pass/issue-11382.rs b/src/test/ui/run-pass/issues/issue-11382.rs similarity index 97% rename from src/test/run-pass/issue-11382.rs rename to src/test/ui/run-pass/issues/issue-11382.rs index 51996614d259..fc8f283fc8ef 100644 --- a/src/test/run-pass/issue-11382.rs +++ b/src/test/ui/run-pass/issues/issue-11382.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { println!("{}", 1.2); } diff --git a/src/test/run-pass/issue-11384.rs b/src/test/ui/run-pass/issues/issue-11384.rs similarity index 98% rename from src/test/run-pass/issue-11384.rs rename to src/test/ui/run-pass/issues/issue-11384.rs index 5b4bd6c9f2bf..5f11bf2841ec 100644 --- a/src/test/run-pass/issue-11384.rs +++ b/src/test/ui/run-pass/issues/issue-11384.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Common { fn dummy(&self) { } } diff --git a/src/test/run-pass/issue-11508.rs b/src/test/ui/run-pass/issues/issue-11508.rs similarity index 98% rename from src/test/run-pass/issue-11508.rs rename to src/test/ui/run-pass/issues/issue-11508.rs index 21ed30683f50..d5a1214ffa41 100644 --- a/src/test/run-pass/issue-11508.rs +++ b/src/test/ui/run-pass/issues/issue-11508.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-11508.rs extern crate issue_11508 as rand; diff --git a/src/test/run-pass/issue-11529.rs b/src/test/ui/run-pass/issues/issue-11529.rs similarity index 98% rename from src/test/run-pass/issue-11529.rs rename to src/test/ui/run-pass/issues/issue-11529.rs index e5d95874be61..e046956297db 100644 --- a/src/test/run-pass/issue-11529.rs +++ b/src/test/ui/run-pass/issues/issue-11529.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-11529.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-11552.rs b/src/test/ui/run-pass/issues/issue-11552.rs similarity index 98% rename from src/test/run-pass/issue-11552.rs rename to src/test/ui/run-pass/issues/issue-11552.rs index aa980e48c5ee..38dc58a2f12d 100644 --- a/src/test/run-pass/issue-11552.rs +++ b/src/test/ui/run-pass/issues/issue-11552.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-11577.rs b/src/test/ui/run-pass/issues/issue-11577.rs similarity index 98% rename from src/test/run-pass/issue-11577.rs rename to src/test/ui/run-pass/issues/issue-11577.rs index a64fbb6afd61..1fee0d40206f 100644 --- a/src/test/run-pass/issue-11577.rs +++ b/src/test/ui/run-pass/issues/issue-11577.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Destructuring struct variants would ICE where regular structs wouldn't enum Foo { diff --git a/src/test/run-pass/issue-11592.rs b/src/test/ui/run-pass/issues/issue-11592.rs similarity index 98% rename from src/test/run-pass/issue-11592.rs rename to src/test/ui/run-pass/issues/issue-11592.rs index 432e7ff20254..1157f9b7e76b 100644 --- a/src/test/run-pass/issue-11592.rs +++ b/src/test/ui/run-pass/issues/issue-11592.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass //! Ensure the private trait Bar isn't complained about. #![deny(missing_docs)] diff --git a/src/test/run-pass/issue-11612.rs b/src/test/ui/run-pass/issues/issue-11612.rs similarity index 98% rename from src/test/run-pass/issue-11612.rs rename to src/test/ui/run-pass/issues/issue-11612.rs index de1b0525d849..763e538fb8f5 100644 --- a/src/test/run-pass/issue-11612.rs +++ b/src/test/ui/run-pass/issues/issue-11612.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // #11612 // We weren't updating the auto adjustments with all the resolved // type information after type check. diff --git a/src/test/run-pass/issue-11677.rs b/src/test/ui/run-pass/issues/issue-11677.rs similarity index 98% rename from src/test/run-pass/issue-11677.rs rename to src/test/ui/run-pass/issues/issue-11677.rs index 62da3b146755..a4d4feb4f8ac 100644 --- a/src/test/run-pass/issue-11677.rs +++ b/src/test/ui/run-pass/issues/issue-11677.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] diff --git a/src/test/run-pass/issue-11709.rs b/src/test/ui/run-pass/issues/issue-11709.rs similarity index 99% rename from src/test/run-pass/issue-11709.rs rename to src/test/ui/run-pass/issues/issue-11709.rs index 88d74a65813b..ffd6f1dfb55b 100644 --- a/src/test/run-pass/issue-11709.rs +++ b/src/test/ui/run-pass/issues/issue-11709.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37199 // Don't panic on blocks without results diff --git a/src/test/run-pass/issue-11820.rs b/src/test/ui/run-pass/issues/issue-11820.rs similarity index 98% rename from src/test/run-pass/issue-11820.rs rename to src/test/ui/run-pass/issues/issue-11820.rs index 6d2243db3007..4546529a9022 100644 --- a/src/test/run-pass/issue-11820.rs +++ b/src/test/ui/run-pass/issues/issue-11820.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct NoClone; diff --git a/src/test/run-pass/issue-11869.rs b/src/test/ui/run-pass/issues/issue-11869.rs similarity index 98% rename from src/test/run-pass/issue-11869.rs rename to src/test/ui/run-pass/issues/issue-11869.rs index 8a9b3e4b1434..be20f7a0feca 100644 --- a/src/test/run-pass/issue-11869.rs +++ b/src/test/ui/run-pass/issues/issue-11869.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct A { diff --git a/src/test/run-pass/issue-11940.rs b/src/test/ui/run-pass/issues/issue-11940.rs similarity index 98% rename from src/test/run-pass/issue-11940.rs rename to src/test/ui/run-pass/issues/issue-11940.rs index 186446a34567..8f2dae938e0b 100644 --- a/src/test/run-pass/issue-11940.rs +++ b/src/test/ui/run-pass/issues/issue-11940.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const TEST_STR: &'static str = "abcd"; diff --git a/src/test/run-pass/issue-11958.rs b/src/test/ui/run-pass/issues/issue-11958.rs similarity index 98% rename from src/test/run-pass/issue-11958.rs rename to src/test/ui/run-pass/issues/issue-11958.rs index 05de69cb966a..6702aa38fd98 100644 --- a/src/test/run-pass/issue-11958.rs +++ b/src/test/ui/run-pass/issues/issue-11958.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![forbid(warnings)] // We shouldn't need to rebind a moved upvar as mut if it's already diff --git a/src/test/run-pass/issue-12033.rs b/src/test/ui/run-pass/issues/issue-12033.rs similarity index 97% rename from src/test/run-pass/issue-12033.rs rename to src/test/ui/run-pass/issues/issue-12033.rs index 5e1d82ce52cc..214dfa5a4469 100644 --- a/src/test/run-pass/issue-12033.rs +++ b/src/test/ui/run-pass/issues/issue-12033.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::cell::RefCell; fn main() { diff --git a/src/test/run-pass/issue-12133-1.rs b/src/test/ui/run-pass/issues/issue-12133-1.rs similarity index 98% rename from src/test/run-pass/issue-12133-1.rs rename to src/test/ui/run-pass/issues/issue-12133-1.rs index d47bb818c494..7f896f6a6dff 100644 --- a/src/test/run-pass/issue-12133-1.rs +++ b/src/test/ui/run-pass/issues/issue-12133-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-12133-rlib.rs // aux-build:issue-12133-dylib.rs diff --git a/src/test/run-pass/issue-12133-2.rs b/src/test/ui/run-pass/issues/issue-12133-2.rs similarity index 98% rename from src/test/run-pass/issue-12133-2.rs rename to src/test/ui/run-pass/issues/issue-12133-2.rs index 580c487af0de..c2f12fda1932 100644 --- a/src/test/run-pass/issue-12133-2.rs +++ b/src/test/ui/run-pass/issues/issue-12133-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-12133-rlib.rs // aux-build:issue-12133-dylib.rs // no-prefer-dynamic diff --git a/src/test/run-pass/issue-12133-3.rs b/src/test/ui/run-pass/issues/issue-12133-3.rs similarity index 98% rename from src/test/run-pass/issue-12133-3.rs rename to src/test/ui/run-pass/issues/issue-12133-3.rs index 2b36c94d2e29..51c39f8f9c75 100644 --- a/src/test/run-pass/issue-12133-3.rs +++ b/src/test/ui/run-pass/issues/issue-12133-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-12133-rlib.rs // aux-build:issue-12133-dylib.rs // aux-build:issue-12133-dylib2.rs diff --git a/src/test/run-pass/issue-12285.rs b/src/test/ui/run-pass/issues/issue-12285.rs similarity index 98% rename from src/test/run-pass/issue-12285.rs rename to src/test/ui/run-pass/issues/issue-12285.rs index fb98909eb976..6391f13d9365 100644 --- a/src/test/run-pass/issue-12285.rs +++ b/src/test/ui/run-pass/issues/issue-12285.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S; diff --git a/src/test/run-pass/issue-1251.rs b/src/test/ui/run-pass/issues/issue-1251.rs similarity index 98% rename from src/test/run-pass/issue-1251.rs rename to src/test/ui/run-pass/issues/issue-1251.rs index 00e8aa69a894..a7bc8718003e 100644 --- a/src/test/run-pass/issue-1251.rs +++ b/src/test/ui/run-pass/issues/issue-1251.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 // ignore-wasm32-bare no libc to test ffi with diff --git a/src/test/run-pass/issue-1257.rs b/src/test/ui/run-pass/issues/issue-1257.rs similarity index 98% rename from src/test/run-pass/issue-1257.rs rename to src/test/ui/run-pass/issues/issue-1257.rs index 44ebe362c729..8361151c24ed 100644 --- a/src/test/run-pass/issue-1257.rs +++ b/src/test/ui/run-pass/issues/issue-1257.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main () { diff --git a/src/test/run-pass/issue-12582.rs b/src/test/ui/run-pass/issues/issue-12582.rs similarity index 98% rename from src/test/run-pass/issue-12582.rs rename to src/test/ui/run-pass/issues/issue-12582.rs index b89964d968e8..dd77e7287ca9 100644 --- a/src/test/run-pass/issue-12582.rs +++ b/src/test/ui/run-pass/issues/issue-12582.rs @@ -7,7 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass pub fn main() { let x = 1; diff --git a/src/test/run-pass/issue-12612.rs b/src/test/ui/run-pass/issues/issue-12612.rs similarity index 98% rename from src/test/run-pass/issue-12612.rs rename to src/test/ui/run-pass/issues/issue-12612.rs index bdf8f84a9597..dd9c9abaf65f 100644 --- a/src/test/run-pass/issue-12612.rs +++ b/src/test/ui/run-pass/issues/issue-12612.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_12612_1.rs // aux-build:issue_12612_2.rs diff --git a/src/test/run-pass/issue-12660.rs b/src/test/ui/run-pass/issues/issue-12660.rs similarity index 98% rename from src/test/run-pass/issue-12660.rs rename to src/test/ui/run-pass/issues/issue-12660.rs index ebf390cfe4fc..2713543963e9 100644 --- a/src/test/run-pass/issue-12660.rs +++ b/src/test/ui/run-pass/issues/issue-12660.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-12660-aux.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-12677.rs b/src/test/ui/run-pass/issues/issue-12677.rs similarity index 98% rename from src/test/run-pass/issue-12677.rs rename to src/test/ui/run-pass/issues/issue-12677.rs index e83a2e9727d9..e4d29a59ba1b 100644 --- a/src/test/run-pass/issue-12677.rs +++ b/src/test/ui/run-pass/issues/issue-12677.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let s = "Hello"; diff --git a/src/test/run-pass/issue-12699.rs b/src/test/ui/run-pass/issues/issue-12699.rs similarity index 94% rename from src/test/run-pass/issue-12699.rs rename to src/test/ui/run-pass/issues/issue-12699.rs index 4620d982c1ea..eaaa2364f681 100644 --- a/src/test/run-pass/issue-12699.rs +++ b/src/test/ui/run-pass/issues/issue-12699.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare can't block the thread +#![allow(deprecated)] use std::thread; diff --git a/src/test/run-pass/issue-12729.rs b/src/test/ui/run-pass/issues/issue-12729.rs similarity index 98% rename from src/test/run-pass/issue-12729.rs rename to src/test/ui/run-pass/issues/issue-12729.rs index 1852ed212862..f75090c4223a 100644 --- a/src/test/run-pass/issue-12729.rs +++ b/src/test/ui/run-pass/issues/issue-12729.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub struct Foo; diff --git a/src/test/run-pass/issue-12744.rs b/src/test/ui/run-pass/issues/issue-12744.rs similarity index 97% rename from src/test/run-pass/issue-12744.rs rename to src/test/ui/run-pass/issues/issue-12744.rs index aec45216b1b7..c0af7bdcbdfa 100644 --- a/src/test/run-pass/issue-12744.rs +++ b/src/test/ui/run-pass/issues/issue-12744.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { fn test() -> Box { Box::new(1) } println!("{:?}", test()) diff --git a/src/test/run-pass/issue-12860.rs b/src/test/ui/run-pass/issues/issue-12860.rs similarity index 99% rename from src/test/run-pass/issue-12860.rs rename to src/test/ui/run-pass/issues/issue-12860.rs index 58ce390cac69..fba1532e00f6 100644 --- a/src/test/run-pass/issue-12860.rs +++ b/src/test/ui/run-pass/issues/issue-12860.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::HashSet; #[derive(Copy, Clone, PartialEq, Eq, Hash)] diff --git a/src/test/run-pass/issue-12909.rs b/src/test/ui/run-pass/issues/issue-12909.rs similarity index 98% rename from src/test/run-pass/issue-12909.rs rename to src/test/ui/run-pass/issues/issue-12909.rs index e15321907301..d4db01a5e582 100644 --- a/src/test/run-pass/issue-12909.rs +++ b/src/test/ui/run-pass/issues/issue-12909.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::collections::HashMap; diff --git a/src/test/run-pass/issue-13027.rs b/src/test/ui/run-pass/issues/issue-13027.rs similarity index 99% rename from src/test/run-pass/issue-13027.rs rename to src/test/ui/run-pass/issues/issue-13027.rs index 2c460900ef62..7caf1589aedb 100644 --- a/src/test/run-pass/issue-13027.rs +++ b/src/test/ui/run-pass/issues/issue-13027.rs @@ -7,7 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass // Tests that match expression handles overlapped literal and range // properly in the presence of guard function. diff --git a/src/test/run-pass/issue-13105.rs b/src/test/ui/run-pass/issues/issue-13105.rs similarity index 97% rename from src/test/run-pass/issue-13105.rs rename to src/test/ui/run-pass/issues/issue-13105.rs index f2a606a8bba3..906f8ca5e7d3 100644 --- a/src/test/run-pass/issue-13105.rs +++ b/src/test/ui/run-pass/issues/issue-13105.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/issue-13167.rs b/src/test/ui/run-pass/issues/issue-13167.rs similarity index 98% rename from src/test/run-pass/issue-13167.rs rename to src/test/ui/run-pass/issues/issue-13167.rs index 414f6768e0a6..ac0645cd403a 100644 --- a/src/test/run-pass/issue-13167.rs +++ b/src/test/ui/run-pass/issues/issue-13167.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::slice; diff --git a/src/test/run-pass/issue-13204.rs b/src/test/ui/run-pass/issues/issue-13204.rs similarity index 98% rename from src/test/run-pass/issue-13204.rs rename to src/test/ui/run-pass/issues/issue-13204.rs index 13e8fe0e964c..4aa2c49b428a 100644 --- a/src/test/run-pass/issue-13204.rs +++ b/src/test/ui/run-pass/issues/issue-13204.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that when instantiating trait default methods, typeck handles // lifetime parameters defined on the method bound correctly. diff --git a/src/test/run-pass/issue-13214.rs b/src/test/ui/run-pass/issues/issue-13214.rs similarity index 98% rename from src/test/run-pass/issue-13214.rs rename to src/test/ui/run-pass/issues/issue-13214.rs index 7a3d3f4ff485..634cbbb0417d 100644 --- a/src/test/run-pass/issue-13214.rs +++ b/src/test/ui/run-pass/issues/issue-13214.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // defining static with struct that contains enum // with &'static str variant used to cause ICE diff --git a/src/test/run-pass/issue-13259-windows-tcb-trash.rs b/src/test/ui/run-pass/issues/issue-13259-windows-tcb-trash.rs similarity index 99% rename from src/test/run-pass/issue-13259-windows-tcb-trash.rs rename to src/test/ui/run-pass/issues/issue-13259-windows-tcb-trash.rs index 634046e86ee6..de18e09532bb 100644 --- a/src/test/run-pass/issue-13259-windows-tcb-trash.rs +++ b/src/test/ui/run-pass/issues/issue-13259-windows-tcb-trash.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(libc)] extern crate libc; diff --git a/src/test/run-pass/issue-13264.rs b/src/test/ui/run-pass/issues/issue-13264.rs similarity index 95% rename from src/test/run-pass/issue-13264.rs rename to src/test/ui/run-pass/issues/issue-13264.rs index 383c1aef2345..db6b80ad2252 100644 --- a/src/test/run-pass/issue-13264.rs +++ b/src/test/ui/run-pass/issues/issue-13264.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_snake_case)] + use std::ops::Deref; struct Root { diff --git a/src/test/run-pass/issue-13304.rs b/src/test/ui/run-pass/issues/issue-13304.rs similarity index 99% rename from src/test/run-pass/issue-13304.rs rename to src/test/ui/run-pass/issues/issue-13304.rs index 36036ae241e2..117cb0bbe16e 100644 --- a/src/test/run-pass/issue-13304.rs +++ b/src/test/ui/run-pass/issues/issue-13304.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-13323.rs b/src/test/ui/run-pass/issues/issue-13323.rs similarity index 99% rename from src/test/run-pass/issue-13323.rs rename to src/test/ui/run-pass/issues/issue-13323.rs index de72d7152f8e..b72abb8b7ac6 100644 --- a/src/test/run-pass/issue-13323.rs +++ b/src/test/ui/run-pass/issues/issue-13323.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct StrWrap { diff --git a/src/test/run-pass/issue-13405.rs b/src/test/ui/run-pass/issues/issue-13405.rs similarity index 98% rename from src/test/run-pass/issue-13405.rs rename to src/test/ui/run-pass/issues/issue-13405.rs index c8b26dc4aed1..3b9fdf84b5d0 100644 --- a/src/test/run-pass/issue-13405.rs +++ b/src/test/ui/run-pass/issues/issue-13405.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Foo<'a> { diff --git a/src/test/run-pass/issue-13434.rs b/src/test/ui/run-pass/issues/issue-13434.rs similarity index 98% rename from src/test/run-pass/issue-13434.rs rename to src/test/ui/run-pass/issues/issue-13434.rs index 5d7a84d80d4c..94d22b818e3c 100644 --- a/src/test/run-pass/issue-13434.rs +++ b/src/test/ui/run-pass/issues/issue-13434.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] struct MyStruct; diff --git a/src/test/run-pass/issue-13494.rs b/src/test/ui/run-pass/issues/issue-13494.rs similarity index 99% rename from src/test/run-pass/issue-13494.rs rename to src/test/ui/run-pass/issues/issue-13494.rs index 316190b54eb0..553f3a7fec96 100644 --- a/src/test/run-pass/issue-13494.rs +++ b/src/test/ui/run-pass/issues/issue-13494.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support // This test may not always fail, but it can be flaky if the race it used to diff --git a/src/test/run-pass/issue-13507-2.rs b/src/test/ui/run-pass/issues/issue-13507-2.rs similarity index 99% rename from src/test/run-pass/issue-13507-2.rs rename to src/test/ui/run-pass/issues/issue-13507-2.rs index 75a724e55fb1..894cd7ac0117 100644 --- a/src/test/run-pass/issue-13507-2.rs +++ b/src/test/ui/run-pass/issues/issue-13507-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue13507.rs extern crate issue13507; diff --git a/src/test/run-pass/issue-13620.rs b/src/test/ui/run-pass/issues/issue-13620.rs similarity index 98% rename from src/test/run-pass/issue-13620.rs rename to src/test/ui/run-pass/issues/issue-13620.rs index 4c4683141870..624aeaef7822 100644 --- a/src/test/run-pass/issue-13620.rs +++ b/src/test/ui/run-pass/issues/issue-13620.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-13620-1.rs // aux-build:issue-13620-2.rs diff --git a/src/test/run-pass/issue-13655.rs b/src/test/ui/run-pass/issues/issue-13655.rs similarity index 98% rename from src/test/run-pass/issue-13655.rs rename to src/test/ui/run-pass/issues/issue-13655.rs index 51a9c9264a83..9978819d7dbd 100644 --- a/src/test/run-pass/issue-13655.rs +++ b/src/test/ui/run-pass/issues/issue-13655.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(fn_traits, unboxed_closures)] use std::ops::Fn; diff --git a/src/test/run-pass/issue-13665.rs b/src/test/ui/run-pass/issues/issue-13665.rs similarity index 98% rename from src/test/run-pass/issue-13665.rs rename to src/test/ui/run-pass/issues/issue-13665.rs index f4902c8e0ac3..85e8ef575152 100644 --- a/src/test/run-pass/issue-13665.rs +++ b/src/test/ui/run-pass/issues/issue-13665.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn foo<'r>() { diff --git a/src/test/run-pass/issue-13703.rs b/src/test/ui/run-pass/issues/issue-13703.rs similarity index 98% rename from src/test/run-pass/issue-13703.rs rename to src/test/ui/run-pass/issues/issue-13703.rs index 173b8dda0579..d0f8be64ef39 100644 --- a/src/test/run-pass/issue-13703.rs +++ b/src/test/ui/run-pass/issues/issue-13703.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub struct Foo<'a, 'b: 'a> { foo: &'a &'b isize } diff --git a/src/test/run-pass/issue-13763.rs b/src/test/ui/run-pass/issues/issue-13763.rs similarity index 98% rename from src/test/run-pass/issue-13763.rs rename to src/test/ui/run-pass/issues/issue-13763.rs index 1367ab2ed85b..0b27e2fab31e 100644 --- a/src/test/run-pass/issue-13763.rs +++ b/src/test/ui/run-pass/issues/issue-13763.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 mod u8 { diff --git a/src/test/run-pass/issue-13775.rs b/src/test/ui/run-pass/issues/issue-13775.rs similarity index 98% rename from src/test/run-pass/issue-13775.rs rename to src/test/ui/run-pass/issues/issue-13775.rs index c69ae6a15cd3..ae4992299177 100644 --- a/src/test/run-pass/issue-13775.rs +++ b/src/test/ui/run-pass/issues/issue-13775.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/issue-13808.rs b/src/test/ui/run-pass/issues/issue-13808.rs similarity index 98% rename from src/test/run-pass/issue-13808.rs rename to src/test/ui/run-pass/issues/issue-13808.rs index ccdfa0646c6a..2d6b78c6b07a 100644 --- a/src/test/run-pass/issue-13808.rs +++ b/src/test/ui/run-pass/issues/issue-13808.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Foo<'a> { diff --git a/src/test/run-pass/issue-13837.rs b/src/test/ui/run-pass/issues/issue-13837.rs similarity index 98% rename from src/test/run-pass/issue-13837.rs rename to src/test/ui/run-pass/issues/issue-13837.rs index d90b9cffb6ab..eaa17499850c 100644 --- a/src/test/run-pass/issue-13837.rs +++ b/src/test/ui/run-pass/issues/issue-13837.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct TestStruct { diff --git a/src/test/run-pass/issue-13867.rs b/src/test/ui/run-pass/issues/issue-13867.rs similarity index 99% rename from src/test/run-pass/issue-13867.rs rename to src/test/ui/run-pass/issues/issue-13867.rs index bc28dc54de6f..84d7e8a3bc44 100644 --- a/src/test/run-pass/issue-13867.rs +++ b/src/test/ui/run-pass/issues/issue-13867.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that codegen works correctly when there are multiple refutable // patterns in match expression. diff --git a/src/test/run-pass/issue-13872.rs b/src/test/ui/run-pass/issues/issue-13872.rs similarity index 98% rename from src/test/run-pass/issue-13872.rs rename to src/test/ui/run-pass/issues/issue-13872.rs index e9fb7945d040..e72eac8fbdd5 100644 --- a/src/test/run-pass/issue-13872.rs +++ b/src/test/ui/run-pass/issues/issue-13872.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-13872-1.rs // aux-build:issue-13872-2.rs // aux-build:issue-13872-3.rs diff --git a/src/test/run-pass/issue-13902.rs b/src/test/ui/run-pass/issues/issue-13902.rs similarity index 94% rename from src/test/run-pass/issue-13902.rs rename to src/test/ui/run-pass/issues/issue-13902.rs index 14019aaacd4c..87413be05e57 100644 --- a/src/test/run-pass/issue-13902.rs +++ b/src/test/ui/run-pass/issues/issue-13902.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + const JSVAL_TAG_CLEAR: u32 = 0xFFFFFF80; const JSVAL_TYPE_INT32: u8 = 0x01; const JSVAL_TYPE_UNDEFINED: u8 = 0x02; diff --git a/src/test/run-pass/issue-14082.rs b/src/test/ui/run-pass/issues/issue-14082.rs similarity index 98% rename from src/test/run-pass/issue-14082.rs rename to src/test/ui/run-pass/issues/issue-14082.rs index d159d55c77c5..01d3c9534f2f 100644 --- a/src/test/run-pass/issue-14082.rs +++ b/src/test/ui/run-pass/issues/issue-14082.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(unused_imports, dead_code)] diff --git a/src/test/run-pass/issue-14229.rs b/src/test/ui/run-pass/issues/issue-14229.rs similarity index 98% rename from src/test/run-pass/issue-14229.rs rename to src/test/ui/run-pass/issues/issue-14229.rs index ee2bbe63750c..c09b2c791043 100644 --- a/src/test/run-pass/issue-14229.rs +++ b/src/test/ui/run-pass/issues/issue-14229.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo: Sized { fn foo(self) {} } diff --git a/src/test/run-pass/issue-14254.rs b/src/test/ui/run-pass/issues/issue-14254.rs similarity index 99% rename from src/test/run-pass/issue-14254.rs rename to src/test/ui/run-pass/issues/issue-14254.rs index 9049ae0548fa..4e03535f6133 100644 --- a/src/test/run-pass/issue-14254.rs +++ b/src/test/ui/run-pass/issues/issue-14254.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Foo: Sized { diff --git a/src/test/run-pass/issue-14308.rs b/src/test/ui/run-pass/issues/issue-14308.rs similarity index 98% rename from src/test/run-pass/issue-14308.rs rename to src/test/ui/run-pass/issues/issue-14308.rs index 74936411da2c..dce2c4aecd6e 100644 --- a/src/test/run-pass/issue-14308.rs +++ b/src/test/ui/run-pass/issues/issue-14308.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct A(isize); diff --git a/src/test/run-pass/issue-14330.rs b/src/test/ui/run-pass/issues/issue-14330.rs similarity index 97% rename from src/test/run-pass/issue-14330.rs rename to src/test/ui/run-pass/issues/issue-14330.rs index dd5b7e722fe7..d50dc64f4374 100644 --- a/src/test/run-pass/issue-14330.rs +++ b/src/test/ui/run-pass/issues/issue-14330.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[macro_use] extern crate std as std2; diff --git a/src/test/run-pass/issue-14344.rs b/src/test/ui/run-pass/issues/issue-14344.rs similarity index 98% rename from src/test/run-pass/issue-14344.rs rename to src/test/ui/run-pass/issues/issue-14344.rs index 06b8f44ed260..842a5c1ad77a 100644 --- a/src/test/run-pass/issue-14344.rs +++ b/src/test/ui/run-pass/issues/issue-14344.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-14344-1.rs // aux-build:issue-14344-2.rs diff --git a/src/test/run-pass/issue-14382.rs b/src/test/ui/run-pass/issues/issue-14382.rs similarity index 98% rename from src/test/run-pass/issue-14382.rs rename to src/test/ui/run-pass/issues/issue-14382.rs index cdb44f6a6067..7fdd5e2b0dbb 100644 --- a/src/test/run-pass/issue-14382.rs +++ b/src/test/ui/run-pass/issues/issue-14382.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] struct Matrix4(S); trait POrd {} diff --git a/src/test/run-pass/issue-14393.rs b/src/test/ui/run-pass/issues/issue-14393.rs similarity index 98% rename from src/test/run-pass/issue-14393.rs rename to src/test/ui/run-pass/issues/issue-14393.rs index 88af65074951..9dd3674f34f2 100644 --- a/src/test/run-pass/issue-14393.rs +++ b/src/test/ui/run-pass/issues/issue-14393.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-14399.rs b/src/test/ui/run-pass/issues/issue-14399.rs similarity index 98% rename from src/test/run-pass/issue-14399.rs rename to src/test/ui/run-pass/issues/issue-14399.rs index d5c67bea099f..76785212cd72 100644 --- a/src/test/run-pass/issue-14399.rs +++ b/src/test/ui/run-pass/issues/issue-14399.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // #14399 // We'd previously ICE if we had a method call whose return // value was coerced to a trait object. (v.clone() returns Box diff --git a/src/test/run-pass/issue-14421.rs b/src/test/ui/run-pass/issues/issue-14421.rs similarity index 94% rename from src/test/run-pass/issue-14421.rs rename to src/test/ui/run-pass/issues/issue-14421.rs index 046d888030f0..8920134bcbbf 100644 --- a/src/test/run-pass/issue-14421.rs +++ b/src/test/ui/run-pass/issues/issue-14421.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // aux-build:issue-14421.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-14422.rs b/src/test/ui/run-pass/issues/issue-14422.rs similarity index 94% rename from src/test/run-pass/issue-14422.rs rename to src/test/ui/run-pass/issues/issue-14422.rs index 178a219f5bfc..dd1d74779d56 100644 --- a/src/test/run-pass/issue-14422.rs +++ b/src/test/ui/run-pass/issues/issue-14422.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // aux-build:issue-14422.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-14456.rs b/src/test/ui/run-pass/issues/issue-14456.rs similarity index 99% rename from src/test/run-pass/issue-14456.rs rename to src/test/ui/run-pass/issues/issue-14456.rs index 601fafbf02eb..27eb0ebcbfe9 100644 --- a/src/test/run-pass/issue-14456.rs +++ b/src/test/ui/run-pass/issues/issue-14456.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-1451.rs b/src/test/ui/run-pass/issues/issue-1451.rs similarity index 95% rename from src/test/run-pass/issue-1451.rs rename to src/test/ui/run-pass/issues/issue-1451.rs index b65a3a9ab708..fb344c3b4b78 100644 --- a/src/test/run-pass/issue-1451.rs +++ b/src/test/ui/run-pass/issues/issue-1451.rs @@ -8,8 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 - +#![allow(non_snake_case)] #![allow(unused_variables)] struct T { f: extern "Rust" fn() } diff --git a/src/test/run-pass/issue-14589.rs b/src/test/ui/run-pass/issues/issue-14589.rs similarity index 98% rename from src/test/run-pass/issue-14589.rs rename to src/test/ui/run-pass/issues/issue-14589.rs index 8aaa24e991ea..78f47237ed61 100644 --- a/src/test/run-pass/issue-14589.rs +++ b/src/test/ui/run-pass/issues/issue-14589.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // All 3 expressions should work in that the argument gets // coerced to a trait object diff --git a/src/test/run-pass/issue-1460.rs b/src/test/ui/run-pass/issues/issue-1460.rs similarity index 97% rename from src/test/run-pass/issue-1460.rs rename to src/test/ui/run-pass/issues/issue-1460.rs index 6e1cfc718629..85a87327355c 100644 --- a/src/test/run-pass/issue-1460.rs +++ b/src/test/ui/run-pass/issues/issue-1460.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-14821.rs b/src/test/ui/run-pass/issues/issue-14821.rs similarity index 98% rename from src/test/run-pass/issue-14821.rs rename to src/test/ui/run-pass/issues/issue-14821.rs index 50eb7767f82e..c01ffb7d6b14 100644 --- a/src/test/run-pass/issue-14821.rs +++ b/src/test/ui/run-pass/issues/issue-14821.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait SomeTrait {} struct Meow; impl SomeTrait for Meow {} diff --git a/src/test/run-pass/issue-14837.rs b/src/test/ui/run-pass/issues/issue-14837.rs similarity index 97% rename from src/test/run-pass/issue-14837.rs rename to src/test/ui/run-pass/issues/issue-14837.rs index 5589acdda37e..9945c6e4407a 100644 --- a/src/test/run-pass/issue-14837.rs +++ b/src/test/ui/run-pass/issues/issue-14837.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[deny(dead_code)] diff --git a/src/test/run-pass/issue-14865.rs b/src/test/ui/run-pass/issues/issue-14865.rs similarity index 98% rename from src/test/run-pass/issue-14865.rs rename to src/test/ui/run-pass/issues/issue-14865.rs index 1ec268bb1703..4e278c66886b 100644 --- a/src/test/run-pass/issue-14865.rs +++ b/src/test/ui/run-pass/issues/issue-14865.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum X { Foo(usize), diff --git a/src/test/run-pass/issue-14875.rs b/src/test/ui/run-pass/issues/issue-14875.rs similarity index 99% rename from src/test/run-pass/issue-14875.rs rename to src/test/ui/run-pass/issues/issue-14875.rs index e705539bb477..f983218dc8ba 100644 --- a/src/test/run-pass/issue-14875.rs +++ b/src/test/ui/run-pass/issues/issue-14875.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare always compiled as panic=abort right now // Check that values are not leaked when a dtor panics (#14875) diff --git a/src/test/run-pass/issue-14901.rs b/src/test/ui/run-pass/issues/issue-14901.rs similarity index 98% rename from src/test/run-pass/issue-14901.rs rename to src/test/ui/run-pass/issues/issue-14901.rs index 566836784696..7612c5bc8557 100644 --- a/src/test/run-pass/issue-14901.rs +++ b/src/test/ui/run-pass/issues/issue-14901.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Reader {} enum Wrapper<'a> { diff --git a/src/test/run-pass/issue-14919.rs b/src/test/ui/run-pass/issues/issue-14919.rs similarity index 99% rename from src/test/run-pass/issue-14919.rs rename to src/test/ui/run-pass/issues/issue-14919.rs index 5d0fde01798d..a9768661256f 100644 --- a/src/test/run-pass/issue-14919.rs +++ b/src/test/ui/run-pass/issues/issue-14919.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Matcher { diff --git a/src/test/run-pass/issue-14933.rs b/src/test/ui/run-pass/issues/issue-14933.rs similarity index 97% rename from src/test/run-pass/issue-14933.rs rename to src/test/ui/run-pass/issues/issue-14933.rs index f6815b760830..30365bb3e4f4 100644 --- a/src/test/run-pass/issue-14933.rs +++ b/src/test/ui/run-pass/issues/issue-14933.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub type BigRat = T; diff --git a/src/test/run-pass/issue-14936.rs b/src/test/ui/run-pass/issues/issue-14936.rs similarity index 99% rename from src/test/run-pass/issue-14936.rs rename to src/test/ui/run-pass/issues/issue-14936.rs index 8a628b73c006..3786b0408ad5 100644 --- a/src/test/run-pass/issue-14936.rs +++ b/src/test/ui/run-pass/issues/issue-14936.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(asm)] diff --git a/src/test/run-pass/issue-14940.rs b/src/test/ui/run-pass/issues/issue-14940.rs similarity index 98% rename from src/test/run-pass/issue-14940.rs rename to src/test/ui/run-pass/issues/issue-14940.rs index c07418201196..494b790b5bdc 100644 --- a/src/test/run-pass/issue-14940.rs +++ b/src/test/ui/run-pass/issues/issue-14940.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-14958.rs b/src/test/ui/run-pass/issues/issue-14958.rs similarity index 98% rename from src/test/run-pass/issue-14958.rs rename to src/test/ui/run-pass/issues/issue-14958.rs index 0709ccf1406d..90716488fab8 100644 --- a/src/test/run-pass/issue-14958.rs +++ b/src/test/ui/run-pass/issues/issue-14958.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(fn_traits, unboxed_closures)] diff --git a/src/test/run-pass/issue-14959.rs b/src/test/ui/run-pass/issues/issue-14959.rs similarity index 99% rename from src/test/run-pass/issue-14959.rs rename to src/test/ui/run-pass/issues/issue-14959.rs index 42824b563bed..fc245fb42449 100644 --- a/src/test/run-pass/issue-14959.rs +++ b/src/test/ui/run-pass/issues/issue-14959.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(fn_traits, unboxed_closures)] diff --git a/src/test/run-pass/issue-15043.rs b/src/test/ui/run-pass/issues/issue-15043.rs similarity index 98% rename from src/test/run-pass/issue-15043.rs rename to src/test/ui/run-pass/issues/issue-15043.rs index adf56388acd6..3ba4966a13ea 100644 --- a/src/test/run-pass/issue-15043.rs +++ b/src/test/ui/run-pass/issues/issue-15043.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(warnings)] diff --git a/src/test/run-pass/issue-15063.rs b/src/test/ui/run-pass/issues/issue-15063.rs similarity index 98% rename from src/test/run-pass/issue-15063.rs rename to src/test/ui/run-pass/issues/issue-15063.rs index 695d30d73175..863dde1fc5e5 100644 --- a/src/test/run-pass/issue-15063.rs +++ b/src/test/ui/run-pass/issues/issue-15063.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Two { A, B} impl Drop for Two { fn drop(&mut self) { diff --git a/src/test/run-pass/issue-15080.rs b/src/test/ui/run-pass/issues/issue-15080.rs similarity index 98% rename from src/test/run-pass/issue-15080.rs rename to src/test/ui/run-pass/issues/issue-15080.rs index 59267f79e264..ee8356b99e07 100644 --- a/src/test/run-pass/issue-15080.rs +++ b/src/test/ui/run-pass/issues/issue-15080.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(slice_patterns)] fn main() { diff --git a/src/test/run-pass/issue-15104.rs b/src/test/ui/run-pass/issues/issue-15104.rs similarity index 98% rename from src/test/run-pass/issue-15104.rs rename to src/test/ui/run-pass/issues/issue-15104.rs index 2878f2795c59..0cb1d69d1860 100644 --- a/src/test/run-pass/issue-15104.rs +++ b/src/test/ui/run-pass/issues/issue-15104.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(slice_patterns)] fn main() { diff --git a/src/test/run-pass/issue-15108.rs b/src/test/ui/run-pass/issues/issue-15108.rs similarity index 97% rename from src/test/run-pass/issue-15108.rs rename to src/test/ui/run-pass/issues/issue-15108.rs index aaf1e5fc1832..7288ff23cb40 100644 --- a/src/test/run-pass/issue-15108.rs +++ b/src/test/ui/run-pass/issues/issue-15108.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() {} diff --git a/src/test/run-pass/issue-15129.rs b/src/test/ui/run-pass/issues/issue-15129.rs similarity index 98% rename from src/test/run-pass/issue-15129.rs rename to src/test/ui/run-pass/issues/issue-15129.rs index 9bcfa6ea40a4..b0ee797752ad 100644 --- a/src/test/run-pass/issue-15129.rs +++ b/src/test/ui/run-pass/issues/issue-15129.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub enum T { T1(()), diff --git a/src/test/run-pass/issue-15155.rs b/src/test/ui/run-pass/issues/issue-15155.rs similarity index 98% rename from src/test/run-pass/issue-15155.rs rename to src/test/ui/run-pass/issues/issue-15155.rs index e1ecaaab026c..3abed1f5637d 100644 --- a/src/test/run-pass/issue-15155.rs +++ b/src/test/ui/run-pass/issues/issue-15155.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait TraitWithSend: Send {} trait IndirectTraitWithSend: TraitWithSend {} diff --git a/src/test/run-pass/issue-15189.rs b/src/test/ui/run-pass/issues/issue-15189.rs similarity index 98% rename from src/test/run-pass/issue-15189.rs rename to src/test/ui/run-pass/issues/issue-15189.rs index 54b96d663074..6c6a4404da96 100644 --- a/src/test/run-pass/issue-15189.rs +++ b/src/test/ui/run-pass/issues/issue-15189.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! third { ($e:expr) => ({let x = 2; $e[x]}) } diff --git a/src/test/run-pass/issue-15221.rs b/src/test/ui/run-pass/issues/issue-15221.rs similarity index 98% rename from src/test/run-pass/issue-15221.rs rename to src/test/ui/run-pass/issues/issue-15221.rs index bb89fb2fa102..25e163e3958a 100644 --- a/src/test/run-pass/issue-15221.rs +++ b/src/test/ui/run-pass/issues/issue-15221.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 macro_rules! inner { diff --git a/src/test/run-pass/issue-15261.rs b/src/test/ui/run-pass/issues/issue-15261.rs similarity index 92% rename from src/test/run-pass/issue-15261.rs rename to src/test/ui/run-pass/issues/issue-15261.rs index 239fef123263..b715a388d105 100644 --- a/src/test/run-pass/issue-15261.rs +++ b/src/test/ui/run-pass/issues/issue-15261.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // pretty-expanded FIXME #23616 static mut n_mut: usize = 0; diff --git a/src/test/run-pass/issue-15444.rs b/src/test/ui/run-pass/issues/issue-15444.rs similarity index 98% rename from src/test/run-pass/issue-15444.rs rename to src/test/ui/run-pass/issues/issue-15444.rs index e9a9eabcd917..826ca40d63d3 100644 --- a/src/test/run-pass/issue-15444.rs +++ b/src/test/ui/run-pass/issues/issue-15444.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait MyTrait { diff --git a/src/test/run-pass/issue-15487.rs b/src/test/ui/run-pass/issues/issue-15487.rs similarity index 98% rename from src/test/run-pass/issue-15487.rs rename to src/test/ui/run-pass/issues/issue-15487.rs index 3616ab9e6c73..de4de14ca33c 100644 --- a/src/test/run-pass/issue-15487.rs +++ b/src/test/ui/run-pass/issues/issue-15487.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-windows // ignore-wasm32-bare no libs to link diff --git a/src/test/run-pass/issue-15523-big.rs b/src/test/ui/run-pass/issues/issue-15523-big.rs similarity index 99% rename from src/test/run-pass/issue-15523-big.rs rename to src/test/ui/run-pass/issues/issue-15523-big.rs index 33c81cab3817..41a52283aac4 100644 --- a/src/test/run-pass/issue-15523-big.rs +++ b/src/test/ui/run-pass/issues/issue-15523-big.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue 15523: derive(PartialOrd) should use the provided // discriminant values for the derived ordering. // diff --git a/src/test/run-pass/issue-15523.rs b/src/test/ui/run-pass/issues/issue-15523.rs similarity index 99% rename from src/test/run-pass/issue-15523.rs rename to src/test/ui/run-pass/issues/issue-15523.rs index bb8fa6791a5c..a8fc2153c668 100644 --- a/src/test/run-pass/issue-15523.rs +++ b/src/test/ui/run-pass/issues/issue-15523.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue 15523: derive(PartialOrd) should use the provided // discriminant values for the derived ordering. // diff --git a/src/test/run-pass/issue-15562.rs b/src/test/ui/run-pass/issues/issue-15562.rs similarity index 98% rename from src/test/run-pass/issue-15562.rs rename to src/test/ui/run-pass/issues/issue-15562.rs index da1e15d826d9..a3e3f528ff54 100644 --- a/src/test/run-pass/issue-15562.rs +++ b/src/test/ui/run-pass/issues/issue-15562.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-15562.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-15571.rs b/src/test/ui/run-pass/issues/issue-15571.rs similarity index 99% rename from src/test/run-pass/issue-15571.rs rename to src/test/ui/run-pass/issues/issue-15571.rs index 35915a62102d..41414b13a19f 100644 --- a/src/test/run-pass/issue-15571.rs +++ b/src/test/ui/run-pass/issues/issue-15571.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn match_on_local() { diff --git a/src/test/run-pass/issue-15673.rs b/src/test/ui/run-pass/issues/issue-15673.rs similarity index 93% rename from src/test/run-pass/issue-15673.rs rename to src/test/ui/run-pass/issues/issue-15673.rs index ff9a17323e43..c706606cf6ab 100644 --- a/src/test/run-pass/issue-15673.rs +++ b/src/test/ui/run-pass/issues/issue-15673.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + #![feature(iter_arith)] fn main() { diff --git a/src/test/run-pass/issue-15689-1.rs b/src/test/ui/run-pass/issues/issue-15689-1.rs similarity index 98% rename from src/test/run-pass/issue-15689-1.rs rename to src/test/ui/run-pass/issues/issue-15689-1.rs index 20d66cd8176e..02bf687e74f6 100644 --- a/src/test/run-pass/issue-15689-1.rs +++ b/src/test/ui/run-pass/issues/issue-15689-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] enum Test<'a> { diff --git a/src/test/run-pass/issue-15689-2.rs b/src/test/ui/run-pass/issues/issue-15689-2.rs similarity index 97% rename from src/test/run-pass/issue-15689-2.rs rename to src/test/ui/run-pass/issues/issue-15689-2.rs index 922b18c01d9e..7b4d1e3e3e2b 100644 --- a/src/test/run-pass/issue-15689-2.rs +++ b/src/test/ui/run-pass/issues/issue-15689-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[derive(Clone)] diff --git a/src/test/run-pass/issue-15730.rs b/src/test/ui/run-pass/issues/issue-15730.rs similarity index 97% rename from src/test/run-pass/issue-15730.rs rename to src/test/ui/run-pass/issues/issue-15730.rs index 929580019ff6..c2f5f9f2e60a 100644 --- a/src/test/run-pass/issue-15730.rs +++ b/src/test/ui/run-pass/issues/issue-15730.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-15734.rs b/src/test/ui/run-pass/issues/issue-15734.rs similarity index 99% rename from src/test/run-pass/issue-15734.rs rename to src/test/ui/run-pass/issues/issue-15734.rs index 5a35239cf72d..6b386ed0f8d8 100644 --- a/src/test/run-pass/issue-15734.rs +++ b/src/test/ui/run-pass/issues/issue-15734.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // If `Index` used an associated type for its output, this test would // work more smoothly. diff --git a/src/test/run-pass/issue-15735.rs b/src/test/ui/run-pass/issues/issue-15735.rs similarity index 98% rename from src/test/run-pass/issue-15735.rs rename to src/test/ui/run-pass/issues/issue-15735.rs index bdd58bf6a7d5..9e95b173e894 100644 --- a/src/test/run-pass/issue-15735.rs +++ b/src/test/ui/run-pass/issues/issue-15735.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct A<'a> { a: &'a i32, b: &'a i32, diff --git a/src/test/run-pass/issue-15763.rs b/src/test/ui/run-pass/issues/issue-15763.rs similarity index 99% rename from src/test/run-pass/issue-15763.rs rename to src/test/ui/run-pass/issues/issue-15763.rs index e1176d470636..f241efa74d3e 100644 --- a/src/test/run-pass/issue-15763.rs +++ b/src/test/ui/run-pass/issues/issue-15763.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] #[derive(PartialEq, Debug)] diff --git a/src/test/run-pass/issue-15774.rs b/src/test/ui/run-pass/issues/issue-15774.rs similarity index 98% rename from src/test/run-pass/issue-15774.rs rename to src/test/ui/run-pass/issues/issue-15774.rs index eb3322e03705..3e4845886e0e 100644 --- a/src/test/run-pass/issue-15774.rs +++ b/src/test/ui/run-pass/issues/issue-15774.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![deny(warnings)] diff --git a/src/test/run-pass/issue-15793.rs b/src/test/ui/run-pass/issues/issue-15793.rs similarity index 98% rename from src/test/run-pass/issue-15793.rs rename to src/test/ui/run-pass/issues/issue-15793.rs index 432174a1f52a..97f4c0095ec8 100644 --- a/src/test/run-pass/issue-15793.rs +++ b/src/test/ui/run-pass/issues/issue-15793.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum NestedEnum { First, diff --git a/src/test/run-pass/issue-15858.rs b/src/test/ui/run-pass/issues/issue-15858.rs similarity index 98% rename from src/test/run-pass/issue-15858.rs rename to src/test/ui/run-pass/issues/issue-15858.rs index a1ada18984e9..f0b4db7d6bd2 100644 --- a/src/test/run-pass/issue-15858.rs +++ b/src/test/ui/run-pass/issues/issue-15858.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass static mut DROP_RAN: bool = false; trait Bar { diff --git a/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs b/src/test/ui/run-pass/issues/issue-15881-model-lexer-dotdotdot.rs similarity index 94% rename from src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs rename to src/test/ui/run-pass/issues/issue-15881-model-lexer-dotdotdot.rs index 04ffad501b04..2b39b80d10f1 100644 --- a/src/test/run-pass/issue-15881-model-lexer-dotdotdot.rs +++ b/src/test/ui/run-pass/issues/issue-15881-model-lexer-dotdotdot.rs @@ -7,7 +7,10 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass +#![allow(illegal_floating_point_literal_pattern)] // FIXME #41620 + // regression test for the model lexer handling the DOTDOTDOT syntax (#15877) diff --git a/src/test/run-pass/issue-16151.rs b/src/test/ui/run-pass/issues/issue-16151.rs similarity index 98% rename from src/test/run-pass/issue-16151.rs rename to src/test/ui/run-pass/issues/issue-16151.rs index 212dfaf3cb6c..440037ff1197 100644 --- a/src/test/run-pass/issue-16151.rs +++ b/src/test/ui/run-pass/issues/issue-16151.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; diff --git a/src/test/run-pass/issue-16256.rs b/src/test/ui/run-pass/issues/issue-16256.rs similarity index 97% rename from src/test/run-pass/issue-16256.rs rename to src/test/ui/run-pass/issues/issue-16256.rs index b994fcb46b09..20a5bbadcf5d 100644 --- a/src/test/run-pass/issue-16256.rs +++ b/src/test/ui/run-pass/issues/issue-16256.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-16272.rs b/src/test/ui/run-pass/issues/issue-16272.rs similarity index 98% rename from src/test/run-pass/issue-16272.rs rename to src/test/ui/run-pass/issues/issue-16272.rs index f8d6e43c7306..dd515ea15585 100644 --- a/src/test/run-pass/issue-16272.rs +++ b/src/test/ui/run-pass/issues/issue-16272.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-16278.rs b/src/test/ui/run-pass/issues/issue-16278.rs similarity index 98% rename from src/test/run-pass/issue-16278.rs rename to src/test/ui/run-pass/issues/issue-16278.rs index 41af72db2008..831e83c8c4b0 100644 --- a/src/test/run-pass/issue-16278.rs +++ b/src/test/ui/run-pass/issues/issue-16278.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-tidy-cr // this file has some special \r\n endings (use xxd to see them) diff --git a/src/test/run-pass/issue-16441.rs b/src/test/ui/run-pass/issues/issue-16441.rs similarity index 98% rename from src/test/run-pass/issue-16441.rs rename to src/test/ui/run-pass/issues/issue-16441.rs index 4624953dea3f..5a0ea2adc639 100644 --- a/src/test/run-pass/issue-16441.rs +++ b/src/test/ui/run-pass/issues/issue-16441.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Empty; diff --git a/src/test/run-pass/issue-16452.rs b/src/test/ui/run-pass/issues/issue-16452.rs similarity index 98% rename from src/test/run-pass/issue-16452.rs rename to src/test/ui/run-pass/issues/issue-16452.rs index b6056d0ab8ca..2b78582b577d 100644 --- a/src/test/run-pass/issue-16452.rs +++ b/src/test/ui/run-pass/issues/issue-16452.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-16492.rs b/src/test/ui/run-pass/issues/issue-16492.rs similarity index 97% rename from src/test/run-pass/issue-16492.rs rename to src/test/ui/run-pass/issues/issue-16492.rs index 177550a0dd4a..7c2f4d99e6ae 100644 --- a/src/test/run-pass/issue-16492.rs +++ b/src/test/ui/run-pass/issues/issue-16492.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + use std::rc::Rc; use std::cell::Cell; diff --git a/src/test/run-pass/issue-16530.rs b/src/test/ui/run-pass/issues/issue-16530.rs similarity index 95% rename from src/test/run-pass/issue-16530.rs rename to src/test/ui/run-pass/issues/issue-16530.rs index bd7e7c851892..f32057e5e44f 100644 --- a/src/test/run-pass/issue-16530.rs +++ b/src/test/ui/run-pass/issues/issue-16530.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] + use std::hash::{SipHasher, Hasher, Hash}; #[derive(Hash)] diff --git a/src/test/run-pass/issue-16560.rs b/src/test/ui/run-pass/issues/issue-16560.rs similarity index 98% rename from src/test/run-pass/issue-16560.rs rename to src/test/ui/run-pass/issues/issue-16560.rs index e91569f8b245..50009f4f6ea1 100644 --- a/src/test/run-pass/issue-16560.rs +++ b/src/test/ui/run-pass/issues/issue-16560.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/issue-16596.rs b/src/test/ui/run-pass/issues/issue-16596.rs similarity index 98% rename from src/test/run-pass/issue-16596.rs rename to src/test/ui/run-pass/issues/issue-16596.rs index d70158743e72..cdbc3daf4ab1 100644 --- a/src/test/run-pass/issue-16596.rs +++ b/src/test/ui/run-pass/issues/issue-16596.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait MatrixRow { fn dummy(&self) { }} diff --git a/src/test/run-pass/issue-16597-empty.rs b/src/test/ui/run-pass/issues/issue-16597-empty.rs similarity index 98% rename from src/test/run-pass/issue-16597-empty.rs rename to src/test/ui/run-pass/issues/issue-16597-empty.rs index c51e33c01040..c68e26348318 100644 --- a/src/test/run-pass/issue-16597-empty.rs +++ b/src/test/ui/run-pass/issues/issue-16597-empty.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:--test // This verifies that the test generation doesn't crash when we have diff --git a/src/test/run-pass/issue-16597.rs b/src/test/ui/run-pass/issues/issue-16597.rs similarity index 97% rename from src/test/run-pass/issue-16597.rs rename to src/test/ui/run-pass/issues/issue-16597.rs index 583d8d46235d..6b437eb65aac 100644 --- a/src/test/run-pass/issue-16597.rs +++ b/src/test/ui/run-pass/issues/issue-16597.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:--test mod tests { diff --git a/src/test/run-pass/issue-1660.rs b/src/test/ui/run-pass/issues/issue-1660.rs similarity index 92% rename from src/test/run-pass/issue-1660.rs rename to src/test/ui/run-pass/issues/issue-1660.rs index 2a59c3051d5c..61b380bf6958 100644 --- a/src/test/run-pass/issue-1660.rs +++ b/src/test/ui/run-pass/issues/issue-1660.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-16602-1.rs b/src/test/ui/run-pass/issues/issue-16602-1.rs similarity index 97% rename from src/test/run-pass/issue-16602-1.rs rename to src/test/ui/run-pass/issues/issue-16602-1.rs index ee638edad6cb..e351832a8c2d 100644 --- a/src/test/run-pass/issue-16602-1.rs +++ b/src/test/ui/run-pass/issues/issue-16602-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let mut t = [1; 2]; t = [t[1] * 2, t[0] * 2]; diff --git a/src/test/run-pass/issue-16602-2.rs b/src/test/ui/run-pass/issues/issue-16602-2.rs similarity index 98% rename from src/test/run-pass/issue-16602-2.rs rename to src/test/ui/run-pass/issues/issue-16602-2.rs index 742eb6c280e3..197059202e0d 100644 --- a/src/test/run-pass/issue-16602-2.rs +++ b/src/test/ui/run-pass/issues/issue-16602-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct A { pub x: u32, pub y: u32, diff --git a/src/test/run-pass/issue-16602-3.rs b/src/test/ui/run-pass/issues/issue-16602-3.rs similarity index 98% rename from src/test/run-pass/issue-16602-3.rs rename to src/test/ui/run-pass/issues/issue-16602-3.rs index d29932dcf683..5346851f0f28 100644 --- a/src/test/run-pass/issue-16602-3.rs +++ b/src/test/ui/run-pass/issues/issue-16602-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] enum Foo { Bar(u32, u32), diff --git a/src/test/run-pass/issue-16643.rs b/src/test/ui/run-pass/issues/issue-16643.rs similarity index 98% rename from src/test/run-pass/issue-16643.rs rename to src/test/ui/run-pass/issues/issue-16643.rs index 54572296df7e..7bfb5444d05b 100644 --- a/src/test/run-pass/issue-16643.rs +++ b/src/test/ui/run-pass/issues/issue-16643.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-16643.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-16648.rs b/src/test/ui/run-pass/issues/issue-16648.rs similarity index 98% rename from src/test/run-pass/issue-16648.rs rename to src/test/ui/run-pass/issues/issue-16648.rs index bf272308fa9d..cd0fca9ad629 100644 --- a/src/test/run-pass/issue-16648.rs +++ b/src/test/ui/run-pass/issues/issue-16648.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let x: (isize, &[isize]) = (2, &[1, 2]); assert_eq!(match x { diff --git a/src/test/run-pass/issue-16668.rs b/src/test/ui/run-pass/issues/issue-16668.rs similarity index 98% rename from src/test/run-pass/issue-16668.rs rename to src/test/ui/run-pass/issues/issue-16668.rs index 7944e80a4286..08f696cfcf4b 100644 --- a/src/test/run-pass/issue-16668.rs +++ b/src/test/ui/run-pass/issues/issue-16668.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Parser<'a, I, O> { parse: Box Result + 'a> } diff --git a/src/test/run-pass/issue-16671.rs b/src/test/ui/run-pass/issues/issue-16671.rs similarity index 98% rename from src/test/run-pass/issue-16671.rs rename to src/test/ui/run-pass/issues/issue-16671.rs index 9f34ad6726cb..5ff2bc97ae23 100644 --- a/src/test/run-pass/issue-16671.rs +++ b/src/test/ui/run-pass/issues/issue-16671.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass //compile-flags: -Z borrowck=compare -Z emit-end-regions #![deny(warnings)] diff --git a/src/test/run-pass/issue-16739.rs b/src/test/ui/run-pass/issues/issue-16739.rs similarity index 99% rename from src/test/run-pass/issue-16739.rs rename to src/test/ui/run-pass/issues/issue-16739.rs index 2bdedfebe3e9..8404e3876597 100644 --- a/src/test/run-pass/issue-16739.rs +++ b/src/test/ui/run-pass/issues/issue-16739.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] #![feature(unboxed_closures, fn_traits)] diff --git a/src/test/run-pass/issue-16745.rs b/src/test/ui/run-pass/issues/issue-16745.rs similarity index 98% rename from src/test/run-pass/issue-16745.rs rename to src/test/ui/run-pass/issues/issue-16745.rs index 79fe0b0177a4..4603c0c2c56f 100644 --- a/src/test/run-pass/issue-16745.rs +++ b/src/test/ui/run-pass/issues/issue-16745.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { const X: u8 = 0; let out: u8 = match 0u8 { diff --git a/src/test/run-pass/issue-16774.rs b/src/test/ui/run-pass/issues/issue-16774.rs similarity index 99% rename from src/test/run-pass/issue-16774.rs rename to src/test/ui/run-pass/issues/issue-16774.rs index 1309d2ffab8e..dbaa6c30f45a 100644 --- a/src/test/run-pass/issue-16774.rs +++ b/src/test/ui/run-pass/issues/issue-16774.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] #![feature(box_patterns)] diff --git a/src/test/run-pass/issue-16783.rs b/src/test/ui/run-pass/issues/issue-16783.rs similarity index 97% rename from src/test/run-pass/issue-16783.rs rename to src/test/ui/run-pass/issues/issue-16783.rs index 33cdbca14e36..bafeb9716c51 100644 --- a/src/test/run-pass/issue-16783.rs +++ b/src/test/ui/run-pass/issues/issue-16783.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-16819.rs b/src/test/ui/run-pass/issues/issue-16819.rs similarity index 98% rename from src/test/run-pass/issue-16819.rs rename to src/test/ui/run-pass/issues/issue-16819.rs index ecd8a3390b75..498abc1c7337 100644 --- a/src/test/run-pass/issue-16819.rs +++ b/src/test/ui/run-pass/issues/issue-16819.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // `#[cfg]` on struct field permits empty unusable struct struct S { diff --git a/src/test/run-pass/issue-16922.rs b/src/test/ui/run-pass/issues/issue-16922.rs similarity index 97% rename from src/test/run-pass/issue-16922.rs rename to src/test/ui/run-pass/issues/issue-16922.rs index 1fdc27eb1284..8eb066e6f002 100644 --- a/src/test/run-pass/issue-16922.rs +++ b/src/test/ui/run-pass/issues/issue-16922.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::any::Any; diff --git a/src/test/run-pass/issue-1696.rs b/src/test/ui/run-pass/issues/issue-1696.rs similarity index 98% rename from src/test/run-pass/issue-1696.rs rename to src/test/ui/run-pass/issues/issue-1696.rs index b06285b06a5e..d205bed72262 100644 --- a/src/test/run-pass/issue-1696.rs +++ b/src/test/ui/run-pass/issues/issue-1696.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::HashMap; pub fn main() { diff --git a/src/test/run-pass/issue-1701.rs b/src/test/ui/run-pass/issues/issue-1701.rs similarity index 96% rename from src/test/run-pass/issue-1701.rs rename to src/test/ui/run-pass/issues/issue-1701.rs index 49ee99b22a12..433fd4c1af3f 100644 --- a/src/test/run-pass/issue-1701.rs +++ b/src/test/ui/run-pass/issues/issue-1701.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + enum pattern { tabby, tortoiseshell, calico } enum breed { beagle, rottweiler, pug } diff --git a/src/test/run-pass/issue-17068.rs b/src/test/ui/run-pass/issues/issue-17068.rs similarity index 98% rename from src/test/run-pass/issue-17068.rs rename to src/test/ui/run-pass/issues/issue-17068.rs index 91264b4ac3f2..ece2284d3c50 100644 --- a/src/test/run-pass/issue-17068.rs +++ b/src/test/ui/run-pass/issues/issue-17068.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that regionck creates the right region links in the pattern // binding of a for loop diff --git a/src/test/run-pass/issue-17074.rs b/src/test/ui/run-pass/issues/issue-17074.rs similarity index 98% rename from src/test/run-pass/issue-17074.rs rename to src/test/ui/run-pass/issues/issue-17074.rs index ec2d8f79781c..063cf7b0a03b 100644 --- a/src/test/run-pass/issue-17074.rs +++ b/src/test/ui/run-pass/issues/issue-17074.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass static X2: u64 = !0 as u16 as u64; static Y2: u64 = !0 as u32 as u64; diff --git a/src/test/run-pass/issue-17121.rs b/src/test/ui/run-pass/issues/issue-17121.rs similarity index 98% rename from src/test/run-pass/issue-17121.rs rename to src/test/ui/run-pass/issues/issue-17121.rs index 6eb813025ec1..8da01966959e 100644 --- a/src/test/run-pass/issue-17121.rs +++ b/src/test/ui/run-pass/issues/issue-17121.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 // ignore-cloudabi no std::fs diff --git a/src/test/run-pass/issue-17170.rs b/src/test/ui/run-pass/issues/issue-17170.rs similarity index 98% rename from src/test/run-pass/issue-17170.rs rename to src/test/ui/run-pass/issues/issue-17170.rs index c786064ba01a..f876f1e14636 100644 --- a/src/test/run-pass/issue-17170.rs +++ b/src/test/ui/run-pass/issues/issue-17170.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(repr_simd)] #[repr(simd)] diff --git a/src/test/run-pass/issue-17216.rs b/src/test/ui/run-pass/issues/issue-17216.rs similarity index 98% rename from src/test/run-pass/issue-17216.rs rename to src/test/ui/run-pass/issues/issue-17216.rs index e713bbf127d8..dc2848cc1908 100644 --- a/src/test/run-pass/issue-17216.rs +++ b/src/test/ui/run-pass/issues/issue-17216.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Leak<'a> { dropped: &'a mut bool } diff --git a/src/test/run-pass/issue-17233.rs b/src/test/ui/run-pass/issues/issue-17233.rs similarity index 98% rename from src/test/run-pass/issue-17233.rs rename to src/test/ui/run-pass/issues/issue-17233.rs index e9f0c73e29db..15571d563b23 100644 --- a/src/test/run-pass/issue-17233.rs +++ b/src/test/ui/run-pass/issues/issue-17233.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const X1: &'static [u8] = &[b'1']; const X2: &'static [u8] = b"1"; diff --git a/src/test/run-pass/issue-17302.rs b/src/test/ui/run-pass/issues/issue-17302.rs similarity index 98% rename from src/test/run-pass/issue-17302.rs rename to src/test/ui/run-pass/issues/issue-17302.rs index 59625581167d..708257de0b79 100644 --- a/src/test/run-pass/issue-17302.rs +++ b/src/test/ui/run-pass/issues/issue-17302.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass static mut DROPPED: [bool; 2] = [false, false]; diff --git a/src/test/run-pass/issue-17322.rs b/src/test/ui/run-pass/issues/issue-17322.rs similarity index 98% rename from src/test/run-pass/issue-17322.rs rename to src/test/ui/run-pass/issues/issue-17322.rs index c94345f794d1..dc17f02ab624 100644 --- a/src/test/run-pass/issue-17322.rs +++ b/src/test/ui/run-pass/issues/issue-17322.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-17336.rs b/src/test/ui/run-pass/issues/issue-17336.rs similarity index 97% rename from src/test/run-pass/issue-17336.rs rename to src/test/ui/run-pass/issues/issue-17336.rs index ce04237081f7..aea2b67a92fb 100644 --- a/src/test/run-pass/issue-17336.rs +++ b/src/test/ui/run-pass/issues/issue-17336.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[allow(dead_code)] fn check(a: &str) { let x = a as *const str; diff --git a/src/test/run-pass/issue-17351.rs b/src/test/ui/run-pass/issues/issue-17351.rs similarity index 98% rename from src/test/run-pass/issue-17351.rs rename to src/test/ui/run-pass/issues/issue-17351.rs index 88f83a300a78..69c015ae3e80 100644 --- a/src/test/run-pass/issue-17351.rs +++ b/src/test/ui/run-pass/issues/issue-17351.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Str { fn foo(&self) {} } diff --git a/src/test/run-pass/issue-17361.rs b/src/test/ui/run-pass/issues/issue-17361.rs similarity index 98% rename from src/test/run-pass/issue-17361.rs rename to src/test/ui/run-pass/issues/issue-17361.rs index 354b0861758c..9e478a39b824 100644 --- a/src/test/run-pass/issue-17361.rs +++ b/src/test/ui/run-pass/issues/issue-17361.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that astconv doesn't forget about mutability of &mut str // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-17450.rs b/src/test/ui/run-pass/issues/issue-17450.rs similarity index 97% rename from src/test/run-pass/issue-17450.rs rename to src/test/ui/run-pass/issues/issue-17450.rs index 242d8c20cd75..67a44951ae03 100644 --- a/src/test/run-pass/issue-17450.rs +++ b/src/test/ui/run-pass/issues/issue-17450.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code, warnings)] static mut x: isize = 3; diff --git a/src/test/run-pass/issue-17503.rs b/src/test/ui/run-pass/issues/issue-17503.rs similarity index 98% rename from src/test/run-pass/issue-17503.rs rename to src/test/ui/run-pass/issues/issue-17503.rs index 796277ce74d1..909098e39823 100644 --- a/src/test/run-pass/issue-17503.rs +++ b/src/test/ui/run-pass/issues/issue-17503.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let s: &[isize] = &[0, 1, 2, 3, 4]; let ss: &&[isize] = &s; diff --git a/src/test/run-pass/issue-17662.rs b/src/test/ui/run-pass/issues/issue-17662.rs similarity index 98% rename from src/test/run-pass/issue-17662.rs rename to src/test/ui/run-pass/issues/issue-17662.rs index 320d108cfae7..10ee3ce17413 100644 --- a/src/test/run-pass/issue-17662.rs +++ b/src/test/ui/run-pass/issues/issue-17662.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-17662.rs diff --git a/src/test/run-pass/issue-17718-borrow-interior.rs b/src/test/ui/run-pass/issues/issue-17718-borrow-interior.rs similarity index 98% rename from src/test/run-pass/issue-17718-borrow-interior.rs rename to src/test/ui/run-pass/issues/issue-17718-borrow-interior.rs index cafc03752578..505aefdd1c7c 100644 --- a/src/test/run-pass/issue-17718-borrow-interior.rs +++ b/src/test/ui/run-pass/issues/issue-17718-borrow-interior.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S { a: usize } static A: S = S { a: 3 }; diff --git a/src/test/run-pass/issue-17718-const-destructors.rs b/src/test/ui/run-pass/issues/issue-17718-const-destructors.rs similarity index 97% rename from src/test/run-pass/issue-17718-const-destructors.rs rename to src/test/ui/run-pass/issues/issue-17718-const-destructors.rs index ca0b222050e2..6f8fbbd9f789 100644 --- a/src/test/run-pass/issue-17718-const-destructors.rs +++ b/src/test/ui/run-pass/issues/issue-17718-const-destructors.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct A; impl Drop for A { fn drop(&mut self) {} diff --git a/src/test/run-pass/issue-17718-parse-const.rs b/src/test/ui/run-pass/issues/issue-17718-parse-const.rs similarity index 97% rename from src/test/run-pass/issue-17718-parse-const.rs rename to src/test/ui/run-pass/issues/issue-17718-parse-const.rs index 9be92d659785..e9925252540d 100644 --- a/src/test/run-pass/issue-17718-parse-const.rs +++ b/src/test/ui/run-pass/issues/issue-17718-parse-const.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const FOO: usize = 3; diff --git a/src/test/run-pass/issue-17718-static-unsafe-interior.rs b/src/test/ui/run-pass/issues/issue-17718-static-unsafe-interior.rs similarity index 99% rename from src/test/run-pass/issue-17718-static-unsafe-interior.rs rename to src/test/ui/run-pass/issues/issue-17718-static-unsafe-interior.rs index 5f7629fa2677..2ac6a9013585 100644 --- a/src/test/run-pass/issue-17718-static-unsafe-interior.rs +++ b/src/test/ui/run-pass/issues/issue-17718-static-unsafe-interior.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::marker; diff --git a/src/test/run-pass/issue-17718.rs b/src/test/ui/run-pass/issues/issue-17718.rs similarity index 99% rename from src/test/run-pass/issue-17718.rs rename to src/test/ui/run-pass/issues/issue-17718.rs index 502e4a816640..c332d0b586d3 100644 --- a/src/test/run-pass/issue-17718.rs +++ b/src/test/ui/run-pass/issues/issue-17718.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-17718-aux.rs extern crate issue_17718_aux as other; diff --git a/src/test/run-pass/issue-17732.rs b/src/test/ui/run-pass/issues/issue-17732.rs similarity index 98% rename from src/test/run-pass/issue-17732.rs rename to src/test/ui/run-pass/issues/issue-17732.rs index 9a678f00157e..e69d8fabe868 100644 --- a/src/test/run-pass/issue-17732.rs +++ b/src/test/ui/run-pass/issues/issue-17732.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Person { diff --git a/src/test/run-pass/issue-17734.rs b/src/test/ui/run-pass/issues/issue-17734.rs similarity index 98% rename from src/test/run-pass/issue-17734.rs rename to src/test/ui/run-pass/issues/issue-17734.rs index 8178c1fd7c88..e52337667c8a 100644 --- a/src/test/run-pass/issue-17734.rs +++ b/src/test/ui/run-pass/issues/issue-17734.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that generating drop glue for Box doesn't ICE diff --git a/src/test/run-pass/issue-17746.rs b/src/test/ui/run-pass/issues/issue-17746.rs similarity index 98% rename from src/test/run-pass/issue-17746.rs rename to src/test/ui/run-pass/issues/issue-17746.rs index a66d5e102888..7e88068419e8 100644 --- a/src/test/run-pass/issue-17746.rs +++ b/src/test/ui/run-pass/issues/issue-17746.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #17746 fn main() {} diff --git a/src/test/run-pass/issue-17756.rs b/src/test/ui/run-pass/issues/issue-17756.rs similarity index 92% rename from src/test/run-pass/issue-17756.rs rename to src/test/ui/run-pass/issues/issue-17756.rs index 1b108463c748..8c3f6b935888 100644 --- a/src/test/run-pass/issue-17756.rs +++ b/src/test/ui/run-pass/issues/issue-17756.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + const count : usize = 2 as usize; fn main() { let larger : [usize; count*2]; diff --git a/src/test/run-pass/issue-17771.rs b/src/test/ui/run-pass/issues/issue-17771.rs similarity index 98% rename from src/test/run-pass/issue-17771.rs rename to src/test/ui/run-pass/issues/issue-17771.rs index fc821441330a..ccea8846b086 100644 --- a/src/test/run-pass/issue-17771.rs +++ b/src/test/ui/run-pass/issues/issue-17771.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Aaa { fn dummy(&self) { } } diff --git a/src/test/run-pass/issue-17816.rs b/src/test/ui/run-pass/issues/issue-17816.rs similarity index 98% rename from src/test/run-pass/issue-17816.rs rename to src/test/ui/run-pass/issues/issue-17816.rs index a9aa4cdd4f69..0f96035b2745 100644 --- a/src/test/run-pass/issue-17816.rs +++ b/src/test/ui/run-pass/issues/issue-17816.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::marker::PhantomData; fn main() { diff --git a/src/test/run-pass/issue-17877.rs b/src/test/ui/run-pass/issues/issue-17877.rs similarity index 98% rename from src/test/run-pass/issue-17877.rs rename to src/test/ui/run-pass/issues/issue-17877.rs index d3fe0903a1d6..4dee51c4289f 100644 --- a/src/test/run-pass/issue-17877.rs +++ b/src/test/ui/run-pass/issues/issue-17877.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(slice_patterns)] fn main() { diff --git a/src/test/run-pass/issue-17897.rs b/src/test/ui/run-pass/issues/issue-17897.rs similarity index 98% rename from src/test/run-pass/issue-17897.rs rename to src/test/ui/run-pass/issues/issue-17897.rs index 82ecd6361303..e543606c9c9d 100644 --- a/src/test/run-pass/issue-17897.rs +++ b/src/test/ui/run-pass/issues/issue-17897.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn action(mut cb: Box usize>) -> usize { cb(1) } diff --git a/src/test/run-pass/issue-17904.rs b/src/test/ui/run-pass/issues/issue-17904.rs similarity index 98% rename from src/test/run-pass/issue-17904.rs rename to src/test/ui/run-pass/issues/issue-17904.rs index 994001a82ce3..2a86611a196d 100644 --- a/src/test/run-pass/issue-17904.rs +++ b/src/test/ui/run-pass/issues/issue-17904.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can parse where clauses on various forms of tuple // structs. diff --git a/src/test/run-pass/issue-18060.rs b/src/test/ui/run-pass/issues/issue-18060.rs similarity index 98% rename from src/test/run-pass/issue-18060.rs rename to src/test/ui/run-pass/issues/issue-18060.rs index 322a3d8c9bb2..2714de4b59f6 100644 --- a/src/test/run-pass/issue-18060.rs +++ b/src/test/ui/run-pass/issues/issue-18060.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #18060: match arms were matching in the wrong order. fn main() { diff --git a/src/test/run-pass/issue-18075.rs b/src/test/ui/run-pass/issues/issue-18075.rs similarity index 97% rename from src/test/run-pass/issue-18075.rs rename to src/test/ui/run-pass/issues/issue-18075.rs index 5f07ba2235fd..edf923fbaf22 100644 --- a/src/test/run-pass/issue-18075.rs +++ b/src/test/ui/run-pass/issues/issue-18075.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // exec-env:RUST_LOG=rustc::middle=debug fn main() { diff --git a/src/test/run-pass/issue-18083.rs b/src/test/ui/run-pass/issues/issue-18083.rs similarity index 98% rename from src/test/run-pass/issue-18083.rs rename to src/test/ui/run-pass/issues/issue-18083.rs index ff26e186db39..152cba82222c 100644 --- a/src/test/run-pass/issue-18083.rs +++ b/src/test/ui/run-pass/issues/issue-18083.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // These crossed imports should resolve fine, and not block on // each other and be reported as unresolved. diff --git a/src/test/run-pass/issue-18088.rs b/src/test/ui/run-pass/issues/issue-18088.rs similarity index 98% rename from src/test/run-pass/issue-18088.rs rename to src/test/ui/run-pass/issues/issue-18088.rs index a45256387d6c..cff5ba70128d 100644 --- a/src/test/run-pass/issue-18088.rs +++ b/src/test/ui/run-pass/issues/issue-18088.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Indexable: std::ops::Index { fn index2(&self, i: usize) -> &T { diff --git a/src/test/run-pass/issue-18110.rs b/src/test/ui/run-pass/issues/issue-18110.rs similarity index 97% rename from src/test/run-pass/issue-18110.rs rename to src/test/ui/run-pass/issues/issue-18110.rs index eecdea66cf6f..d6733050216d 100644 --- a/src/test/run-pass/issue-18110.rs +++ b/src/test/ui/run-pass/issues/issue-18110.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-18173.rs b/src/test/ui/run-pass/issues/issue-18173.rs similarity index 98% rename from src/test/run-pass/issue-18173.rs rename to src/test/ui/run-pass/issues/issue-18173.rs index f4266fada32f..eb29de18ac9d 100644 --- a/src/test/run-pass/issue-18173.rs +++ b/src/test/ui/run-pass/issues/issue-18173.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { type T; } diff --git a/src/test/run-pass/issue-18188.rs b/src/test/ui/run-pass/issues/issue-18188.rs similarity index 98% rename from src/test/run-pass/issue-18188.rs rename to src/test/ui/run-pass/issues/issue-18188.rs index 18088a5f3ec3..60d8edc9d590 100644 --- a/src/test/run-pass/issue-18188.rs +++ b/src/test/ui/run-pass/issues/issue-18188.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub trait Promisable: Send + Sync {} diff --git a/src/test/run-pass/issue-1821.rs b/src/test/ui/run-pass/issues/issue-1821.rs similarity index 93% rename from src/test/run-pass/issue-1821.rs rename to src/test/ui/run-pass/issues/issue-1821.rs index bdff5ba484dc..27c225a1916a 100644 --- a/src/test/run-pass/issue-1821.rs +++ b/src/test/ui/run-pass/issues/issue-1821.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // Issue #1821 - Don't recurse trying to typecheck this diff --git a/src/test/run-pass/issue-18232.rs b/src/test/ui/run-pass/issues/issue-18232.rs similarity index 98% rename from src/test/run-pass/issue-18232.rs rename to src/test/ui/run-pass/issues/issue-18232.rs index 376d6523ccb9..61b7306e9df1 100644 --- a/src/test/run-pass/issue-18232.rs +++ b/src/test/ui/run-pass/issues/issue-18232.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Cursor<'a>(::std::marker::PhantomData<&'a ()>); diff --git a/src/test/run-pass/issue-18352.rs b/src/test/ui/run-pass/issues/issue-18352.rs similarity index 98% rename from src/test/run-pass/issue-18352.rs rename to src/test/ui/run-pass/issues/issue-18352.rs index cce6ba407a66..802e918e9540 100644 --- a/src/test/run-pass/issue-18352.rs +++ b/src/test/ui/run-pass/issues/issue-18352.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const X: &'static str = "12345"; diff --git a/src/test/run-pass/issue-18353.rs b/src/test/ui/run-pass/issues/issue-18353.rs similarity index 98% rename from src/test/run-pass/issue-18353.rs rename to src/test/ui/run-pass/issues/issue-18353.rs index 1386c9d0daa5..279ee89a4920 100644 --- a/src/test/run-pass/issue-18353.rs +++ b/src/test/ui/run-pass/issues/issue-18353.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that wrapping an unsized struct in an enum which gets optimised does // not ICE. diff --git a/src/test/run-pass/issue-18412.rs b/src/test/ui/run-pass/issues/issue-18412.rs similarity index 98% rename from src/test/run-pass/issue-18412.rs rename to src/test/ui/run-pass/issues/issue-18412.rs index 1017fab5ae2e..3d1a66877ed5 100644 --- a/src/test/run-pass/issue-18412.rs +++ b/src/test/ui/run-pass/issues/issue-18412.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that non-static methods can be assigned to local variables as // function pointers. diff --git a/src/test/run-pass/issue-18425.rs b/src/test/ui/run-pass/issues/issue-18425.rs similarity index 98% rename from src/test/run-pass/issue-18425.rs rename to src/test/ui/run-pass/issues/issue-18425.rs index 797b31971821..615dc8b4f3ce 100644 --- a/src/test/run-pass/issue-18425.rs +++ b/src/test/ui/run-pass/issues/issue-18425.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that codegen doesn't ICE when codegenning an array repeat // expression with a count of 1 and a non-Copy element type. diff --git a/src/test/run-pass/issue-18446.rs b/src/test/ui/run-pass/issues/issue-18446.rs similarity index 98% rename from src/test/run-pass/issue-18446.rs rename to src/test/ui/run-pass/issues/issue-18446.rs index eb321e046dcb..0758ceb0954e 100644 --- a/src/test/run-pass/issue-18446.rs +++ b/src/test/ui/run-pass/issues/issue-18446.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that methods in trait impls should override default methods. trait T { diff --git a/src/test/run-pass/issue-18464.rs b/src/test/ui/run-pass/issues/issue-18464.rs similarity index 98% rename from src/test/run-pass/issue-18464.rs rename to src/test/ui/run-pass/issues/issue-18464.rs index f4faab5e4685..64536e993c59 100644 --- a/src/test/run-pass/issue-18464.rs +++ b/src/test/ui/run-pass/issues/issue-18464.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(dead_code)] const LOW_RANGE: char = '0'; diff --git a/src/test/run-pass/issue-18501.rs b/src/test/ui/run-pass/issues/issue-18501.rs similarity index 98% rename from src/test/run-pass/issue-18501.rs rename to src/test/ui/run-pass/issues/issue-18501.rs index fb8158c6ddc6..2a82b1ab81d2 100644 --- a/src/test/run-pass/issue-18501.rs +++ b/src/test/ui/run-pass/issues/issue-18501.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we don't ICE when inlining a function from another // crate that uses a trait method as a value due to incorrectly // translating the def ID of the trait during AST decoding. diff --git a/src/test/run-pass/issue-18514.rs b/src/test/ui/run-pass/issues/issue-18514.rs similarity index 98% rename from src/test/run-pass/issue-18514.rs rename to src/test/ui/run-pass/issues/issue-18514.rs index f8bebb4a40be..6a59b74bd063 100644 --- a/src/test/run-pass/issue-18514.rs +++ b/src/test/ui/run-pass/issues/issue-18514.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we don't ICE when codegenning a generic impl method from // an extern crate that contains a match expression on a local // variable place where one of the match case bodies contains an diff --git a/src/test/run-pass/issue-18539.rs b/src/test/ui/run-pass/issues/issue-18539.rs similarity index 98% rename from src/test/run-pass/issue-18539.rs rename to src/test/ui/run-pass/issues/issue-18539.rs index 8de2d1e4259c..a3211845d586 100644 --- a/src/test/run-pass/issue-18539.rs +++ b/src/test/ui/run-pass/issues/issue-18539.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that coercing bare fn's that return a zero sized type to // a closure doesn't cause an LLVM ERROR diff --git a/src/test/run-pass/issue-18652.rs b/src/test/ui/run-pass/issues/issue-18652.rs similarity index 98% rename from src/test/run-pass/issue-18652.rs rename to src/test/ui/run-pass/issues/issue-18652.rs index 1eddc34f5b17..2c027dada87d 100644 --- a/src/test/run-pass/issue-18652.rs +++ b/src/test/ui/run-pass/issues/issue-18652.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests multiple free variables being passed by value into an unboxed // once closure as an optimization by codegen. This used to hit an // incorrect assert. diff --git a/src/test/run-pass/issue-18655.rs b/src/test/ui/run-pass/issues/issue-18655.rs similarity index 98% rename from src/test/run-pass/issue-18655.rs rename to src/test/ui/run-pass/issues/issue-18655.rs index cdb83ae5caa0..94638539f6eb 100644 --- a/src/test/run-pass/issue-18655.rs +++ b/src/test/ui/run-pass/issues/issue-18655.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Factory { type Product; fn create(&self) -> ::Product; diff --git a/src/test/run-pass/issue-1866.rs b/src/test/ui/run-pass/issues/issue-1866.rs similarity index 95% rename from src/test/run-pass/issue-1866.rs rename to src/test/ui/run-pass/issues/issue-1866.rs index 2c346b93f5e8..cf4a0ddea987 100644 --- a/src/test/run-pass/issue-1866.rs +++ b/src/test/ui/run-pass/issues/issue-1866.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 mod a { diff --git a/src/test/run-pass/issue-18661.rs b/src/test/ui/run-pass/issues/issue-18661.rs similarity index 98% rename from src/test/run-pass/issue-18661.rs rename to src/test/ui/run-pass/issues/issue-18661.rs index 4287f449c6fd..0b20cd45cf23 100644 --- a/src/test/run-pass/issue-18661.rs +++ b/src/test/ui/run-pass/issues/issue-18661.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that param substitutions from the correct environment are // used when codegenning unboxed closure calls. diff --git a/src/test/run-pass/issue-18685.rs b/src/test/ui/run-pass/issues/issue-18685.rs similarity index 98% rename from src/test/run-pass/issue-18685.rs rename to src/test/ui/run-pass/issues/issue-18685.rs index b569dbc8062e..98f59ed2ccdb 100644 --- a/src/test/run-pass/issue-18685.rs +++ b/src/test/ui/run-pass/issues/issue-18685.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the self param space is not used in a conflicting // manner by unboxed closures within a default method on a trait diff --git a/src/test/run-pass/issue-18711.rs b/src/test/ui/run-pass/issues/issue-18711.rs similarity index 98% rename from src/test/run-pass/issue-18711.rs rename to src/test/ui/run-pass/issues/issue-18711.rs index 8239d74d6df1..3c3b914e67ae 100644 --- a/src/test/run-pass/issue-18711.rs +++ b/src/test/ui/run-pass/issues/issue-18711.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we don't panic on a RefCell borrow conflict in certain // code paths involving unboxed closures. diff --git a/src/test/run-pass/issue-18738.rs b/src/test/ui/run-pass/issues/issue-18738.rs similarity index 98% rename from src/test/run-pass/issue-18738.rs rename to src/test/ui/run-pass/issues/issue-18738.rs index 819ec532ed2c..f586552dcb36 100644 --- a/src/test/run-pass/issue-18738.rs +++ b/src/test/ui/run-pass/issues/issue-18738.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Eq, PartialEq, PartialOrd, Ord)] enum Test<'a> { Int(&'a isize), diff --git a/src/test/run-pass/issue-18767.rs b/src/test/ui/run-pass/issues/issue-18767.rs similarity index 98% rename from src/test/run-pass/issue-18767.rs rename to src/test/ui/run-pass/issues/issue-18767.rs index 264985b791e7..3577850be2f3 100644 --- a/src/test/run-pass/issue-18767.rs +++ b/src/test/ui/run-pass/issues/issue-18767.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that regionck uses the right memcat for patterns in for loops // and doesn't ICE. diff --git a/src/test/run-pass/issue-18804/auxiliary/lib.rs b/src/test/ui/run-pass/issues/issue-18804/auxiliary/lib.rs similarity index 100% rename from src/test/run-pass/issue-18804/auxiliary/lib.rs rename to src/test/ui/run-pass/issues/issue-18804/auxiliary/lib.rs diff --git a/src/test/run-pass/issue-18804/main.rs b/src/test/ui/run-pass/issues/issue-18804/main.rs similarity index 98% rename from src/test/run-pass/issue-18804/main.rs rename to src/test/ui/run-pass/issues/issue-18804/main.rs index b5aa05203493..a3a5337077cc 100644 --- a/src/test/run-pass/issue-18804/main.rs +++ b/src/test/ui/run-pass/issues/issue-18804/main.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test for issue #18804, #[linkage] does not propagate thorugh generic // functions. Failure results in a linker error. diff --git a/src/test/run-pass/issue-18809.rs b/src/test/ui/run-pass/issues/issue-18809.rs similarity index 97% rename from src/test/run-pass/issue-18809.rs rename to src/test/ui/run-pass/issues/issue-18809.rs index b646fa9e62de..1895b3bdfe45 100644 --- a/src/test/run-pass/issue-18809.rs +++ b/src/test/ui/run-pass/issues/issue-18809.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Tup { type T0; type T1; diff --git a/src/test/run-pass/issue-18845.rs b/src/test/ui/run-pass/issues/issue-18845.rs similarity index 98% rename from src/test/run-pass/issue-18845.rs rename to src/test/ui/run-pass/issues/issue-18845.rs index 241408ddef13..1510c774b28a 100644 --- a/src/test/run-pass/issue-18845.rs +++ b/src/test/ui/run-pass/issues/issue-18845.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This used to generate invalid IR in that even if we took the // `false` branch we'd still try to free the Box from the other // arm. This was due to treating `*Box::new(9)` as an rvalue datum diff --git a/src/test/run-pass/issue-18859.rs b/src/test/ui/run-pass/issues/issue-18859.rs similarity index 98% rename from src/test/run-pass/issue-18859.rs rename to src/test/ui/run-pass/issues/issue-18859.rs index 7c7501d3420d..4c98cb2d02da 100644 --- a/src/test/run-pass/issue-18859.rs +++ b/src/test/ui/run-pass/issues/issue-18859.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod foo { pub mod bar { diff --git a/src/test/run-pass/issue-18906.rs b/src/test/ui/run-pass/issues/issue-18906.rs similarity index 98% rename from src/test/run-pass/issue-18906.rs rename to src/test/ui/run-pass/issues/issue-18906.rs index 7cc61dd25327..08a39350c578 100644 --- a/src/test/run-pass/issue-18906.rs +++ b/src/test/ui/run-pass/issues/issue-18906.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub trait Borrow { diff --git a/src/test/run-pass/issue-18913.rs b/src/test/ui/run-pass/issues/issue-18913.rs similarity index 98% rename from src/test/run-pass/issue-18913.rs rename to src/test/ui/run-pass/issues/issue-18913.rs index 9bb1371045e9..578826484059 100644 --- a/src/test/run-pass/issue-18913.rs +++ b/src/test/ui/run-pass/issues/issue-18913.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-18913-1.rs // aux-build:issue-18913-2.rs diff --git a/src/test/run-pass/issue-18937-1.rs b/src/test/ui/run-pass/issues/issue-18937-1.rs similarity index 98% rename from src/test/run-pass/issue-18937-1.rs rename to src/test/ui/run-pass/issues/issue-18937-1.rs index 7a24d087b44e..bf6a33d69cc7 100644 --- a/src/test/run-pass/issue-18937-1.rs +++ b/src/test/ui/run-pass/issues/issue-18937-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to type-check this example. In particular, // knowing that `T: 'a` allows us to deduce that `[U]: 'a` (because // when `T=[U]` it implies that `U: 'a`). diff --git a/src/test/run-pass/issue-18988.rs b/src/test/ui/run-pass/issues/issue-18988.rs similarity index 97% rename from src/test/run-pass/issue-18988.rs rename to src/test/ui/run-pass/issues/issue-18988.rs index e41ac6bdbeb8..422a0f7d7d65 100644 --- a/src/test/run-pass/issue-18988.rs +++ b/src/test/ui/run-pass/issues/issue-18988.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Foo : Send { } pub struct MyFoo { diff --git a/src/test/run-pass/issue-19001.rs b/src/test/ui/run-pass/issues/issue-19001.rs similarity index 98% rename from src/test/run-pass/issue-19001.rs rename to src/test/ui/run-pass/issues/issue-19001.rs index 3340ed1ffd99..4407cbf501e6 100644 --- a/src/test/run-pass/issue-19001.rs +++ b/src/test/ui/run-pass/issues/issue-19001.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // check that we handle recursive arrays correctly in `type_of` struct Loopy { diff --git a/src/test/run-pass/issue-19037.rs b/src/test/ui/run-pass/issues/issue-19037.rs similarity index 98% rename from src/test/run-pass/issue-19037.rs rename to src/test/ui/run-pass/issues/issue-19037.rs index 0735693a4bd4..eb3c265617ba 100644 --- a/src/test/run-pass/issue-19037.rs +++ b/src/test/ui/run-pass/issues/issue-19037.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Str([u8]); diff --git a/src/test/run-pass/issue-19081.rs b/src/test/ui/run-pass/issues/issue-19081.rs similarity index 98% rename from src/test/run-pass/issue-19081.rs rename to src/test/ui/run-pass/issues/issue-19081.rs index 8e2fa2b61971..56ceaaf9884a 100644 --- a/src/test/run-pass/issue-19081.rs +++ b/src/test/ui/run-pass/issues/issue-19081.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Hasher { type State; diff --git a/src/test/run-pass/issue-19097.rs b/src/test/ui/run-pass/issues/issue-19097.rs similarity index 98% rename from src/test/run-pass/issue-19097.rs rename to src/test/ui/run-pass/issues/issue-19097.rs index ca4b72f9e5bd..d3415c34791a 100644 --- a/src/test/run-pass/issue-19097.rs +++ b/src/test/ui/run-pass/issues/issue-19097.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // regression test for #19097 struct Foo(T); diff --git a/src/test/run-pass/issue-19098.rs b/src/test/ui/run-pass/issues/issue-19098.rs similarity index 98% rename from src/test/run-pass/issue-19098.rs rename to src/test/ui/run-pass/issues/issue-19098.rs index e526dd2903e5..5b114659ae9e 100644 --- a/src/test/run-pass/issue-19098.rs +++ b/src/test/ui/run-pass/issues/issue-19098.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Handler { fn handle(&self, _: &mut String); } diff --git a/src/test/run-pass/issue-19102.rs b/src/test/ui/run-pass/issues/issue-19102.rs similarity index 97% rename from src/test/run-pass/issue-19102.rs rename to src/test/ui/run-pass/issues/issue-19102.rs index da2af7792173..eecc9db486e2 100644 --- a/src/test/run-pass/issue-19102.rs +++ b/src/test/ui/run-pass/issues/issue-19102.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(unused_qualifications)] use self::A::B; diff --git a/src/test/run-pass/issue-19127.rs b/src/test/ui/run-pass/issues/issue-19127.rs similarity index 98% rename from src/test/run-pass/issue-19127.rs rename to src/test/ui/run-pass/issues/issue-19127.rs index 8d169917cad9..3290b179864e 100644 --- a/src/test/run-pass/issue-19127.rs +++ b/src/test/ui/run-pass/issues/issue-19127.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn foo T>(f: F) {} diff --git a/src/test/run-pass/issue-19129-1.rs b/src/test/ui/run-pass/issues/issue-19129-1.rs similarity index 98% rename from src/test/run-pass/issue-19129-1.rs rename to src/test/ui/run-pass/issues/issue-19129-1.rs index f9b605c44e91..cdb23e627c97 100644 --- a/src/test/run-pass/issue-19129-1.rs +++ b/src/test/ui/run-pass/issues/issue-19129-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Trait { diff --git a/src/test/run-pass/issue-19129-2.rs b/src/test/ui/run-pass/issues/issue-19129-2.rs similarity index 98% rename from src/test/run-pass/issue-19129-2.rs rename to src/test/ui/run-pass/issues/issue-19129-2.rs index 47b8aaacdadb..4999ee1287c4 100644 --- a/src/test/run-pass/issue-19129-2.rs +++ b/src/test/ui/run-pass/issues/issue-19129-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Trait { diff --git a/src/test/run-pass/issue-19135.rs b/src/test/ui/run-pass/issues/issue-19135.rs similarity index 98% rename from src/test/run-pass/issue-19135.rs rename to src/test/ui/run-pass/issues/issue-19135.rs index ca2098138ef0..8a5fdc3b7756 100644 --- a/src/test/run-pass/issue-19135.rs +++ b/src/test/ui/run-pass/issues/issue-19135.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::marker::PhantomData; #[derive(Debug)] diff --git a/src/test/run-pass/issue-19244.rs b/src/test/ui/run-pass/issues/issue-19244.rs similarity index 99% rename from src/test/run-pass/issue-19244.rs rename to src/test/ui/run-pass/issues/issue-19244.rs index 92ac2e37b90d..93cb0b9dd1fe 100644 --- a/src/test/run-pass/issue-19244.rs +++ b/src/test/ui/run-pass/issues/issue-19244.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct MyStruct { field: usize } struct Nested { nested: MyStruct } diff --git a/src/test/run-pass/issue-19293.rs b/src/test/ui/run-pass/issues/issue-19293.rs similarity index 98% rename from src/test/run-pass/issue-19293.rs rename to src/test/ui/run-pass/issues/issue-19293.rs index 95ca3efb099c..5bb336eba917 100644 --- a/src/test/run-pass/issue-19293.rs +++ b/src/test/ui/run-pass/issues/issue-19293.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_19293.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-19340-1.rs b/src/test/ui/run-pass/issues/issue-19340-1.rs similarity index 98% rename from src/test/run-pass/issue-19340-1.rs rename to src/test/ui/run-pass/issues/issue-19340-1.rs index e553c244c865..53531fcad875 100644 --- a/src/test/run-pass/issue-19340-1.rs +++ b/src/test/ui/run-pass/issues/issue-19340-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-19340-1.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-19340-2.rs b/src/test/ui/run-pass/issues/issue-19340-2.rs similarity index 98% rename from src/test/run-pass/issue-19340-2.rs rename to src/test/ui/run-pass/issues/issue-19340-2.rs index d7747201cbe4..a1b68e87626a 100644 --- a/src/test/run-pass/issue-19340-2.rs +++ b/src/test/ui/run-pass/issues/issue-19340-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 enum Homura { diff --git a/src/test/run-pass/issue-19358.rs b/src/test/ui/run-pass/issues/issue-19358.rs similarity index 98% rename from src/test/run-pass/issue-19358.rs rename to src/test/ui/run-pass/issues/issue-19358.rs index c0c210b3e96a..f58254496ffc 100644 --- a/src/test/run-pass/issue-19358.rs +++ b/src/test/ui/run-pass/issues/issue-19358.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Trait { fn dummy(&self) { } } #[derive(Debug)] diff --git a/src/test/run-pass/issue-19367.rs b/src/test/ui/run-pass/issues/issue-19367.rs similarity index 98% rename from src/test/run-pass/issue-19367.rs rename to src/test/ui/run-pass/issues/issue-19367.rs index d5bb6ebb7de1..dfcc0926d80e 100644 --- a/src/test/run-pass/issue-19367.rs +++ b/src/test/ui/run-pass/issues/issue-19367.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S { o: Option } diff --git a/src/test/run-pass/issue-19398.rs b/src/test/ui/run-pass/issues/issue-19398.rs similarity index 98% rename from src/test/run-pass/issue-19398.rs rename to src/test/ui/run-pass/issues/issue-19398.rs index 2dc5a6e99799..dd2a796dba34 100644 --- a/src/test/run-pass/issue-19398.rs +++ b/src/test/ui/run-pass/issues/issue-19398.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait T { diff --git a/src/test/run-pass/issue-19404.rs b/src/test/ui/run-pass/issues/issue-19404.rs similarity index 98% rename from src/test/run-pass/issue-19404.rs rename to src/test/ui/run-pass/issues/issue-19404.rs index c0f13b0b6c7a..3a5ce65aef8e 100644 --- a/src/test/run-pass/issue-19404.rs +++ b/src/test/ui/run-pass/issues/issue-19404.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::any::TypeId; use std::rc::Rc; diff --git a/src/test/run-pass/issue-19479.rs b/src/test/ui/run-pass/issues/issue-19479.rs similarity index 98% rename from src/test/run-pass/issue-19479.rs rename to src/test/ui/run-pass/issues/issue-19479.rs index 7557c1b44e0d..6326dfd8fe05 100644 --- a/src/test/run-pass/issue-19479.rs +++ b/src/test/ui/run-pass/issues/issue-19479.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Base { diff --git a/src/test/run-pass/issue-19499.rs b/src/test/ui/run-pass/issues/issue-19499.rs similarity index 98% rename from src/test/run-pass/issue-19499.rs rename to src/test/ui/run-pass/issues/issue-19499.rs index 069ceadf9162..5fb209b2dfe4 100644 --- a/src/test/run-pass/issue-19499.rs +++ b/src/test/ui/run-pass/issues/issue-19499.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #19499. Due to incorrect caching of trait // results for closures with upvars whose types were not fully // computed, this rather bizarre little program (along with many more diff --git a/src/test/run-pass/issue-19631.rs b/src/test/ui/run-pass/issues/issue-19631.rs similarity index 98% rename from src/test/run-pass/issue-19631.rs rename to src/test/ui/run-pass/issues/issue-19631.rs index 562d2e4169e6..12804983ee45 100644 --- a/src/test/run-pass/issue-19631.rs +++ b/src/test/ui/run-pass/issues/issue-19631.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait PoolManager { diff --git a/src/test/run-pass/issue-19632.rs b/src/test/ui/run-pass/issues/issue-19632.rs similarity index 98% rename from src/test/run-pass/issue-19632.rs rename to src/test/ui/run-pass/issues/issue-19632.rs index 1cb20011c214..801d5947f92c 100644 --- a/src/test/run-pass/issue-19632.rs +++ b/src/test/ui/run-pass/issues/issue-19632.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait PoolManager { diff --git a/src/test/run-pass/issue-1974.rs b/src/test/ui/run-pass/issues/issue-1974.rs similarity index 98% rename from src/test/run-pass/issue-1974.rs rename to src/test/ui/run-pass/issues/issue-1974.rs index 7b33b4e7a4f3..016afcdd54d8 100644 --- a/src/test/run-pass/issue-1974.rs +++ b/src/test/ui/run-pass/issues/issue-1974.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue 1974 // Don't double free the condition allocation // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-19811-escape-unicode.rs b/src/test/ui/run-pass/issues/issue-19811-escape-unicode.rs similarity index 98% rename from src/test/run-pass/issue-19811-escape-unicode.rs rename to src/test/ui/run-pass/issues/issue-19811-escape-unicode.rs index b447ffd69b4c..5b021f6ee549 100644 --- a/src/test/run-pass/issue-19811-escape-unicode.rs +++ b/src/test/ui/run-pass/issues/issue-19811-escape-unicode.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let mut escaped = String::from(""); diff --git a/src/test/run-pass/issue-19850.rs b/src/test/ui/run-pass/issues/issue-19850.rs similarity index 98% rename from src/test/run-pass/issue-19850.rs rename to src/test/ui/run-pass/issues/issue-19850.rs index 15ca6a9d4c1d..fa837f57edef 100644 --- a/src/test/run-pass/issue-19850.rs +++ b/src/test/ui/run-pass/issues/issue-19850.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that `::Output` and `Self::Output` are accepted as type annotations in let // bindings diff --git a/src/test/run-pass/issue-19982.rs b/src/test/ui/run-pass/issues/issue-19982.rs similarity index 98% rename from src/test/run-pass/issue-19982.rs rename to src/test/ui/run-pass/issues/issue-19982.rs index 30edf24e8b17..380cb3cac228 100644 --- a/src/test/run-pass/issue-19982.rs +++ b/src/test/ui/run-pass/issues/issue-19982.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(fn_traits, unboxed_closures)] diff --git a/src/test/run-pass/issue-20009.rs b/src/test/ui/run-pass/issues/issue-20009.rs similarity index 98% rename from src/test/run-pass/issue-20009.rs rename to src/test/ui/run-pass/issues/issue-20009.rs index 9d433eabe629..604395b3dc7c 100644 --- a/src/test/run-pass/issue-20009.rs +++ b/src/test/ui/run-pass/issues/issue-20009.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that associated types are `Sized` // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-20055-box-trait.rs b/src/test/ui/run-pass/issues/issue-20055-box-trait.rs similarity index 99% rename from src/test/run-pass/issue-20055-box-trait.rs rename to src/test/ui/run-pass/issues/issue-20055-box-trait.rs index 7e89cfe24e16..bd9da3a69c28 100644 --- a/src/test/run-pass/issue-20055-box-trait.rs +++ b/src/test/ui/run-pass/issues/issue-20055-box-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // See Issues #20055 and #21695. // We are checking here that the temporaries `Box<[i8, k]>`, for `k` diff --git a/src/test/run-pass/issue-20055-box-unsized-array.rs b/src/test/ui/run-pass/issues/issue-20055-box-unsized-array.rs similarity index 99% rename from src/test/run-pass/issue-20055-box-unsized-array.rs rename to src/test/ui/run-pass/issues/issue-20055-box-unsized-array.rs index 5af5186e94f3..6af9741dc9be 100644 --- a/src/test/run-pass/issue-20055-box-unsized-array.rs +++ b/src/test/ui/run-pass/issues/issue-20055-box-unsized-array.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #2005: Check that boxed fixed-size arrays are properly // accounted for (namely, only deallocated if they were actually // created) when they appear as temporaries in unused arms of a match diff --git a/src/test/run-pass/issue-20091.rs b/src/test/ui/run-pass/issues/issue-20091.rs similarity index 95% rename from src/test/run-pass/issue-20091.rs rename to src/test/ui/run-pass/issues/issue-20091.rs index 7671b43d493e..46d11b9d9b7d 100644 --- a/src/test/run-pass/issue-20091.rs +++ b/src/test/ui/run-pass/issues/issue-20091.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-20174.rs b/src/test/ui/run-pass/issues/issue-20174.rs similarity index 98% rename from src/test/run-pass/issue-20174.rs rename to src/test/ui/run-pass/issues/issue-20174.rs index 072738812727..57e7193363ee 100644 --- a/src/test/run-pass/issue-20174.rs +++ b/src/test/ui/run-pass/issues/issue-20174.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct GradFn usize>(F); fn main() { diff --git a/src/test/run-pass/issue-20186.rs b/src/test/ui/run-pass/issues/issue-20186.rs similarity index 98% rename from src/test/run-pass/issue-20186.rs rename to src/test/ui/run-pass/issues/issue-20186.rs index b3895e36a19a..0f42d8b1caae 100644 --- a/src/test/run-pass/issue-20186.rs +++ b/src/test/ui/run-pass/issues/issue-20186.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo; impl Foo { diff --git a/src/test/run-pass/issue-20313.rs b/src/test/ui/run-pass/issues/issue-20313.rs similarity index 97% rename from src/test/run-pass/issue-20313.rs rename to src/test/ui/run-pass/issues/issue-20313.rs index 0e5eaf857f35..9e6561369b8b 100644 --- a/src/test/run-pass/issue-20313.rs +++ b/src/test/ui/run-pass/issues/issue-20313.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass // pretty-expanded FIXME #23616 #![feature(link_llvm_intrinsics)] diff --git a/src/test/run-pass/issue-20343.rs b/src/test/ui/run-pass/issues/issue-20343.rs similarity index 98% rename from src/test/run-pass/issue-20343.rs rename to src/test/ui/run-pass/issues/issue-20343.rs index 70064f4e2670..62506e1c49df 100644 --- a/src/test/run-pass/issue-20343.rs +++ b/src/test/ui/run-pass/issues/issue-20343.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for Issue #20343. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-20389.rs b/src/test/ui/run-pass/issues/issue-20389.rs similarity index 98% rename from src/test/run-pass/issue-20389.rs rename to src/test/ui/run-pass/issues/issue-20389.rs index 03c7e9f8db72..21cd3a55268a 100644 --- a/src/test/run-pass/issue-20389.rs +++ b/src/test/ui/run-pass/issues/issue-20389.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_20389.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-20396.rs b/src/test/ui/run-pass/issues/issue-20396.rs similarity index 98% rename from src/test/run-pass/issue-20396.rs rename to src/test/ui/run-pass/issues/issue-20396.rs index f607ed373b34..6f0ce7ca2d46 100644 --- a/src/test/run-pass/issue-20396.rs +++ b/src/test/ui/run-pass/issues/issue-20396.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(dead_code)] diff --git a/src/test/run-pass/issue-20414.rs b/src/test/ui/run-pass/issues/issue-20414.rs similarity index 98% rename from src/test/run-pass/issue-20414.rs rename to src/test/ui/run-pass/issues/issue-20414.rs index d2e2d9bd6efc..2e2449933c08 100644 --- a/src/test/run-pass/issue-20414.rs +++ b/src/test/ui/run-pass/issues/issue-20414.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Trait { diff --git a/src/test/run-pass/issue-20427.rs b/src/test/ui/run-pass/issues/issue-20427.rs similarity index 96% rename from src/test/run-pass/issue-20427.rs rename to src/test/ui/run-pass/issues/issue-20427.rs index 985ca067350a..b03c489e2521 100644 --- a/src/test/run-pass/issue-20427.rs +++ b/src/test/ui/run-pass/issues/issue-20427.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] +#![allow(non_camel_case_types)] + // aux-build:i8.rs // ignore-pretty issue #37201 diff --git a/src/test/run-pass/issue-20454.rs b/src/test/ui/run-pass/issues/issue-20454.rs similarity index 98% rename from src/test/run-pass/issue-20454.rs rename to src/test/ui/run-pass/issues/issue-20454.rs index 15cb79ac6a86..41cc94909a00 100644 --- a/src/test/run-pass/issue-20454.rs +++ b/src/test/ui/run-pass/issues/issue-20454.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::thread; fn _foo() { diff --git a/src/test/run-pass/issue-20544.rs b/src/test/ui/run-pass/issues/issue-20544.rs similarity index 98% rename from src/test/run-pass/issue-20544.rs rename to src/test/ui/run-pass/issues/issue-20544.rs index 322c326ef0d6..1a6e647e625d 100644 --- a/src/test/run-pass/issue-20544.rs +++ b/src/test/ui/run-pass/issues/issue-20544.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(unboxed_closures)] #![feature(fn_traits)] diff --git a/src/test/run-pass/issue-20575.rs b/src/test/ui/run-pass/issues/issue-20575.rs similarity index 98% rename from src/test/run-pass/issue-20575.rs rename to src/test/ui/run-pass/issues/issue-20575.rs index 7db7e3b28e8e..35551185807d 100644 --- a/src/test/run-pass/issue-20575.rs +++ b/src/test/ui/run-pass/issues/issue-20575.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that overloaded calls work with zero arity closures // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-20616.rs b/src/test/ui/run-pass/issues/issue-20616.rs similarity index 99% rename from src/test/run-pass/issue-20616.rs rename to src/test/ui/run-pass/issues/issue-20616.rs index 5727f54cd704..c28d21236692 100644 --- a/src/test/run-pass/issue-20616.rs +++ b/src/test/ui/run-pass/issues/issue-20616.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass type MyType<'a, T> = &'a T; // combine lifetime bounds and type arguments in usual way diff --git a/src/test/run-pass/issue-2063-resource.rs b/src/test/ui/run-pass/issues/issue-2063-resource.rs similarity index 98% rename from src/test/run-pass/issue-2063-resource.rs rename to src/test/ui/run-pass/issues/issue-2063-resource.rs index c3a0dc67e83e..12e9b481dc1f 100644 --- a/src/test/run-pass/issue-2063-resource.rs +++ b/src/test/ui/run-pass/issues/issue-2063-resource.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // test that autoderef of a type like this does not // cause compiler to loop. Note that no instances // of such a type could ever be constructed. diff --git a/src/test/run-pass/issue-2063.rs b/src/test/ui/run-pass/issues/issue-2063.rs similarity index 98% rename from src/test/run-pass/issue-2063.rs rename to src/test/ui/run-pass/issues/issue-2063.rs index 5be4f8e8e738..853c8bc6ec2b 100644 --- a/src/test/run-pass/issue-2063.rs +++ b/src/test/ui/run-pass/issues/issue-2063.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // test that autoderef of a type like this does not // cause compiler to loop. Note that no instances // of such a type could ever be constructed. diff --git a/src/test/run-pass/issue-20644.rs b/src/test/ui/run-pass/issues/issue-20644.rs similarity index 96% rename from src/test/run-pass/issue-20644.rs rename to src/test/ui/run-pass/issues/issue-20644.rs index 65a67d0b41a7..728e2be3d23b 100644 --- a/src/test/run-pass/issue-20644.rs +++ b/src/test/ui/run-pass/issues/issue-20644.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // A reduced version of the rustbook ice. The problem this encountered // had to do with codegen ignoring binders. diff --git a/src/test/run-pass/issue-20676.rs b/src/test/ui/run-pass/issues/issue-20676.rs similarity index 98% rename from src/test/run-pass/issue-20676.rs rename to src/test/ui/run-pass/issues/issue-20676.rs index a30162274139..ff7ea9eaae44 100644 --- a/src/test/run-pass/issue-20676.rs +++ b/src/test/ui/run-pass/issues/issue-20676.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #20676. Error was that we didn't support // UFCS-style calls to a method in `Trait` where `Self` was bound to a // trait object of type `Trait`. See also `ufcs-trait-object.rs`. diff --git a/src/test/run-pass/issue-2074.rs b/src/test/ui/run-pass/issues/issue-2074.rs similarity index 98% rename from src/test/run-pass/issue-2074.rs rename to src/test/ui/run-pass/issues/issue-2074.rs index bd844b7720c8..9aba2637068d 100644 --- a/src/test/run-pass/issue-2074.rs +++ b/src/test/ui/run-pass/issues/issue-2074.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(non_camel_case_types)] diff --git a/src/test/run-pass/issue-20763-1.rs b/src/test/ui/run-pass/issues/issue-20763-1.rs similarity index 98% rename from src/test/run-pass/issue-20763-1.rs rename to src/test/ui/run-pass/issues/issue-20763-1.rs index 98270099df90..0afcc1bd9661 100644 --- a/src/test/run-pass/issue-20763-1.rs +++ b/src/test/ui/run-pass/issues/issue-20763-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait T0 { diff --git a/src/test/run-pass/issue-20763-2.rs b/src/test/ui/run-pass/issues/issue-20763-2.rs similarity index 98% rename from src/test/run-pass/issue-20763-2.rs rename to src/test/ui/run-pass/issues/issue-20763-2.rs index 340670b41203..4b25d4f05def 100644 --- a/src/test/run-pass/issue-20763-2.rs +++ b/src/test/ui/run-pass/issues/issue-20763-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait T0 { diff --git a/src/test/run-pass/issue-20797.rs b/src/test/ui/run-pass/issues/issue-20797.rs similarity index 99% rename from src/test/run-pass/issue-20797.rs rename to src/test/ui/run-pass/issues/issue-20797.rs index 3a4be580fc3e..9c8a2571deb4 100644 --- a/src/test/run-pass/issue-20797.rs +++ b/src/test/ui/run-pass/issues/issue-20797.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no std::fs // Regression test for #20797. diff --git a/src/test/run-pass/issue-20803.rs b/src/test/ui/run-pass/issues/issue-20803.rs similarity index 98% rename from src/test/run-pass/issue-20803.rs rename to src/test/ui/run-pass/issues/issue-20803.rs index 2c00510ba97e..7a3e4e71ace9 100644 --- a/src/test/run-pass/issue-20803.rs +++ b/src/test/ui/run-pass/issues/issue-20803.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Add; fn foo(x: T) -> >::Output where i32: Add { diff --git a/src/test/run-pass/issue-20823.rs b/src/test/ui/run-pass/issues/issue-20823.rs similarity index 96% rename from src/test/run-pass/issue-20823.rs rename to src/test/ui/run-pass/issues/issue-20823.rs index 4d31d0cedb6d..0a3b6f6eaa05 100644 --- a/src/test/run-pass/issue-20823.rs +++ b/src/test/ui/run-pass/issues/issue-20823.rs @@ -8,9 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: --test -#![deny(unstable)] - #[test] pub fn foo() {} diff --git a/src/test/run-pass/issue-20825.rs b/src/test/ui/run-pass/issues/issue-20825.rs similarity index 98% rename from src/test/run-pass/issue-20825.rs rename to src/test/ui/run-pass/issues/issue-20825.rs index 3c76b4bedff6..62435fd343e8 100644 --- a/src/test/run-pass/issue-20825.rs +++ b/src/test/ui/run-pass/issues/issue-20825.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Subscriber { type Input; } diff --git a/src/test/run-pass/issue-20847.rs b/src/test/ui/run-pass/issues/issue-20847.rs similarity index 98% rename from src/test/run-pass/issue-20847.rs rename to src/test/ui/run-pass/issues/issue-20847.rs index d2c335605458..4cb5a01b9de4 100644 --- a/src/test/run-pass/issue-20847.rs +++ b/src/test/ui/run-pass/issues/issue-20847.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(fn_traits)] use std::ops::Fn; diff --git a/src/test/run-pass/issue-20953.rs b/src/test/ui/run-pass/issues/issue-20953.rs similarity index 98% rename from src/test/run-pass/issue-20953.rs rename to src/test/ui/run-pass/issues/issue-20953.rs index 647302bbc930..e3dc286df347 100644 --- a/src/test/run-pass/issue-20953.rs +++ b/src/test/ui/run-pass/issues/issue-20953.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let mut shrinker: Box> = Box::new(vec![1].into_iter()); println!("{:?}", shrinker.next()); diff --git a/src/test/run-pass/issue-21033.rs b/src/test/ui/run-pass/issues/issue-21033.rs similarity index 99% rename from src/test/run-pass/issue-21033.rs rename to src/test/ui/run-pass/issues/issue-21033.rs index 00e792c9a006..f96d2db30d3a 100644 --- a/src/test/run-pass/issue-21033.rs +++ b/src/test/ui/run-pass/issues/issue-21033.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass // pretty-expanded FIXME #23616 #![feature(box_patterns)] diff --git a/src/test/run-pass/issue-21058.rs b/src/test/ui/run-pass/issues/issue-21058.rs similarity index 98% rename from src/test/run-pass/issue-21058.rs rename to src/test/ui/run-pass/issues/issue-21058.rs index 862439e21f4f..318abfe691ed 100644 --- a/src/test/run-pass/issue-21058.rs +++ b/src/test/ui/run-pass/issues/issue-21058.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(core_intrinsics)] struct NT(str); diff --git a/src/test/run-pass/issue-21140.rs b/src/test/ui/run-pass/issues/issue-21140.rs similarity index 97% rename from src/test/run-pass/issue-21140.rs rename to src/test/ui/run-pass/issues/issue-21140.rs index c19f3327fbb4..ebd5f6752e3a 100644 --- a/src/test/run-pass/issue-21140.rs +++ b/src/test/ui/run-pass/issues/issue-21140.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Trait where Self::Out: std::fmt::Display { type Out; } diff --git a/src/test/run-pass/issue-21174.rs b/src/test/ui/run-pass/issues/issue-21174.rs similarity index 98% rename from src/test/run-pass/issue-21174.rs rename to src/test/ui/run-pass/issues/issue-21174.rs index 6c0280de36d0..3af5e5323a65 100644 --- a/src/test/run-pass/issue-21174.rs +++ b/src/test/ui/run-pass/issues/issue-21174.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Trait<'a> { type A; type B; diff --git a/src/test/run-pass/issue-21245.rs b/src/test/ui/run-pass/issues/issue-21245.rs similarity index 99% rename from src/test/run-pass/issue-21245.rs rename to src/test/ui/run-pass/issues/issue-21245.rs index e3340d9767d0..6bc14489d959 100644 --- a/src/test/run-pass/issue-21245.rs +++ b/src/test/ui/run-pass/issues/issue-21245.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #21245. Check that we are able to infer // the types in these examples correctly. It used to be that // insufficient type propagation caused the type of the iterator to be diff --git a/src/test/run-pass/issue-21291.rs b/src/test/ui/run-pass/issues/issue-21291.rs similarity index 98% rename from src/test/run-pass/issue-21291.rs rename to src/test/ui/run-pass/issues/issue-21291.rs index 6b45a4d0a520..99912be8f8e6 100644 --- a/src/test/run-pass/issue-21291.rs +++ b/src/test/ui/run-pass/issues/issue-21291.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support // Regression test for unwrapping the result of `join`, issue #21291 diff --git a/src/test/run-pass/issue-21306.rs b/src/test/ui/run-pass/issues/issue-21306.rs similarity index 98% rename from src/test/run-pass/issue-21306.rs rename to src/test/ui/run-pass/issues/issue-21306.rs index bc2c7f09374f..e01f0aaac10b 100644 --- a/src/test/run-pass/issue-21306.rs +++ b/src/test/ui/run-pass/issues/issue-21306.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::sync::Arc; diff --git a/src/test/run-pass/issue-21361.rs b/src/test/ui/run-pass/issues/issue-21361.rs similarity index 98% rename from src/test/run-pass/issue-21361.rs rename to src/test/ui/run-pass/issues/issue-21361.rs index b89e07ef31f0..4a566d7f78fb 100644 --- a/src/test/run-pass/issue-21361.rs +++ b/src/test/ui/run-pass/issues/issue-21361.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let v = vec![1, 2, 3]; diff --git a/src/test/run-pass/issue-21363.rs b/src/test/ui/run-pass/issues/issue-21363.rs similarity index 98% rename from src/test/run-pass/issue-21363.rs rename to src/test/ui/run-pass/issues/issue-21363.rs index 608c60d03b3e..e7f7a80a1dee 100644 --- a/src/test/run-pass/issue-21363.rs +++ b/src/test/ui/run-pass/issues/issue-21363.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![no_implicit_prelude] diff --git a/src/test/run-pass/issue-21384.rs b/src/test/ui/run-pass/issues/issue-21384.rs similarity index 98% rename from src/test/run-pass/issue-21384.rs rename to src/test/ui/run-pass/issues/issue-21384.rs index 2ef66809a8d8..eccd12089698 100644 --- a/src/test/run-pass/issue-21384.rs +++ b/src/test/ui/run-pass/issues/issue-21384.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use ::std::ops::RangeFull; diff --git a/src/test/run-pass/issue-21400.rs b/src/test/ui/run-pass/issues/issue-21400.rs similarity index 99% rename from src/test/run-pass/issue-21400.rs rename to src/test/ui/run-pass/issues/issue-21400.rs index 6715b71a5f50..2c575d28e120 100644 --- a/src/test/run-pass/issue-21400.rs +++ b/src/test/ui/run-pass/issues/issue-21400.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #21400 which itself was extracted from // stackoverflow.com/questions/28031155/is-my-borrow-checker-drunk/28031580 diff --git a/src/test/run-pass/issue-21402.rs b/src/test/ui/run-pass/issues/issue-21402.rs similarity index 98% rename from src/test/run-pass/issue-21402.rs rename to src/test/ui/run-pass/issues/issue-21402.rs index 7fd329da2b72..210ba0711b40 100644 --- a/src/test/run-pass/issue-21402.rs +++ b/src/test/ui/run-pass/issues/issue-21402.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[derive(Hash)] diff --git a/src/test/run-pass/issue-21475.rs b/src/test/ui/run-pass/issues/issue-21475.rs similarity index 98% rename from src/test/run-pass/issue-21475.rs rename to src/test/ui/run-pass/issues/issue-21475.rs index 99839b56506f..883d6d215bd2 100644 --- a/src/test/run-pass/issue-21475.rs +++ b/src/test/ui/run-pass/issues/issue-21475.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use m::{START, END}; diff --git a/src/test/run-pass/issue-21486.rs b/src/test/ui/run-pass/issues/issue-21486.rs similarity index 99% rename from src/test/run-pass/issue-21486.rs rename to src/test/ui/run-pass/issues/issue-21486.rs index a61f294465d9..faf9b42a0e8b 100644 --- a/src/test/run-pass/issue-21486.rs +++ b/src/test/ui/run-pass/issues/issue-21486.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #21486: Make sure that all structures are dropped, even when // created via FRU and control-flow breaks in the middle of // construction. diff --git a/src/test/run-pass/issue-21520.rs b/src/test/ui/run-pass/issues/issue-21520.rs similarity index 98% rename from src/test/run-pass/issue-21520.rs rename to src/test/ui/run-pass/issues/issue-21520.rs index b512fd491935..71eb229ef00b 100644 --- a/src/test/run-pass/issue-21520.rs +++ b/src/test/ui/run-pass/issues/issue-21520.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the requirement (in `Bar`) that `T::Bar : 'static` does // not wind up propagating to `T`. diff --git a/src/test/run-pass/issue-21562.rs b/src/test/ui/run-pass/issues/issue-21562.rs similarity index 93% rename from src/test/run-pass/issue-21562.rs rename to src/test/ui/run-pass/issues/issue-21562.rs index 51896786d0c3..6b876df9d04b 100644 --- a/src/test/run-pass/issue-21562.rs +++ b/src/test/ui/run-pass/issues/issue-21562.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + extern crate core; use core::marker::Sync; diff --git a/src/test/run-pass/issue-21622.rs b/src/test/ui/run-pass/issues/issue-21622.rs similarity index 98% rename from src/test/run-pass/issue-21622.rs rename to src/test/ui/run-pass/issues/issue-21622.rs index 32f52308af16..e7289e5d162c 100644 --- a/src/test/run-pass/issue-21622.rs +++ b/src/test/ui/run-pass/issues/issue-21622.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Index; diff --git a/src/test/run-pass/issue-21634.rs b/src/test/ui/run-pass/issues/issue-21634.rs similarity index 95% rename from src/test/run-pass/issue-21634.rs rename to src/test/ui/run-pass/issues/issue-21634.rs index 08cc993ce4fb..8c914ac5adc6 100644 --- a/src/test/run-pass/issue-21634.rs +++ b/src/test/ui/run-pass/issues/issue-21634.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + #![feature(cfg_target_feature)] #[cfg(any(not(target_arch = "x86"), target_feature = "sse2"))] diff --git a/src/test/run-pass/issue-21655.rs b/src/test/ui/run-pass/issues/issue-21655.rs similarity index 98% rename from src/test/run-pass/issue-21655.rs rename to src/test/ui/run-pass/issues/issue-21655.rs index bf01873bea5e..208a5a3f9267 100644 --- a/src/test/run-pass/issue-21655.rs +++ b/src/test/ui/run-pass/issues/issue-21655.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn test(it: &mut Iterator) { for x in it { diff --git a/src/test/run-pass/issue-21721.rs b/src/test/ui/run-pass/issues/issue-21721.rs similarity index 98% rename from src/test/run-pass/issue-21721.rs rename to src/test/ui/run-pass/issues/issue-21721.rs index d1fc61ff6a5d..adda70a0f796 100644 --- a/src/test/run-pass/issue-21721.rs +++ b/src/test/ui/run-pass/issues/issue-21721.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { static NONE: Option<((), &'static u8)> = None; diff --git a/src/test/run-pass/issue-21726.rs b/src/test/ui/run-pass/issues/issue-21726.rs similarity index 99% rename from src/test/run-pass/issue-21726.rs rename to src/test/ui/run-pass/issues/issue-21726.rs index 9fdd89e25a19..49369759929d 100644 --- a/src/test/run-pass/issue-21726.rs +++ b/src/test/ui/run-pass/issues/issue-21726.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #21726: an issue arose around the rules for // subtyping of projection types that resulted in an unconstrained // region, yielding region inference failures. diff --git a/src/test/run-pass/issue-21891.rs b/src/test/ui/run-pass/issues/issue-21891.rs similarity index 93% rename from src/test/run-pass/issue-21891.rs rename to src/test/ui/run-pass/issues/issue-21891.rs index 0e35de7cdcba..1e577ba7303d 100644 --- a/src/test/run-pass/issue-21891.rs +++ b/src/test/ui/run-pass/issues/issue-21891.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // pretty-expanded FIXME #23616 static foo: [usize; 3] = [1, 2, 3]; diff --git a/src/test/run-pass/issue-2190-1.rs b/src/test/ui/run-pass/issues/issue-2190-1.rs similarity index 95% rename from src/test/run-pass/issue-2190-1.rs rename to src/test/ui/run-pass/issues/issue-2190-1.rs index 8cc23c883ed6..2d7a7382f0b4 100644 --- a/src/test/run-pass/issue-2190-1.rs +++ b/src/test/ui/run-pass/issues/issue-2190-1.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // pretty-expanded FIXME #23616 // ignore-emscripten no threads diff --git a/src/test/run-pass/issue-21909.rs b/src/test/ui/run-pass/issues/issue-21909.rs similarity index 98% rename from src/test/run-pass/issue-21909.rs rename to src/test/ui/run-pass/issues/issue-21909.rs index 6a5d76de8d3f..ad5f1611e6f9 100644 --- a/src/test/run-pass/issue-21909.rs +++ b/src/test/ui/run-pass/issues/issue-21909.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait A { diff --git a/src/test/run-pass/issue-21922.rs b/src/test/ui/run-pass/issues/issue-21922.rs similarity index 98% rename from src/test/run-pass/issue-21922.rs rename to src/test/ui/run-pass/issues/issue-21922.rs index 2f538b365e12..79e9976672e8 100644 --- a/src/test/run-pass/issue-21922.rs +++ b/src/test/ui/run-pass/issues/issue-21922.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Add; fn show(z: i32) { println!("{}", z) diff --git a/src/test/run-pass/issue-22008.rs b/src/test/ui/run-pass/issues/issue-22008.rs similarity index 98% rename from src/test/run-pass/issue-22008.rs rename to src/test/ui/run-pass/issues/issue-22008.rs index 3e145122e5ae..54882cda6244 100644 --- a/src/test/run-pass/issue-22008.rs +++ b/src/test/ui/run-pass/issues/issue-22008.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let command = "a"; diff --git a/src/test/run-pass/issue-22036.rs b/src/test/ui/run-pass/issues/issue-22036.rs similarity index 98% rename from src/test/run-pass/issue-22036.rs rename to src/test/ui/run-pass/issues/issue-22036.rs index 43fb286f0ec4..b814712b91a7 100644 --- a/src/test/run-pass/issue-22036.rs +++ b/src/test/ui/run-pass/issues/issue-22036.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait DigitCollection: Sized { type Iter: Iterator; diff --git a/src/test/run-pass/issue-22066.rs b/src/test/ui/run-pass/issues/issue-22066.rs similarity index 98% rename from src/test/run-pass/issue-22066.rs rename to src/test/ui/run-pass/issues/issue-22066.rs index c2486f0dcb49..ef4753703bf5 100644 --- a/src/test/run-pass/issue-22066.rs +++ b/src/test/ui/run-pass/issues/issue-22066.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait LineFormatter<'a> { type Iter: Iterator + 'a; fn iter(&'a self, line: &'a str) -> Self::Iter; diff --git a/src/test/run-pass/issue-2214.rs b/src/test/ui/run-pass/issues/issue-2214.rs similarity index 99% rename from src/test/run-pass/issue-2214.rs rename to src/test/ui/run-pass/issues/issue-2214.rs index a87af59ee798..8329847d3c5f 100644 --- a/src/test/run-pass/issue-2214.rs +++ b/src/test/ui/run-pass/issues/issue-2214.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc to test ffi with #![feature(libc)] diff --git a/src/test/run-pass/issue-2216.rs b/src/test/ui/run-pass/issues/issue-2216.rs similarity index 98% rename from src/test/run-pass/issue-2216.rs rename to src/test/ui/run-pass/issues/issue-2216.rs index c2f74a9d6530..9283cd93fa37 100644 --- a/src/test/run-pass/issue-2216.rs +++ b/src/test/ui/run-pass/issues/issue-2216.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut x = 0; diff --git a/src/test/run-pass/issue-22258.rs b/src/test/ui/run-pass/issues/issue-22258.rs similarity index 98% rename from src/test/run-pass/issue-22258.rs rename to src/test/ui/run-pass/issues/issue-22258.rs index f749131345ea..6f97da9b5b59 100644 --- a/src/test/run-pass/issue-22258.rs +++ b/src/test/ui/run-pass/issues/issue-22258.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Add; fn f(a: T, b: T) -> ::Output { diff --git a/src/test/run-pass/issue-22346.rs b/src/test/ui/run-pass/issues/issue-22346.rs similarity index 98% rename from src/test/run-pass/issue-22346.rs rename to src/test/ui/run-pass/issues/issue-22346.rs index 895b9d222a85..6689b6081ec4 100644 --- a/src/test/run-pass/issue-22346.rs +++ b/src/test/ui/run-pass/issues/issue-22346.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 // This used to cause an ICE because the retslot for the "return" had the wrong type diff --git a/src/test/run-pass/issue-22356.rs b/src/test/ui/run-pass/issues/issue-22356.rs similarity index 96% rename from src/test/run-pass/issue-22356.rs rename to src/test/ui/run-pass/issues/issue-22356.rs index 51a871d59b36..6e62ae069829 100644 --- a/src/test/run-pass/issue-22356.rs +++ b/src/test/ui/run-pass/issues/issue-22356.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(type_alias_bounds)] + // pretty-expanded FIXME #23616 use std::marker::PhantomData; diff --git a/src/test/run-pass/issue-22375.rs b/src/test/ui/run-pass/issues/issue-22375.rs similarity index 97% rename from src/test/run-pass/issue-22375.rs rename to src/test/ui/run-pass/issues/issue-22375.rs index c6e941d844d0..cf7ff0c404c0 100644 --- a/src/test/run-pass/issue-22375.rs +++ b/src/test/ui/run-pass/issues/issue-22375.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait A> {} fn main() {} diff --git a/src/test/run-pass/issue-22403.rs b/src/test/ui/run-pass/issues/issue-22403.rs similarity index 97% rename from src/test/run-pass/issue-22403.rs rename to src/test/ui/run-pass/issues/issue-22403.rs index 7bd66e5a83d4..76c4af1140bf 100644 --- a/src/test/run-pass/issue-22403.rs +++ b/src/test/ui/run-pass/issues/issue-22403.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let x = Box::new([1, 2, 3]); let y = x as Box<[i32]>; diff --git a/src/test/run-pass/issue-22426.rs b/src/test/ui/run-pass/issues/issue-22426.rs similarity index 97% rename from src/test/run-pass/issue-22426.rs rename to src/test/ui/run-pass/issues/issue-22426.rs index ad6ade4c59f1..8056b74ff8ed 100644 --- a/src/test/run-pass/issue-22426.rs +++ b/src/test/ui/run-pass/issues/issue-22426.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/issue-22463.rs b/src/test/ui/run-pass/issues/issue-22463.rs similarity index 98% rename from src/test/run-pass/issue-22463.rs rename to src/test/ui/run-pass/issues/issue-22463.rs index 3aeb92f0becc..e308b65ec87d 100644 --- a/src/test/run-pass/issue-22463.rs +++ b/src/test/ui/run-pass/issues/issue-22463.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! items { () => { type A = (); diff --git a/src/test/run-pass/issue-22471.rs b/src/test/ui/run-pass/issues/issue-22471.rs similarity index 92% rename from src/test/run-pass/issue-22471.rs rename to src/test/ui/run-pass/issues/issue-22471.rs index 1e7084b1ab34..87b4bc1734b5 100644 --- a/src/test/run-pass/issue-22471.rs +++ b/src/test/ui/run-pass/issues/issue-22471.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(type_alias_bounds)] + type Foo where T: Copy = Box; fn main(){} diff --git a/src/test/run-pass/issue-22536-copy-mustnt-zero.rs b/src/test/ui/run-pass/issues/issue-22536-copy-mustnt-zero.rs similarity index 98% rename from src/test/run-pass/issue-22536-copy-mustnt-zero.rs rename to src/test/ui/run-pass/issues/issue-22536-copy-mustnt-zero.rs index af99b11c2534..116d0620136e 100644 --- a/src/test/run-pass/issue-22536-copy-mustnt-zero.rs +++ b/src/test/ui/run-pass/issues/issue-22536-copy-mustnt-zero.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for Issue #22536: If a type implements Copy, then // moving it must not zero the original memory. diff --git a/src/test/run-pass/issue-22546.rs b/src/test/ui/run-pass/issues/issue-22546.rs similarity index 99% rename from src/test/run-pass/issue-22546.rs rename to src/test/ui/run-pass/issues/issue-22546.rs index 8516d344e1cd..28aaae1d8cc7 100644 --- a/src/test/run-pass/issue-22546.rs +++ b/src/test/ui/run-pass/issues/issue-22546.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Parsing patterns with paths with type parameters (issue #22544) use std::default::Default; diff --git a/src/test/run-pass/issue-22577.rs b/src/test/ui/run-pass/issues/issue-22577.rs similarity index 98% rename from src/test/run-pass/issue-22577.rs rename to src/test/ui/run-pass/issues/issue-22577.rs index 83ffdb3bf442..774416c92519 100644 --- a/src/test/run-pass/issue-22577.rs +++ b/src/test/ui/run-pass/issues/issue-22577.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 // ignore-cloudabi no std::fs diff --git a/src/test/run-pass/issue-22629.rs b/src/test/ui/run-pass/issues/issue-22629.rs similarity index 98% rename from src/test/run-pass/issue-22629.rs rename to src/test/ui/run-pass/issues/issue-22629.rs index 07ca79295bf5..9254a0807942 100644 --- a/src/test/run-pass/issue-22629.rs +++ b/src/test/ui/run-pass/issues/issue-22629.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test transitive analysis for associated types. Collected types // should be normalized and new obligations generated. diff --git a/src/test/run-pass/issue-22777.rs b/src/test/ui/run-pass/issues/issue-22777.rs similarity index 99% rename from src/test/run-pass/issue-22777.rs rename to src/test/ui/run-pass/issues/issue-22777.rs index 4df46c0e2e1e..92ad7a43d4d1 100644 --- a/src/test/run-pass/issue-22777.rs +++ b/src/test/ui/run-pass/issues/issue-22777.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test is reduced from libsyntax. It is just checking that we // can successfully deal with a "deep" structure, which the drop-check // was hitting a recursion limit on at one point. diff --git a/src/test/run-pass/issue-22781.rs b/src/test/ui/run-pass/issues/issue-22781.rs similarity index 98% rename from src/test/run-pass/issue-22781.rs rename to src/test/ui/run-pass/issues/issue-22781.rs index 1aa32f201422..af95b6e1d1a2 100644 --- a/src/test/run-pass/issue-22781.rs +++ b/src/test/ui/run-pass/issues/issue-22781.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::HashMap; use std::collections::hash_map::Entry::Vacant; diff --git a/src/test/run-pass/issue-22814.rs b/src/test/ui/run-pass/issues/issue-22814.rs similarity index 98% rename from src/test/run-pass/issue-22814.rs rename to src/test/ui/run-pass/issues/issue-22814.rs index 6afcd7707464..13c7dab37511 100644 --- a/src/test/run-pass/issue-22814.rs +++ b/src/test/ui/run-pass/issues/issue-22814.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Test {} macro_rules! test { diff --git a/src/test/run-pass/issue-22828.rs b/src/test/ui/run-pass/issues/issue-22828.rs similarity index 98% rename from src/test/run-pass/issue-22828.rs rename to src/test/ui/run-pass/issues/issue-22828.rs index d6a4d7834dfc..cc92f0809368 100644 --- a/src/test/run-pass/issue-22828.rs +++ b/src/test/ui/run-pass/issues/issue-22828.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test transitive analysis for associated types. Collected types // should be normalized and new obligations generated. diff --git a/src/test/run-pass/issue-2284.rs b/src/test/ui/run-pass/issues/issue-2284.rs similarity index 97% rename from src/test/run-pass/issue-2284.rs rename to src/test/ui/run-pass/issues/issue-2284.rs index d606c52607ab..77d1d6e0aa24 100644 --- a/src/test/run-pass/issue-2284.rs +++ b/src/test/ui/run-pass/issues/issue-2284.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Send { diff --git a/src/test/run-pass/issue-22864-1.rs b/src/test/ui/run-pass/issues/issue-22864-1.rs similarity index 97% rename from src/test/run-pass/issue-22864-1.rs rename to src/test/ui/run-pass/issues/issue-22864-1.rs index df1e3c5de520..e70e199bc2f1 100644 --- a/src/test/run-pass/issue-22864-1.rs +++ b/src/test/ui/run-pass/issues/issue-22864-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { struct Fun(F); let f = Fun(|x| 3*x); diff --git a/src/test/run-pass/issue-22864-2.rs b/src/test/ui/run-pass/issues/issue-22864-2.rs similarity index 97% rename from src/test/run-pass/issue-22864-2.rs rename to src/test/ui/run-pass/issues/issue-22864-2.rs index f9360af011bc..dea4ec49aad9 100644 --- a/src/test/run-pass/issue-22864-2.rs +++ b/src/test/ui/run-pass/issues/issue-22864-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support pub fn main() { diff --git a/src/test/run-pass/issue-2288.rs b/src/test/ui/run-pass/issues/issue-2288.rs similarity index 95% rename from src/test/run-pass/issue-2288.rs rename to src/test/ui/run-pass/issues/issue-2288.rs index b8353ea44136..6185aaca6cff 100644 --- a/src/test/run-pass/issue-2288.rs +++ b/src/test/ui/run-pass/issues/issue-2288.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #![feature(box_syntax)] trait clam { diff --git a/src/test/run-pass/issue-22894.rs b/src/test/ui/run-pass/issues/issue-22894.rs similarity index 97% rename from src/test/run-pass/issue-22894.rs rename to src/test/ui/run-pass/issues/issue-22894.rs index 8acd88deef2d..d1cd8efd73c2 100644 --- a/src/test/run-pass/issue-22894.rs +++ b/src/test/ui/run-pass/issues/issue-22894.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[allow(dead_code)] static X: &'static str = &*""; fn main() {} diff --git a/src/test/run-pass/issue-22992-2.rs b/src/test/ui/run-pass/issues/issue-22992-2.rs similarity index 98% rename from src/test/run-pass/issue-22992-2.rs rename to src/test/ui/run-pass/issues/issue-22992-2.rs index 070d4d11759f..ccf5354b4eee 100644 --- a/src/test/run-pass/issue-22992-2.rs +++ b/src/test/ui/run-pass/issues/issue-22992-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct A(B); struct B; diff --git a/src/test/run-pass/issue-22992.rs b/src/test/ui/run-pass/issues/issue-22992.rs similarity index 99% rename from src/test/run-pass/issue-22992.rs rename to src/test/ui/run-pass/issues/issue-22992.rs index dc612fc0bc71..18f5021f49e0 100644 --- a/src/test/run-pass/issue-22992.rs +++ b/src/test/ui/run-pass/issues/issue-22992.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37201 struct X { val: i32 } diff --git a/src/test/run-pass/issue-23036.rs b/src/test/ui/run-pass/issues/issue-23036.rs similarity index 98% rename from src/test/run-pass/issue-23036.rs rename to src/test/ui/run-pass/issues/issue-23036.rs index c3c9ede5adaf..4017ae1731cb 100644 --- a/src/test/run-pass/issue-23036.rs +++ b/src/test/ui/run-pass/issues/issue-23036.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no std::path use std::collections::HashMap; diff --git a/src/test/run-pass/issue-2311-2.rs b/src/test/ui/run-pass/issues/issue-2311-2.rs similarity index 94% rename from src/test/run-pass/issue-2311-2.rs rename to src/test/ui/run-pass/issues/issue-2311-2.rs index a47c15125527..8cfd941cca8d 100644 --- a/src/test/run-pass/issue-2311-2.rs +++ b/src/test/ui/run-pass/issues/issue-2311-2.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + trait clam { fn get(self) -> A; diff --git a/src/test/run-pass/issue-2311.rs b/src/test/ui/run-pass/issues/issue-2311.rs similarity index 93% rename from src/test/run-pass/issue-2311.rs rename to src/test/ui/run-pass/issues/issue-2311.rs index 5a086fd6fc2d..816754c4617e 100644 --- a/src/test/run-pass/issue-2311.rs +++ b/src/test/ui/run-pass/issues/issue-2311.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 trait clam { fn get(self) -> A; } diff --git a/src/test/run-pass/issue-2312.rs b/src/test/ui/run-pass/issues/issue-2312.rs similarity index 93% rename from src/test/run-pass/issue-2312.rs rename to src/test/ui/run-pass/issues/issue-2312.rs index 6f479c621170..33a033ef37fe 100644 --- a/src/test/run-pass/issue-2312.rs +++ b/src/test/ui/run-pass/issues/issue-2312.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // Testing that the B's are resolved diff --git a/src/test/run-pass/issue-2316-c.rs b/src/test/ui/run-pass/issues/issue-2316-c.rs similarity index 98% rename from src/test/run-pass/issue-2316-c.rs rename to src/test/ui/run-pass/issues/issue-2316-c.rs index 158e4570f2c7..b7a4b6b31e48 100644 --- a/src/test/run-pass/issue-2316-c.rs +++ b/src/test/ui/run-pass/issues/issue-2316-c.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_2316_a.rs // aux-build:issue_2316_b.rs diff --git a/src/test/run-pass/issue-23208.rs b/src/test/ui/run-pass/issues/issue-23208.rs similarity index 98% rename from src/test/run-pass/issue-23208.rs rename to src/test/ui/run-pass/issues/issue-23208.rs index ee3c16be7316..78384017ebcd 100644 --- a/src/test/run-pass/issue-23208.rs +++ b/src/test/ui/run-pass/issues/issue-23208.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait TheTrait : TheSuperTrait<::Item> { type Item; } diff --git a/src/test/run-pass/issue-23261.rs b/src/test/ui/run-pass/issues/issue-23261.rs similarity index 99% rename from src/test/run-pass/issue-23261.rs rename to src/test/ui/run-pass/issues/issue-23261.rs index fc806f5429a4..08f178beaf31 100644 --- a/src/test/run-pass/issue-23261.rs +++ b/src/test/ui/run-pass/issues/issue-23261.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Matching on a DST struct should not trigger an LLVM assertion. struct Foo { diff --git a/src/test/run-pass/issue-23304-1.rs b/src/test/ui/run-pass/issues/issue-23304-1.rs similarity index 98% rename from src/test/run-pass/issue-23304-1.rs rename to src/test/ui/run-pass/issues/issue-23304-1.rs index ec6cf5a5628d..0a6b4e41e2e1 100644 --- a/src/test/run-pass/issue-23304-1.rs +++ b/src/test/ui/run-pass/issues/issue-23304-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] #[repr(u8)] diff --git a/src/test/run-pass/issue-23304-2.rs b/src/test/ui/run-pass/issues/issue-23304-2.rs similarity index 98% rename from src/test/run-pass/issue-23304-2.rs rename to src/test/ui/run-pass/issues/issue-23304-2.rs index 5989b7e9c6ad..511bec0dde93 100644 --- a/src/test/run-pass/issue-23304-2.rs +++ b/src/test/ui/run-pass/issues/issue-23304-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] enum X { A = 42 as isize } diff --git a/src/test/run-pass/issue-23311.rs b/src/test/ui/run-pass/issues/issue-23311.rs similarity index 98% rename from src/test/run-pass/issue-23311.rs rename to src/test/ui/run-pass/issues/issue-23311.rs index fc286184dcb3..3c91f5e1dfee 100644 --- a/src/test/run-pass/issue-23311.rs +++ b/src/test/ui/run-pass/issues/issue-23311.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we do not ICE when pattern matching an array against a slice. #![feature(slice_patterns)] diff --git a/src/test/run-pass/issue-23336.rs b/src/test/ui/run-pass/issues/issue-23336.rs similarity index 98% rename from src/test/run-pass/issue-23336.rs rename to src/test/ui/run-pass/issues/issue-23336.rs index 21e512984449..0f0477bf844f 100644 --- a/src/test/run-pass/issue-23336.rs +++ b/src/test/ui/run-pass/issues/issue-23336.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Data { fn doit(&self) {} } impl Data for T {} pub trait UnaryLogic { type D: Data; } diff --git a/src/test/run-pass/issue-23338-ensure-param-drop-order.rs b/src/test/ui/run-pass/issues/issue-23338-ensure-param-drop-order.rs similarity index 99% rename from src/test/run-pass/issue-23338-ensure-param-drop-order.rs rename to src/test/ui/run-pass/issues/issue-23338-ensure-param-drop-order.rs index 42c72e647fd2..f1029a8c49a5 100644 --- a/src/test/run-pass/issue-23338-ensure-param-drop-order.rs +++ b/src/test/ui/run-pass/issues/issue-23338-ensure-param-drop-order.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // ignore-pretty issue #37201 // This test is ensuring that parameters are indeed dropped after diff --git a/src/test/run-pass/issue-23338-params-outlive-temps-of-body.rs b/src/test/ui/run-pass/issues/issue-23338-params-outlive-temps-of-body.rs similarity index 99% rename from src/test/run-pass/issue-23338-params-outlive-temps-of-body.rs rename to src/test/ui/run-pass/issues/issue-23338-params-outlive-temps-of-body.rs index cb9e852e5269..e5eb41b235d7 100644 --- a/src/test/run-pass/issue-23338-params-outlive-temps-of-body.rs +++ b/src/test/ui/run-pass/issues/issue-23338-params-outlive-temps-of-body.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This is largely checking that we now accept code where temp values // are borrowing from the input parameters (the `foo` case below). // diff --git a/src/test/run-pass/issue-23406.rs b/src/test/ui/run-pass/issues/issue-23406.rs similarity index 98% rename from src/test/run-pass/issue-23406.rs rename to src/test/ui/run-pass/issues/issue-23406.rs index c3c1b755af83..fb44e2d92702 100644 --- a/src/test/run-pass/issue-23406.rs +++ b/src/test/ui/run-pass/issues/issue-23406.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Inner { type T; } diff --git a/src/test/run-pass/issue-23433.rs b/src/test/ui/run-pass/issues/issue-23433.rs similarity index 98% rename from src/test/run-pass/issue-23433.rs rename to src/test/ui/run-pass/issues/issue-23433.rs index 9547b2f08a6b..9c1e9b00000d 100644 --- a/src/test/run-pass/issue-23433.rs +++ b/src/test/ui/run-pass/issues/issue-23433.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Don't fail if we encounter a NonNull where T is an unsized type use std::ptr::NonNull; diff --git a/src/test/run-pass/issue-23442.rs b/src/test/ui/run-pass/issues/issue-23442.rs similarity index 98% rename from src/test/run-pass/issue-23442.rs rename to src/test/ui/run-pass/issues/issue-23442.rs index 88b5a92620b7..9f39b30f1078 100644 --- a/src/test/run-pass/issue-23442.rs +++ b/src/test/ui/run-pass/issues/issue-23442.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::marker::PhantomData; pub struct UnionedKeys<'a,K> diff --git a/src/test/run-pass/issue-23477.rs b/src/test/ui/run-pass/issues/issue-23477.rs similarity index 98% rename from src/test/run-pass/issue-23477.rs rename to src/test/ui/run-pass/issues/issue-23477.rs index d4671c919b75..c862b0dbc2fa 100644 --- a/src/test/run-pass/issue-23477.rs +++ b/src/test/ui/run-pass/issues/issue-23477.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass // compiler-flags: -g pub struct Dst { diff --git a/src/test/run-pass/issue-23485.rs b/src/test/ui/run-pass/issues/issue-23485.rs similarity index 99% rename from src/test/run-pass/issue-23485.rs rename to src/test/ui/run-pass/issues/issue-23485.rs index f176c60346b1..42ccf5995ac1 100644 --- a/src/test/run-pass/issue-23485.rs +++ b/src/test/ui/run-pass/issues/issue-23485.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test for an ICE that occurred when a default method implementation // was applied to a type that did not meet the prerequisites. The // problem occurred specifically because normalizing diff --git a/src/test/run-pass/issue-23491.rs b/src/test/ui/run-pass/issues/issue-23491.rs similarity index 97% rename from src/test/run-pass/issue-23491.rs rename to src/test/ui/run-pass/issues/issue-23491.rs index 5ec228217ed7..a6e06050c0e4 100644 --- a/src/test/run-pass/issue-23491.rs +++ b/src/test/ui/run-pass/issues/issue-23491.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct Node(T); diff --git a/src/test/run-pass/issue-23550.rs b/src/test/ui/run-pass/issues/issue-23550.rs similarity index 98% rename from src/test/run-pass/issue-23550.rs rename to src/test/ui/run-pass/issues/issue-23550.rs index 6e20662b702a..143e0babcd96 100644 --- a/src/test/run-pass/issue-23550.rs +++ b/src/test/ui/run-pass/issues/issue-23550.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(core_intrinsics)] #![allow(warnings)] diff --git a/src/test/run-pass/issue-23611-enum-swap-in-drop.rs b/src/test/ui/run-pass/issues/issue-23611-enum-swap-in-drop.rs similarity index 99% rename from src/test/run-pass/issue-23611-enum-swap-in-drop.rs rename to src/test/ui/run-pass/issues/issue-23611-enum-swap-in-drop.rs index 09bc3fd0214e..ab5a89cbba38 100644 --- a/src/test/run-pass/issue-23611-enum-swap-in-drop.rs +++ b/src/test/ui/run-pass/issues/issue-23611-enum-swap-in-drop.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // Issue 23611: this test is ensuring that, for an instance `X` of the // enum `E`, if you swap in a different variant during the execution // of the `::drop`, then the appropriate substructure will diff --git a/src/test/run-pass/issue-23649-1.rs b/src/test/ui/run-pass/issues/issue-23649-1.rs similarity index 98% rename from src/test/run-pass/issue-23649-1.rs rename to src/test/ui/run-pass/issues/issue-23649-1.rs index a631898d8682..f270f536cf1a 100644 --- a/src/test/run-pass/issue-23649-1.rs +++ b/src/test/ui/run-pass/issues/issue-23649-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; pub struct X([u8]); diff --git a/src/test/run-pass/issue-23649-2.rs b/src/test/ui/run-pass/issues/issue-23649-2.rs similarity index 98% rename from src/test/run-pass/issue-23649-2.rs rename to src/test/ui/run-pass/issues/issue-23649-2.rs index c48ae414cc30..6cdd94c381eb 100644 --- a/src/test/run-pass/issue-23649-2.rs +++ b/src/test/ui/run-pass/issues/issue-23649-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no std::path use std::collections::HashMap; diff --git a/src/test/run-pass/issue-23649-3.rs b/src/test/ui/run-pass/issues/issue-23649-3.rs similarity index 97% rename from src/test/run-pass/issue-23649-3.rs rename to src/test/ui/run-pass/issues/issue-23649-3.rs index 4aa6c53ef9e2..067628ec12af 100644 --- a/src/test/run-pass/issue-23649-3.rs +++ b/src/test/ui/run-pass/issues/issue-23649-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq)] struct Slice { slice: [u8] } diff --git a/src/test/run-pass/issue-23699.rs b/src/test/ui/run-pass/issues/issue-23699.rs similarity index 98% rename from src/test/run-pass/issue-23699.rs rename to src/test/ui/run-pass/issues/issue-23699.rs index 1909be4df7ba..a33d1039267b 100644 --- a/src/test/run-pass/issue-23699.rs +++ b/src/test/ui/run-pass/issues/issue-23699.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn gimme_a_raw_pointer(_: *const T) { } fn test(t: T) { } diff --git a/src/test/run-pass/issue-23781.rs b/src/test/ui/run-pass/issues/issue-23781.rs similarity index 98% rename from src/test/run-pass/issue-23781.rs rename to src/test/ui/run-pass/issues/issue-23781.rs index 23ac8d2b7821..fcd6dd196ac6 100644 --- a/src/test/run-pass/issue-23781.rs +++ b/src/test/ui/run-pass/issues/issue-23781.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::fmt; struct Foo; diff --git a/src/test/run-pass/issue-2380-b.rs b/src/test/ui/run-pass/issues/issue-2380-b.rs similarity index 97% rename from src/test/run-pass/issue-2380-b.rs rename to src/test/ui/run-pass/issues/issue-2380-b.rs index b70416242471..fe28c2f3f1b0 100644 --- a/src/test/run-pass/issue-2380-b.rs +++ b/src/test/ui/run-pass/issues/issue-2380-b.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-2380.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-23808.rs b/src/test/ui/run-pass/issues/issue-23808.rs similarity index 99% rename from src/test/run-pass/issue-23808.rs rename to src/test/ui/run-pass/issues/issue-23808.rs index 1435a1b5d387..133da00ffaa1 100644 --- a/src/test/run-pass/issue-23808.rs +++ b/src/test/ui/run-pass/issues/issue-23808.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(dead_code)] // use different types / traits to test all combinations diff --git a/src/test/run-pass/issue-23825.rs b/src/test/ui/run-pass/issues/issue-23825.rs similarity index 98% rename from src/test/run-pass/issue-23825.rs rename to src/test/ui/run-pass/issues/issue-23825.rs index 1b857d94c72e..2bcadefe9b8a 100644 --- a/src/test/run-pass/issue-23825.rs +++ b/src/test/ui/run-pass/issues/issue-23825.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Stringify { fn to_string(&self) -> String; } diff --git a/src/test/run-pass/issue-2383.rs b/src/test/ui/run-pass/issues/issue-2383.rs similarity index 98% rename from src/test/run-pass/issue-2383.rs rename to src/test/ui/run-pass/issues/issue-2383.rs index a497a9fda6a6..2e1318ee6c84 100644 --- a/src/test/run-pass/issue-2383.rs +++ b/src/test/ui/run-pass/issues/issue-2383.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::collections::VecDeque; diff --git a/src/test/run-pass/issue-23833.rs b/src/test/ui/run-pass/issues/issue-23833.rs similarity index 98% rename from src/test/run-pass/issue-23833.rs rename to src/test/ui/run-pass/issues/issue-23833.rs index 7d63c41eb26e..eeb7db925dae 100644 --- a/src/test/run-pass/issue-23833.rs +++ b/src/test/ui/run-pass/issues/issue-23833.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::fmt; use std::{i8, i16, i32, i64, isize}; use std::{u8, u16, u32, u64, usize}; diff --git a/src/test/run-pass/issue-23891.rs b/src/test/ui/run-pass/issues/issue-23891.rs similarity index 98% rename from src/test/run-pass/issue-23891.rs rename to src/test/ui/run-pass/issues/issue-23891.rs index 55536de9123f..c2197b885c9b 100644 --- a/src/test/run-pass/issue-23891.rs +++ b/src/test/ui/run-pass/issues/issue-23891.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! id { ($s: pat) => ($s); } diff --git a/src/test/run-pass/issue-23898.rs b/src/test/ui/run-pass/issues/issue-23898.rs similarity index 93% rename from src/test/run-pass/issue-23898.rs rename to src/test/ui/run-pass/issues/issue-23898.rs index 3f5546ce83dd..d06814d620ee 100644 --- a/src/test/run-pass/issue-23898.rs +++ b/src/test/ui/run-pass/issues/issue-23898.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // Note: This test was used to demonstrate #5873 (now #23898). enum State { ST_NULL, ST_WHITESPACE } diff --git a/src/test/run-pass/issue-23958.rs b/src/test/ui/run-pass/issues/issue-23958.rs similarity index 98% rename from src/test/run-pass/issue-23958.rs rename to src/test/ui/run-pass/issues/issue-23958.rs index 5f1c79a3c154..6f9e7e216687 100644 --- a/src/test/run-pass/issue-23958.rs +++ b/src/test/ui/run-pass/issues/issue-23958.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Collection where for<'a> &'a Self: IntoIterator { fn my_iter(&self) -> <&Self as IntoIterator>::IntoIter { self.into_iter() diff --git a/src/test/run-pass/issue-23968-const-not-overflow.rs b/src/test/ui/run-pass/issues/issue-23968-const-not-overflow.rs similarity index 98% rename from src/test/run-pass/issue-23968-const-not-overflow.rs rename to src/test/ui/run-pass/issues/issue-23968-const-not-overflow.rs index 95f65917ceb7..d51167c47f81 100644 --- a/src/test/run-pass/issue-23968-const-not-overflow.rs +++ b/src/test/ui/run-pass/issues/issue-23968-const-not-overflow.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const U8_MAX_HALF: u8 = !0u8 / 2; const U16_MAX_HALF: u16 = !0u16 / 2; const U32_MAX_HALF: u32 = !0u32 / 2; diff --git a/src/test/run-pass/issue-23992.rs b/src/test/ui/run-pass/issues/issue-23992.rs similarity index 98% rename from src/test/run-pass/issue-23992.rs rename to src/test/ui/run-pass/issues/issue-23992.rs index d1ee4208b781..be8588f33a20 100644 --- a/src/test/run-pass/issue-23992.rs +++ b/src/test/ui/run-pass/issues/issue-23992.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub struct Outer(T); pub struct Inner<'a> { value: &'a bool } diff --git a/src/test/run-pass/issue-24085.rs b/src/test/ui/run-pass/issues/issue-24085.rs similarity index 98% rename from src/test/run-pass/issue-24085.rs rename to src/test/ui/run-pass/issues/issue-24085.rs index b15ec2986c23..6d8cacf8b290 100644 --- a/src/test/run-pass/issue-24085.rs +++ b/src/test/ui/run-pass/issues/issue-24085.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #24085. Errors were occurring in region // inference due to the requirement that `'a:b'`, which was getting // incorrectly codegened in connection with the closure below. diff --git a/src/test/run-pass/issue-24086.rs b/src/test/ui/run-pass/issues/issue-24086.rs similarity index 98% rename from src/test/run-pass/issue-24086.rs rename to src/test/ui/run-pass/issues/issue-24086.rs index 0a8324eafe29..632afc006887 100644 --- a/src/test/run-pass/issue-24086.rs +++ b/src/test/ui/run-pass/issues/issue-24086.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub struct Registry<'a> { listener: &'a mut (), } diff --git a/src/test/run-pass/issue-2414-c.rs b/src/test/ui/run-pass/issues/issue-2414-c.rs similarity index 98% rename from src/test/run-pass/issue-2414-c.rs rename to src/test/ui/run-pass/issues/issue-2414-c.rs index 2e047ae0127c..d285074accf8 100644 --- a/src/test/run-pass/issue-2414-c.rs +++ b/src/test/ui/run-pass/issues/issue-2414-c.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-2414-a.rs // aux-build:issue-2414-b.rs diff --git a/src/test/run-pass/issue-24161.rs b/src/test/ui/run-pass/issues/issue-24161.rs similarity index 98% rename from src/test/run-pass/issue-24161.rs rename to src/test/ui/run-pass/issues/issue-24161.rs index 2445ef17ecf3..1ac5d1237a7d 100644 --- a/src/test/run-pass/issue-24161.rs +++ b/src/test/ui/run-pass/issues/issue-24161.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Copy,Clone)] struct Functions { a: fn(u32) -> u32, diff --git a/src/test/run-pass/issue-24227.rs b/src/test/ui/run-pass/issues/issue-24227.rs similarity index 98% rename from src/test/run-pass/issue-24227.rs rename to src/test/ui/run-pass/issues/issue-24227.rs index 34c16bd4003a..86241b1763ae 100644 --- a/src/test/run-pass/issue-24227.rs +++ b/src/test/ui/run-pass/issues/issue-24227.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This resulted in an ICE. Test for future-proofing // Issue #24227 diff --git a/src/test/run-pass/issue-2428.rs b/src/test/ui/run-pass/issues/issue-2428.rs similarity index 92% rename from src/test/run-pass/issue-2428.rs rename to src/test/ui/run-pass/issues/issue-2428.rs index a07050d4582f..5a0c9f5a85b1 100644 --- a/src/test/run-pass/issue-2428.rs +++ b/src/test/ui/run-pass/issues/issue-2428.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + pub fn main() { let _foo = 100; diff --git a/src/test/run-pass/issue-24308.rs b/src/test/ui/run-pass/issues/issue-24308.rs similarity index 98% rename from src/test/run-pass/issue-24308.rs rename to src/test/ui/run-pass/issues/issue-24308.rs index 0a483fc987ad..6cbdd61273fe 100644 --- a/src/test/run-pass/issue-24308.rs +++ b/src/test/ui/run-pass/issues/issue-24308.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Foo { fn method1() {} fn method2(); diff --git a/src/test/run-pass/issue-24313.rs b/src/test/ui/run-pass/issues/issue-24313.rs similarity index 99% rename from src/test/run-pass/issue-24313.rs rename to src/test/ui/run-pass/issues/issue-24313.rs index 2e7d2e490b3c..cd20ab5a8438 100644 --- a/src/test/run-pass/issue-24313.rs +++ b/src/test/ui/run-pass/issues/issue-24313.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no threads diff --git a/src/test/run-pass/issue-24353.rs b/src/test/ui/run-pass/issues/issue-24353.rs similarity index 97% rename from src/test/run-pass/issue-24353.rs rename to src/test/ui/run-pass/issues/issue-24353.rs index 7a41a0139273..f4b0e6814e83 100644 --- a/src/test/run-pass/issue-24353.rs +++ b/src/test/ui/run-pass/issues/issue-24353.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { return (); diff --git a/src/test/run-pass/issue-24389.rs b/src/test/ui/run-pass/issues/issue-24389.rs similarity index 98% rename from src/test/run-pass/issue-24389.rs rename to src/test/ui/run-pass/issues/issue-24389.rs index 41599fa3e635..5eb622bb932b 100644 --- a/src/test/run-pass/issue-24389.rs +++ b/src/test/ui/run-pass/issues/issue-24389.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] struct Foo; diff --git a/src/test/run-pass/issue-24434.rs b/src/test/ui/run-pass/issues/issue-24434.rs similarity index 97% rename from src/test/run-pass/issue-24434.rs rename to src/test/ui/run-pass/issues/issue-24434.rs index 2b0d09d74603..a4f22e3c79a2 100644 --- a/src/test/run-pass/issue-24434.rs +++ b/src/test/ui/run-pass/issues/issue-24434.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:--cfg set1 #![cfg_attr(set1, feature(custom_attribute))] diff --git a/src/test/run-pass/issue-2445-b.rs b/src/test/ui/run-pass/issues/issue-2445-b.rs similarity index 94% rename from src/test/run-pass/issue-2445-b.rs rename to src/test/ui/run-pass/issues/issue-2445-b.rs index c1d17d263d6d..144861dc94ef 100644 --- a/src/test/run-pass/issue-2445-b.rs +++ b/src/test/ui/run-pass/issues/issue-2445-b.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 struct c1 { diff --git a/src/test/run-pass/issue-2445.rs b/src/test/ui/run-pass/issues/issue-2445.rs similarity index 94% rename from src/test/run-pass/issue-2445.rs rename to src/test/ui/run-pass/issues/issue-2445.rs index 0b6cf5890fd3..1d368e908ed5 100644 --- a/src/test/run-pass/issue-2445.rs +++ b/src/test/ui/run-pass/issues/issue-2445.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 struct c1 { diff --git a/src/test/run-pass/issue-24533.rs b/src/test/ui/run-pass/issues/issue-24533.rs similarity index 98% rename from src/test/run-pass/issue-24533.rs rename to src/test/ui/run-pass/issues/issue-24533.rs index 440a4184780c..316773e89157 100644 --- a/src/test/run-pass/issue-24533.rs +++ b/src/test/ui/run-pass/issues/issue-24533.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::slice::Iter; use std::io::{Error, ErrorKind, Result}; use std::vec::*; diff --git a/src/test/run-pass/issue-24535-allow-mutable-borrow-in-match-guard.rs b/src/test/ui/run-pass/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs similarity index 99% rename from src/test/run-pass/issue-24535-allow-mutable-borrow-in-match-guard.rs rename to src/test/ui/run-pass/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs index ac415e31f2b6..3f46b0e312d1 100644 --- a/src/test/run-pass/issue-24535-allow-mutable-borrow-in-match-guard.rs +++ b/src/test/ui/run-pass/issues/issue-24535-allow-mutable-borrow-in-match-guard.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test illustrates that under NLL, we can remove our overly // conservative approach for disallowing mutations of match inputs. diff --git a/src/test/run-pass/issue-24589.rs b/src/test/ui/run-pass/issues/issue-24589.rs similarity index 98% rename from src/test/run-pass/issue-24589.rs rename to src/test/ui/run-pass/issues/issue-24589.rs index 2fa8c8e98c0d..825e3cbd93b2 100644 --- a/src/test/run-pass/issue-24589.rs +++ b/src/test/ui/run-pass/issues/issue-24589.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub struct _X([u8]); impl std::ops::Deref for _X { diff --git a/src/test/run-pass/issue-2463.rs b/src/test/ui/run-pass/issues/issue-2463.rs similarity index 98% rename from src/test/run-pass/issue-2463.rs rename to src/test/ui/run-pass/issues/issue-2463.rs index f0b0614535bd..1c655f87435f 100644 --- a/src/test/run-pass/issue-2463.rs +++ b/src/test/ui/run-pass/issues/issue-2463.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Pair { f: isize, g: isize } diff --git a/src/test/run-pass/issue-2472.rs b/src/test/ui/run-pass/issues/issue-2472.rs similarity index 98% rename from src/test/run-pass/issue-2472.rs rename to src/test/ui/run-pass/issues/issue-2472.rs index 0cbdbda63756..bc078ea49cff 100644 --- a/src/test/run-pass/issue-2472.rs +++ b/src/test/ui/run-pass/issues/issue-2472.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_2472_b.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-24779.rs b/src/test/ui/run-pass/issues/issue-24779.rs similarity index 97% rename from src/test/run-pass/issue-24779.rs rename to src/test/ui/run-pass/issues/issue-24779.rs index 4f13b91cdb13..85ab4c6d4c5b 100644 --- a/src/test/run-pass/issue-24779.rs +++ b/src/test/ui/run-pass/issues/issue-24779.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { assert_eq!((||||42)()(), 42); } diff --git a/src/test/run-pass/issue-24805-dropck-itemless.rs b/src/test/ui/run-pass/issues/issue-24805-dropck-itemless.rs similarity index 98% rename from src/test/run-pass/issue-24805-dropck-itemless.rs rename to src/test/ui/run-pass/issues/issue-24805-dropck-itemless.rs index 9fa482022982..1d1bd21075bf 100644 --- a/src/test/run-pass/issue-24805-dropck-itemless.rs +++ b/src/test/ui/run-pass/issues/issue-24805-dropck-itemless.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] + // Check that item-less traits do not cause dropck to inject extra // region constraints. diff --git a/src/test/run-pass/issue-2487-a.rs b/src/test/ui/run-pass/issues/issue-2487-a.rs similarity index 95% rename from src/test/run-pass/issue-2487-a.rs rename to src/test/ui/run-pass/issues/issue-2487-a.rs index 76450b351f45..ee0ee1060767 100644 --- a/src/test/run-pass/issue-2487-a.rs +++ b/src/test/ui/run-pass/issues/issue-2487-a.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 struct socket { diff --git a/src/test/run-pass/issue-24945-repeat-dash-opts.rs b/src/test/ui/run-pass/issues/issue-24945-repeat-dash-opts.rs similarity index 98% rename from src/test/run-pass/issue-24945-repeat-dash-opts.rs rename to src/test/ui/run-pass/issues/issue-24945-repeat-dash-opts.rs index 33ac519a584f..5206acb8e94e 100644 --- a/src/test/run-pass/issue-24945-repeat-dash-opts.rs +++ b/src/test/ui/run-pass/issues/issue-24945-repeat-dash-opts.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test is just checking that we continue to accept `-g -g -O -O` // as options to the compiler. diff --git a/src/test/run-pass/issue-24947.rs b/src/test/ui/run-pass/issues/issue-24947.rs similarity index 98% rename from src/test/run-pass/issue-24947.rs rename to src/test/ui/run-pass/issues/issue-24947.rs index 19a364a93fd7..915491284474 100644 --- a/src/test/run-pass/issue-24947.rs +++ b/src/test/ui/run-pass/issues/issue-24947.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // #24947 ICE using a trait-associated const in an array size diff --git a/src/test/run-pass/issue-24954.rs b/src/test/ui/run-pass/issues/issue-24954.rs similarity index 98% rename from src/test/run-pass/issue-24954.rs rename to src/test/ui/run-pass/issues/issue-24954.rs index f525274a1dfc..e8f135f7f67e 100644 --- a/src/test/run-pass/issue-24954.rs +++ b/src/test/ui/run-pass/issues/issue-24954.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! foo { ($y:expr) => ({ $y = 2; diff --git a/src/test/run-pass/issue-2502.rs b/src/test/ui/run-pass/issues/issue-2502.rs similarity index 94% rename from src/test/run-pass/issue-2502.rs rename to src/test/ui/run-pass/issues/issue-2502.rs index 63179cd14acd..d06f99910a04 100644 --- a/src/test/run-pass/issue-2502.rs +++ b/src/test/ui/run-pass/issues/issue-2502.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-25089.rs b/src/test/ui/run-pass/issues/issue-25089.rs similarity index 98% rename from src/test/run-pass/issue-25089.rs rename to src/test/ui/run-pass/issues/issue-25089.rs index e707023530be..e059ac329b42 100644 --- a/src/test/run-pass/issue-25089.rs +++ b/src/test/ui/run-pass/issues/issue-25089.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/issue-25145.rs b/src/test/ui/run-pass/issues/issue-25145.rs similarity index 98% rename from src/test/run-pass/issue-25145.rs rename to src/test/ui/run-pass/issues/issue-25145.rs index d5d23012e040..79b1e7c5ef8a 100644 --- a/src/test/run-pass/issue-25145.rs +++ b/src/test/ui/run-pass/issues/issue-25145.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S; diff --git a/src/test/run-pass/issue-25180.rs b/src/test/ui/run-pass/issues/issue-25180.rs similarity index 91% rename from src/test/run-pass/issue-25180.rs rename to src/test/ui/run-pass/issues/issue-25180.rs index 4e6f9b321bab..edfa369ed462 100644 --- a/src/test/run-pass/issue-25180.rs +++ b/src/test/ui/run-pass/issues/issue-25180.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + const x: &'static Fn() = &|| println!("ICE here"); fn main() {} diff --git a/src/test/run-pass/issue-25185.rs b/src/test/ui/run-pass/issues/issue-25185.rs similarity index 98% rename from src/test/run-pass/issue-25185.rs rename to src/test/ui/run-pass/issues/issue-25185.rs index 9a2dbd1c96e3..764cfdc187a7 100644 --- a/src/test/run-pass/issue-25185.rs +++ b/src/test/ui/run-pass/issues/issue-25185.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-25185-1.rs // aux-build:issue-25185-2.rs // ignore-wasm32-bare no libc for ffi testing diff --git a/src/test/run-pass/issue-2526-a.rs b/src/test/ui/run-pass/issues/issue-2526-a.rs similarity index 98% rename from src/test/run-pass/issue-2526-a.rs rename to src/test/ui/run-pass/issues/issue-2526-a.rs index 0c68c4702319..210ad8318592 100644 --- a/src/test/run-pass/issue-2526-a.rs +++ b/src/test/ui/run-pass/issues/issue-2526-a.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-2526.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-25279.rs b/src/test/ui/run-pass/issues/issue-25279.rs similarity index 98% rename from src/test/run-pass/issue-25279.rs rename to src/test/ui/run-pass/issues/issue-25279.rs index e483866790f6..47714cef2d5c 100644 --- a/src/test/run-pass/issue-25279.rs +++ b/src/test/ui/run-pass/issues/issue-25279.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S<'a>(&'a ()); impl<'a> S<'a> { diff --git a/src/test/run-pass/issue-25339.rs b/src/test/ui/run-pass/issues/issue-25339.rs similarity index 98% rename from src/test/run-pass/issue-25339.rs rename to src/test/ui/run-pass/issues/issue-25339.rs index 381df7c5d593..279a88653772 100644 --- a/src/test/run-pass/issue-25339.rs +++ b/src/test/ui/run-pass/issues/issue-25339.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(associated_type_defaults)] use std::marker::PhantomData; diff --git a/src/test/run-pass/issue-25343.rs b/src/test/ui/run-pass/issues/issue-25343.rs similarity index 98% rename from src/test/run-pass/issue-25343.rs rename to src/test/ui/run-pass/issues/issue-25343.rs index 64e7350fb824..40e9924e5d51 100644 --- a/src/test/run-pass/issue-25343.rs +++ b/src/test/ui/run-pass/issues/issue-25343.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[allow(unused)] fn main() { || { diff --git a/src/test/run-pass/issue-25394.rs b/src/test/ui/run-pass/issues/issue-25394.rs similarity index 97% rename from src/test/run-pass/issue-25394.rs rename to src/test/ui/run-pass/issues/issue-25394.rs index c42de6fdf340..df1fe399a4a8 100644 --- a/src/test/run-pass/issue-25394.rs +++ b/src/test/ui/run-pass/issues/issue-25394.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] struct Row([T]); diff --git a/src/test/run-pass/issue-25467.rs b/src/test/ui/run-pass/issues/issue-25467.rs similarity index 98% rename from src/test/run-pass/issue-25467.rs rename to src/test/ui/run-pass/issues/issue-25467.rs index 477587682698..37ce124e1321 100644 --- a/src/test/run-pass/issue-25467.rs +++ b/src/test/ui/run-pass/issues/issue-25467.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-25467.rs pub type Issue25467BarT = (); diff --git a/src/test/run-pass/issue-25497.rs b/src/test/ui/run-pass/issues/issue-25497.rs similarity index 98% rename from src/test/run-pass/issue-25497.rs rename to src/test/ui/run-pass/issues/issue-25497.rs index 730b0a274bfa..ab5a0bf92f06 100644 --- a/src/test/run-pass/issue-25497.rs +++ b/src/test/ui/run-pass/issues/issue-25497.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Clone, Debug, PartialEq)] enum Expression { Dummy, diff --git a/src/test/run-pass/issue-2550.rs b/src/test/ui/run-pass/issues/issue-2550.rs similarity index 94% rename from src/test/run-pass/issue-2550.rs rename to src/test/ui/run-pass/issues/issue-2550.rs index 87b0b198f9b6..0552e97e642a 100644 --- a/src/test/run-pass/issue-2550.rs +++ b/src/test/ui/run-pass/issues/issue-2550.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // pretty-expanded FIXME #23616 struct C { diff --git a/src/test/run-pass/issue-25515.rs b/src/test/ui/run-pass/issues/issue-25515.rs similarity index 98% rename from src/test/run-pass/issue-25515.rs rename to src/test/ui/run-pass/issues/issue-25515.rs index d1746ec01910..03ad360bcd35 100644 --- a/src/test/run-pass/issue-25515.rs +++ b/src/test/ui/run-pass/issues/issue-25515.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::rc::Rc; struct Foo<'r>(&'r mut i32); diff --git a/src/test/run-pass/issue-25549-multiple-drop.rs b/src/test/ui/run-pass/issues/issue-25549-multiple-drop.rs similarity index 98% rename from src/test/run-pass/issue-25549-multiple-drop.rs rename to src/test/ui/run-pass/issues/issue-25549-multiple-drop.rs index 5280891677e3..24f44f2ecba9 100644 --- a/src/test/run-pass/issue-25549-multiple-drop.rs +++ b/src/test/ui/run-pass/issues/issue-25549-multiple-drop.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo<'r>(&'r mut i32); impl<'r> Drop for Foo<'r> { diff --git a/src/test/run-pass/issue-25679.rs b/src/test/ui/run-pass/issues/issue-25679.rs similarity index 98% rename from src/test/run-pass/issue-25679.rs rename to src/test/ui/run-pass/issues/issue-25679.rs index 0ba7feece606..29e4b44592f1 100644 --- a/src/test/run-pass/issue-25679.rs +++ b/src/test/ui/run-pass/issues/issue-25679.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Device { type Resources; } diff --git a/src/test/run-pass/issue-25693.rs b/src/test/ui/run-pass/issues/issue-25693.rs similarity index 98% rename from src/test/run-pass/issue-25693.rs rename to src/test/ui/run-pass/issues/issue-25693.rs index 0d9dc3cf6055..86fe6c08147c 100644 --- a/src/test/run-pass/issue-25693.rs +++ b/src/test/ui/run-pass/issues/issue-25693.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Parameters { type SelfRef; } struct RP<'a> { _marker: std::marker::PhantomData<&'a ()> } diff --git a/src/test/run-pass/issue-25700-1.rs b/src/test/ui/run-pass/issues/issue-25700-1.rs similarity index 98% rename from src/test/run-pass/issue-25700-1.rs rename to src/test/ui/run-pass/issues/issue-25700-1.rs index 57f5b84b2853..f1109ac93cdd 100644 --- a/src/test/run-pass/issue-25700-1.rs +++ b/src/test/ui/run-pass/issues/issue-25700-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S(Option<&'static T>); trait Tr { type Out; } diff --git a/src/test/run-pass/issue-25700-2.rs b/src/test/ui/run-pass/issues/issue-25700-2.rs similarity index 98% rename from src/test/run-pass/issue-25700-2.rs rename to src/test/ui/run-pass/issues/issue-25700-2.rs index 3117e6f3681d..99c381042bfe 100644 --- a/src/test/run-pass/issue-25700-2.rs +++ b/src/test/ui/run-pass/issues/issue-25700-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Parser { type Input; } diff --git a/src/test/run-pass/issue-25746-bool-transmute.rs b/src/test/ui/run-pass/issues/issue-25746-bool-transmute.rs similarity index 98% rename from src/test/run-pass/issue-25746-bool-transmute.rs rename to src/test/ui/run-pass/issues/issue-25746-bool-transmute.rs index 434e019219f7..da63bc61607b 100644 --- a/src/test/run-pass/issue-25746-bool-transmute.rs +++ b/src/test/ui/run-pass/issues/issue-25746-bool-transmute.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem::transmute; fn main() { diff --git a/src/test/run-pass/issue-25757.rs b/src/test/ui/run-pass/issues/issue-25757.rs similarity index 98% rename from src/test/run-pass/issue-25757.rs rename to src/test/ui/run-pass/issues/issue-25757.rs index d1fb75377050..f2fbef2c5816 100644 --- a/src/test/run-pass/issue-25757.rs +++ b/src/test/ui/run-pass/issues/issue-25757.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo { a: u32 } diff --git a/src/test/run-pass/issue-25810.rs b/src/test/ui/run-pass/issues/issue-25810.rs similarity index 98% rename from src/test/run-pass/issue-25810.rs rename to src/test/ui/run-pass/issues/issue-25810.rs index 820872ad3fc5..986ba48d4b7b 100644 --- a/src/test/run-pass/issue-25810.rs +++ b/src/test/ui/run-pass/issues/issue-25810.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let x = X(15); let y = x.foo(); diff --git a/src/test/run-pass/issue-25916.rs b/src/test/ui/run-pass/issues/issue-25916.rs similarity index 99% rename from src/test/run-pass/issue-25916.rs rename to src/test/ui/run-pass/issues/issue-25916.rs index eb52e2e21c48..cf8753119bf9 100644 --- a/src/test/run-pass/issue-25916.rs +++ b/src/test/ui/run-pass/issues/issue-25916.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { macro_rules! f { () => { 0 + 0 } diff --git a/src/test/run-pass/issue-26095.rs b/src/test/ui/run-pass/issues/issue-26095.rs similarity index 93% rename from src/test/run-pass/issue-26095.rs rename to src/test/ui/run-pass/issues/issue-26095.rs index 9d8d9c3ff2e3..0c6bc7c4885f 100644 --- a/src/test/run-pass/issue-26095.rs +++ b/src/test/ui/run-pass/issues/issue-26095.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + trait HasNumber { const Number: usize; diff --git a/src/test/run-pass/issue-2611-3.rs b/src/test/ui/run-pass/issues/issue-2611-3.rs similarity index 98% rename from src/test/run-pass/issue-2611-3.rs rename to src/test/ui/run-pass/issues/issue-2611-3.rs index e223d3412e04..4b66aa48a5bd 100644 --- a/src/test/run-pass/issue-2611-3.rs +++ b/src/test/ui/run-pass/issues/issue-2611-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that impls are allowed to have looser, more permissive bounds // than the traits require. diff --git a/src/test/run-pass/issue-26127.rs b/src/test/ui/run-pass/issues/issue-26127.rs similarity index 98% rename from src/test/run-pass/issue-26127.rs rename to src/test/ui/run-pass/issues/issue-26127.rs index 75cbcc83d610..c2634ed5690a 100644 --- a/src/test/run-pass/issue-26127.rs +++ b/src/test/ui/run-pass/issues/issue-26127.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Tr { type T; } impl Tr for u8 { type T=(); } struct S(I::T); diff --git a/src/test/run-pass/issue-26205.rs b/src/test/ui/run-pass/issues/issue-26205.rs similarity index 98% rename from src/test/run-pass/issue-26205.rs rename to src/test/ui/run-pass/issues/issue-26205.rs index dd34612af0fc..e015acfdc2a1 100644 --- a/src/test/run-pass/issue-26205.rs +++ b/src/test/ui/run-pass/issues/issue-26205.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::{Deref, DerefMut}; struct Foo; diff --git a/src/test/run-pass/issue-26251.rs b/src/test/ui/run-pass/issues/issue-26251.rs similarity index 98% rename from src/test/run-pass/issue-26251.rs rename to src/test/ui/run-pass/issues/issue-26251.rs index 3735d36147d1..20ad091695a7 100644 --- a/src/test/run-pass/issue-26251.rs +++ b/src/test/ui/run-pass/issues/issue-26251.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let x = 'a'; diff --git a/src/test/run-pass/issue-2631-b.rs b/src/test/ui/run-pass/issues/issue-2631-b.rs similarity index 98% rename from src/test/run-pass/issue-2631-b.rs rename to src/test/ui/run-pass/issues/issue-2631-b.rs index 913b07613e03..d53741b470e1 100644 --- a/src/test/run-pass/issue-2631-b.rs +++ b/src/test/ui/run-pass/issues/issue-2631-b.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-2631-a.rs diff --git a/src/test/run-pass/issue-26322.rs b/src/test/ui/run-pass/issues/issue-26322.rs similarity index 80% rename from src/test/run-pass/issue-26322.rs rename to src/test/ui/run-pass/issues/issue-26322.rs index 7f8c7f5521fa..23f6a739bd54 100644 --- a/src/test/run-pass/issue-26322.rs +++ b/src/test/ui/run-pass/issues/issue-26322.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_snake_case)] + macro_rules! columnline { () => ( (column!(), line!()) @@ -28,9 +32,9 @@ fn main() { columnline!() } else { (0, 0) }; let cl = columnline!(); - assert_eq!(closure(), (9, 25)); - assert_eq!(iflet, (9, 28)); - assert_eq!(cl, (14, 30)); + assert_eq!(closure(), (9, 29)); + assert_eq!(iflet, (9, 32)); + assert_eq!(cl, (14, 34)); let indirect = indirectcolumnline!(); - assert_eq!(indirect, (20, 34)); + assert_eq!(indirect, (20, 38)); } diff --git a/src/test/run-pass/issue-2633-2.rs b/src/test/ui/run-pass/issues/issue-2633-2.rs similarity index 98% rename from src/test/run-pass/issue-2633-2.rs rename to src/test/ui/run-pass/issues/issue-2633-2.rs index b955947c4101..ffc2b6a32a5e 100644 --- a/src/test/run-pass/issue-2633-2.rs +++ b/src/test/ui/run-pass/issues/issue-2633-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-2633.rs b/src/test/ui/run-pass/issues/issue-2633.rs similarity index 95% rename from src/test/run-pass/issue-2633.rs rename to src/test/ui/run-pass/issues/issue-2633.rs index 5841a9ec176c..c02c4e7b9d62 100644 --- a/src/test/run-pass/issue-2633.rs +++ b/src/test/ui/run-pass/issues/issue-2633.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #[derive(Copy, Clone)] struct cat { meow: extern "Rust" fn(), diff --git a/src/test/run-pass/issue-2642.rs b/src/test/ui/run-pass/issues/issue-2642.rs similarity index 97% rename from src/test/run-pass/issue-2642.rs rename to src/test/ui/run-pass/issues/issue-2642.rs index f0bc31fb391c..c900fa7b42cd 100644 --- a/src/test/run-pass/issue-2642.rs +++ b/src/test/ui/run-pass/issues/issue-2642.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn f() { diff --git a/src/test/run-pass/issue-26468.rs b/src/test/ui/run-pass/issues/issue-26468.rs similarity index 98% rename from src/test/run-pass/issue-26468.rs rename to src/test/ui/run-pass/issues/issue-26468.rs index 9fb8675e84e9..2c9a48802a62 100644 --- a/src/test/run-pass/issue-26468.rs +++ b/src/test/ui/run-pass/issues/issue-26468.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] enum FooMode { diff --git a/src/test/run-pass/issue-26484.rs b/src/test/ui/run-pass/issues/issue-26484.rs similarity index 98% rename from src/test/run-pass/issue-26484.rs rename to src/test/ui/run-pass/issues/issue-26484.rs index d3e6fc85f136..66fb1df1675a 100644 --- a/src/test/run-pass/issue-26484.rs +++ b/src/test/ui/run-pass/issues/issue-26484.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:-g fn helper bool>(_f: F) { diff --git a/src/test/run-pass/issue-26641.rs b/src/test/ui/run-pass/issues/issue-26641.rs similarity index 97% rename from src/test/run-pass/issue-26641.rs rename to src/test/ui/run-pass/issues/issue-26641.rs index 16f1d4626fba..90c2243222c4 100644 --- a/src/test/run-pass/issue-26641.rs +++ b/src/test/ui/run-pass/issues/issue-26641.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Parser<'a>(Box); fn main() { diff --git a/src/test/run-pass/issue-26646.rs b/src/test/ui/run-pass/issues/issue-26646.rs similarity index 98% rename from src/test/run-pass/issue-26646.rs rename to src/test/ui/run-pass/issues/issue-26646.rs index 89c0a11e292f..05602f7504eb 100644 --- a/src/test/run-pass/issue-26646.rs +++ b/src/test/ui/run-pass/issues/issue-26646.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(unused_attributes)] #[repr(C)] diff --git a/src/test/run-pass/issue-26655.rs b/src/test/ui/run-pass/issues/issue-26655.rs similarity index 98% rename from src/test/run-pass/issue-26655.rs rename to src/test/ui/run-pass/issues/issue-26655.rs index 6d43451af6b9..db373f2cc8de 100644 --- a/src/test/run-pass/issue-26655.rs +++ b/src/test/ui/run-pass/issues/issue-26655.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support // Check that the destructors of simple enums are run on unwinding diff --git a/src/test/run-pass/issue-26709.rs b/src/test/ui/run-pass/issues/issue-26709.rs similarity index 98% rename from src/test/run-pass/issue-26709.rs rename to src/test/ui/run-pass/issues/issue-26709.rs index 62626d75865c..f8f20405a3de 100644 --- a/src/test/run-pass/issue-26709.rs +++ b/src/test/ui/run-pass/issues/issue-26709.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Wrapper<'a, T: ?Sized>(&'a mut i32, T); impl<'a, T: ?Sized> Drop for Wrapper<'a, T> { diff --git a/src/test/run-pass/issue-26802.rs b/src/test/ui/run-pass/issues/issue-26802.rs similarity index 98% rename from src/test/run-pass/issue-26802.rs rename to src/test/ui/run-pass/issues/issue-26802.rs index 854340b0eae2..85d4e4a3f9f8 100644 --- a/src/test/run-pass/issue-26802.rs +++ b/src/test/ui/run-pass/issues/issue-26802.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo<'a> { fn bar<'b>(&self, x: &'b u8) -> u8 where 'a: 'b { *x+7 } } diff --git a/src/test/run-pass/issue-26805.rs b/src/test/ui/run-pass/issues/issue-26805.rs similarity index 97% rename from src/test/run-pass/issue-26805.rs rename to src/test/ui/run-pass/issues/issue-26805.rs index c996c8f65ac8..0459c654458a 100644 --- a/src/test/run-pass/issue-26805.rs +++ b/src/test/ui/run-pass/issues/issue-26805.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct NonOrd; fn main() { diff --git a/src/test/run-pass/issue-26873-multifile.rs b/src/test/ui/run-pass/issues/issue-26873-multifile.rs similarity index 93% rename from src/test/run-pass/issue-26873-multifile.rs rename to src/test/ui/run-pass/issues/issue-26873-multifile.rs index 51bf4bfe0e13..c557c0698d5c 100644 --- a/src/test/run-pass/issue-26873-multifile.rs +++ b/src/test/ui/run-pass/issues/issue-26873-multifile.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // ignore-pretty issue #37195 mod issue_26873_multifile; diff --git a/src/test/run-pass/issue-26873-onefile.rs b/src/test/ui/run-pass/issues/issue-26873-onefile.rs similarity index 94% rename from src/test/run-pass/issue-26873-onefile.rs rename to src/test/ui/run-pass/issues/issue-26873-onefile.rs index a9a04fd88945..005491ecc589 100644 --- a/src/test/run-pass/issue-26873-onefile.rs +++ b/src/test/ui/run-pass/issues/issue-26873-onefile.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + mod A { pub mod B { use super::*; diff --git a/src/test/run-pass/issue-26905.rs b/src/test/ui/run-pass/issues/issue-26905.rs similarity index 98% rename from src/test/run-pass/issue-26905.rs rename to src/test/ui/run-pass/issues/issue-26905.rs index 0ad193bb28c9..ec0f6b15a34f 100644 --- a/src/test/run-pass/issue-26905.rs +++ b/src/test/ui/run-pass/issues/issue-26905.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(unsize, coerce_unsized)] // Verfies that PhantomData is ignored for DST coercions diff --git a/src/test/run-pass/issue-26996.rs b/src/test/ui/run-pass/issues/issue-26996.rs similarity index 98% rename from src/test/run-pass/issue-26996.rs rename to src/test/ui/run-pass/issues/issue-26996.rs index e17845a68bcc..8d53b739da29 100644 --- a/src/test/run-pass/issue-26996.rs +++ b/src/test/ui/run-pass/issues/issue-26996.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let mut c = (1, "".to_owned()); match c { diff --git a/src/test/run-pass/issue-26997.rs b/src/test/ui/run-pass/issues/issue-26997.rs similarity index 98% rename from src/test/run-pass/issue-26997.rs rename to src/test/ui/run-pass/issues/issue-26997.rs index e7ecf68f1089..e6d0ef144313 100644 --- a/src/test/run-pass/issue-26997.rs +++ b/src/test/ui/run-pass/issues/issue-26997.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub struct Foo { x: isize, y: isize diff --git a/src/test/run-pass/issue-27021.rs b/src/test/ui/run-pass/issues/issue-27021.rs similarity index 98% rename from src/test/run-pass/issue-27021.rs rename to src/test/ui/run-pass/issues/issue-27021.rs index eb7d529f0ad6..addeebe9def1 100644 --- a/src/test/run-pass/issue-27021.rs +++ b/src/test/ui/run-pass/issues/issue-27021.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let mut c = (1, (1, "".to_owned())); match c { diff --git a/src/test/run-pass/issue-27054-primitive-binary-ops.rs b/src/test/ui/run-pass/issues/issue-27054-primitive-binary-ops.rs similarity index 97% rename from src/test/run-pass/issue-27054-primitive-binary-ops.rs rename to src/test/ui/run-pass/issues/issue-27054-primitive-binary-ops.rs index a97a49a1a4a0..cd7e94a2352e 100644 --- a/src/test/run-pass/issue-27054-primitive-binary-ops.rs +++ b/src/test/ui/run-pass/issues/issue-27054-primitive-binary-ops.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let x = &mut 1; assert_eq!(*x + { *x=2; 1 }, 2); diff --git a/src/test/run-pass/issue-27060.rs b/src/test/ui/run-pass/issues/issue-27060.rs similarity index 98% rename from src/test/run-pass/issue-27060.rs rename to src/test/ui/run-pass/issues/issue-27060.rs index 809c45466f08..594edb3fd715 100644 --- a/src/test/run-pass/issue-27060.rs +++ b/src/test/ui/run-pass/issues/issue-27060.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[repr(packed)] pub struct Good { data: &'static u32, diff --git a/src/test/run-pass/issue-2708.rs b/src/test/ui/run-pass/issues/issue-2708.rs similarity index 95% rename from src/test/run-pass/issue-2708.rs rename to src/test/ui/run-pass/issues/issue-2708.rs index cf565b9f9019..5fccdb0f1371 100644 --- a/src/test/run-pass/issue-2708.rs +++ b/src/test/ui/run-pass/issues/issue-2708.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-27105.rs b/src/test/ui/run-pass/issues/issue-27105.rs similarity index 98% rename from src/test/run-pass/issue-27105.rs rename to src/test/ui/run-pass/issues/issue-27105.rs index 3836ad089a36..e565acde2f01 100644 --- a/src/test/run-pass/issue-27105.rs +++ b/src/test/ui/run-pass/issues/issue-27105.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::cell::RefCell; use std::rc::Rc; diff --git a/src/test/run-pass/issue-2718.rs b/src/test/ui/run-pass/issues/issue-2718.rs similarity index 99% rename from src/test/run-pass/issue-2718.rs rename to src/test/ui/run-pass/issues/issue-2718.rs index d59f2956ee40..1c5e7c7333d3 100644 --- a/src/test/run-pass/issue-2718.rs +++ b/src/test/ui/run-pass/issues/issue-2718.rs @@ -7,7 +7,9 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass +#![allow(non_camel_case_types)] pub type Task = isize; diff --git a/src/test/run-pass/issue-2723-b.rs b/src/test/ui/run-pass/issues/issue-2723-b.rs similarity index 98% rename from src/test/run-pass/issue-2723-b.rs rename to src/test/ui/run-pass/issues/issue-2723-b.rs index a6ba957a1b11..34f5238cc800 100644 --- a/src/test/run-pass/issue-2723-b.rs +++ b/src/test/ui/run-pass/issues/issue-2723-b.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_2723_a.rs extern crate issue_2723_a; diff --git a/src/test/run-pass/issue-27240.rs b/src/test/ui/run-pass/issues/issue-27240.rs similarity index 98% rename from src/test/run-pass/issue-27240.rs rename to src/test/ui/run-pass/issues/issue-27240.rs index 4e341d311729..5e65a8084c34 100644 --- a/src/test/run-pass/issue-27240.rs +++ b/src/test/ui/run-pass/issues/issue-27240.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::fmt; struct NoisyDrop(T); impl Drop for NoisyDrop { diff --git a/src/test/run-pass/issue-27268.rs b/src/test/ui/run-pass/issues/issue-27268.rs similarity index 97% rename from src/test/run-pass/issue-27268.rs rename to src/test/ui/run-pass/issues/issue-27268.rs index 8af850bbada8..fa23241a25bd 100644 --- a/src/test/run-pass/issue-27268.rs +++ b/src/test/ui/run-pass/issues/issue-27268.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { const _C: &'static Fn() = &||{}; } diff --git a/src/test/run-pass/issue-27281.rs b/src/test/ui/run-pass/issues/issue-27281.rs similarity index 98% rename from src/test/run-pass/issue-27281.rs rename to src/test/ui/run-pass/issues/issue-27281.rs index c84fc0fffe32..1dc4ac5cdcc9 100644 --- a/src/test/run-pass/issue-27281.rs +++ b/src/test/ui/run-pass/issues/issue-27281.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Trait<'a> { type T; type U; diff --git a/src/test/run-pass/issue-27320.rs b/src/test/ui/run-pass/issues/issue-27320.rs similarity index 98% rename from src/test/run-pass/issue-27320.rs rename to src/test/ui/run-pass/issues/issue-27320.rs index e010b162cc40..e5df3ccd76e4 100644 --- a/src/test/run-pass/issue-27320.rs +++ b/src/test/ui/run-pass/issues/issue-27320.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused_variables)] #![allow(dead_code)] diff --git a/src/test/run-pass/issue-2734.rs b/src/test/ui/run-pass/issues/issue-2734.rs similarity index 94% rename from src/test/run-pass/issue-2734.rs rename to src/test/ui/run-pass/issues/issue-2734.rs index 916e3dd689fc..e3b1618c625e 100644 --- a/src/test/run-pass/issue-2734.rs +++ b/src/test/ui/run-pass/issues/issue-2734.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-2735-2.rs b/src/test/ui/run-pass/issues/issue-2735-2.rs similarity index 95% rename from src/test/run-pass/issue-2735-2.rs rename to src/test/ui/run-pass/issues/issue-2735-2.rs index cdce059ae71f..a8e81682ada6 100644 --- a/src/test/run-pass/issue-2735-2.rs +++ b/src/test/ui/run-pass/issues/issue-2735-2.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + use std::cell::Cell; // This test should behave exactly like issue-2735-3 diff --git a/src/test/run-pass/issue-2735-3.rs b/src/test/ui/run-pass/issues/issue-2735-3.rs similarity index 94% rename from src/test/run-pass/issue-2735-3.rs rename to src/test/ui/run-pass/issues/issue-2735-3.rs index d1e28faba8b5..9b8c2a5142f2 100644 --- a/src/test/run-pass/issue-2735-3.rs +++ b/src/test/ui/run-pass/issues/issue-2735-3.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + use std::cell::Cell; // This test should behave exactly like issue-2735-2 diff --git a/src/test/run-pass/issue-2735.rs b/src/test/ui/run-pass/issues/issue-2735.rs similarity index 94% rename from src/test/run-pass/issue-2735.rs rename to src/test/ui/run-pass/issues/issue-2735.rs index af8eef557f82..b22051700d8c 100644 --- a/src/test/run-pass/issue-2735.rs +++ b/src/test/ui/run-pass/issues/issue-2735.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-27401-dropflag-reinit.rs b/src/test/ui/run-pass/issues/issue-27401-dropflag-reinit.rs similarity index 98% rename from src/test/run-pass/issue-27401-dropflag-reinit.rs rename to src/test/ui/run-pass/issues/issue-27401-dropflag-reinit.rs index 37dc060d5d64..d72c8309a5f4 100644 --- a/src/test/run-pass/issue-27401-dropflag-reinit.rs +++ b/src/test/ui/run-pass/issues/issue-27401-dropflag-reinit.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37201 // Check that when a `let`-binding occurs in a loop, its associated diff --git a/src/test/run-pass/issue-2748-a.rs b/src/test/ui/run-pass/issues/issue-2748-a.rs similarity index 94% rename from src/test/run-pass/issue-2748-a.rs rename to src/test/ui/run-pass/issues/issue-2748-a.rs index ac1e65ee7763..9d84e2dccbcf 100644 --- a/src/test/run-pass/issue-2748-a.rs +++ b/src/test/ui/run-pass/issues/issue-2748-a.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // pretty-expanded FIXME #23616 struct CMap<'a> { diff --git a/src/test/run-pass/issue-2748-b.rs b/src/test/ui/run-pass/issues/issue-2748-b.rs similarity index 98% rename from src/test/run-pass/issue-2748-b.rs rename to src/test/ui/run-pass/issues/issue-2748-b.rs index f1cbf11a347e..78e3a3882c27 100644 --- a/src/test/run-pass/issue-2748-b.rs +++ b/src/test/ui/run-pass/issues/issue-2748-b.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn thing<'r>(x: &'r [isize]) -> &'r [isize] { x } diff --git a/src/test/run-pass/issue-27583.rs b/src/test/ui/run-pass/issues/issue-27583.rs similarity index 99% rename from src/test/run-pass/issue-27583.rs rename to src/test/ui/run-pass/issues/issue-27583.rs index df1b2c2cf43a..1a1ad2bc1945 100644 --- a/src/test/run-pass/issue-27583.rs +++ b/src/test/ui/run-pass/issues/issue-27583.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #27583. Unclear how useful this will be // going forward, since the issue in question was EXTREMELY sensitive // to compiler internals (like the precise numbering of nodes), but diff --git a/src/test/run-pass/issue-27639.rs b/src/test/ui/run-pass/issues/issue-27639.rs similarity index 92% rename from src/test/run-pass/issue-27639.rs rename to src/test/ui/run-pass/issues/issue-27639.rs index ce1abb163d53..81b1a2518fc2 100644 --- a/src/test/run-pass/issue-27639.rs +++ b/src/test/ui/run-pass/issues/issue-27639.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + fn main() { const iter: i32 = 0; diff --git a/src/test/run-pass/issue-27859.rs b/src/test/ui/run-pass/issues/issue-27859.rs similarity index 98% rename from src/test/run-pass/issue-27859.rs rename to src/test/ui/run-pass/issues/issue-27859.rs index d184724cf6f7..e289995317fe 100644 --- a/src/test/run-pass/issue-27859.rs +++ b/src/test/ui/run-pass/issues/issue-27859.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no std::env // ignore-wasm32 issue 42629 diff --git a/src/test/run-pass/issue-27889.rs b/src/test/ui/run-pass/issues/issue-27889.rs similarity index 98% rename from src/test/run-pass/issue-27889.rs rename to src/test/ui/run-pass/issues/issue-27889.rs index 29a5f6dd24bd..a16bfeb8daad 100644 --- a/src/test/run-pass/issue-27889.rs +++ b/src/test/ui/run-pass/issues/issue-27889.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that a field can have the same name in different variants // of an enum diff --git a/src/test/run-pass/issue-27890.rs b/src/test/ui/run-pass/issues/issue-27890.rs similarity index 98% rename from src/test/run-pass/issue-27890.rs rename to src/test/ui/run-pass/issues/issue-27890.rs index a33882a83318..3526a77cbd54 100644 --- a/src/test/run-pass/issue-27890.rs +++ b/src/test/ui/run-pass/issues/issue-27890.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass static PLUS_ONE: &'static (Fn(i32) -> i32 + Sync) = (&|x: i32| { x + 1 }) as &'static (Fn(i32) -> i32 + Sync); diff --git a/src/test/run-pass/issue-27901.rs b/src/test/ui/run-pass/issues/issue-27901.rs similarity index 98% rename from src/test/run-pass/issue-27901.rs rename to src/test/ui/run-pass/issues/issue-27901.rs index b7a9daaf8abd..5d02bace609c 100644 --- a/src/test/run-pass/issue-27901.rs +++ b/src/test/ui/run-pass/issues/issue-27901.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Stream { type Item; } impl<'a> Stream for &'a str { type Item = u8; } fn f<'s>(s: &'s str) -> (&'s str, <&'s str as Stream>::Item) { diff --git a/src/test/run-pass/issue-27997.rs b/src/test/ui/run-pass/issues/issue-27997.rs similarity index 99% rename from src/test/run-pass/issue-27997.rs rename to src/test/ui/run-pass/issues/issue-27997.rs index 9dba477a7e5e..f8dba27390c6 100644 --- a/src/test/run-pass/issue-27997.rs +++ b/src/test/ui/run-pass/issues/issue-27997.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::sync::atomic::{Ordering, AtomicUsize}; use std::mem; diff --git a/src/test/run-pass/issue-2804-2.rs b/src/test/ui/run-pass/issues/issue-2804-2.rs similarity index 98% rename from src/test/run-pass/issue-2804-2.rs rename to src/test/ui/run-pass/issues/issue-2804-2.rs index e428ecd4e5bb..a080627c6868 100644 --- a/src/test/run-pass/issue-2804-2.rs +++ b/src/test/ui/run-pass/issues/issue-2804-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Minimized version of issue-2804.rs. Both check that callee IDs don't // clobber the previous node ID in a macro expr diff --git a/src/test/run-pass/issue-28181.rs b/src/test/ui/run-pass/issues/issue-28181.rs similarity index 97% rename from src/test/run-pass/issue-28181.rs rename to src/test/ui/run-pass/issues/issue-28181.rs index f64b92cdbb76..21b0100e815a 100644 --- a/src/test/run-pass/issue-28181.rs +++ b/src/test/ui/run-pass/issues/issue-28181.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn bar(f: F) -> usize where F: Fn([usize; 1]) -> usize { f([2]) } fn main() { diff --git a/src/test/run-pass/issue-28279.rs b/src/test/ui/run-pass/issues/issue-28279.rs similarity index 98% rename from src/test/run-pass/issue-28279.rs rename to src/test/ui/run-pass/issues/issue-28279.rs index 3165084b9e90..bc615c8f7e3f 100644 --- a/src/test/run-pass/issue-28279.rs +++ b/src/test/ui/run-pass/issues/issue-28279.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::rc::Rc; fn test1() -> Rc Fn(&'a usize) + 'static> { diff --git a/src/test/run-pass/issue-28550.rs b/src/test/ui/run-pass/issues/issue-28550.rs similarity index 98% rename from src/test/run-pass/issue-28550.rs rename to src/test/ui/run-pass/issues/issue-28550.rs index f44a535e8176..95b6943849c4 100644 --- a/src/test/run-pass/issue-28550.rs +++ b/src/test/ui/run-pass/issues/issue-28550.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct AT,T>(F::Output); struct BT,T>(A); diff --git a/src/test/run-pass/issue-28561.rs b/src/test/ui/run-pass/issues/issue-28561.rs similarity index 99% rename from src/test/run-pass/issue-28561.rs rename to src/test/ui/run-pass/issues/issue-28561.rs index e21e487fedd1..5927ce77f8ed 100644 --- a/src/test/run-pass/issue-28561.rs +++ b/src/test/ui/run-pass/issues/issue-28561.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug, Default, Eq, Hash, Ord, PartialEq, PartialOrd)] struct Array { f00: [T; 00], diff --git a/src/test/run-pass/issue-28600.rs b/src/test/ui/run-pass/issues/issue-28600.rs similarity index 98% rename from src/test/run-pass/issue-28600.rs rename to src/test/ui/run-pass/issues/issue-28600.rs index bbbdb79a11d3..0f3573f7e62e 100644 --- a/src/test/run-pass/issue-28600.rs +++ b/src/test/ui/run-pass/issues/issue-28600.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // #28600 ICE: pub extern fn with parameter type &str inside struct impl struct Test; diff --git a/src/test/run-pass/issue-28676.rs b/src/test/ui/run-pass/issues/issue-28676.rs similarity index 96% rename from src/test/run-pass/issue-28676.rs rename to src/test/ui/run-pass/issues/issue-28676.rs index a7bee427a813..978d2136334f 100644 --- a/src/test/run-pass/issue-28676.rs +++ b/src/test/ui/run-pass/issues/issue-28676.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // ignore-wasm32-bare no libc to test ffi with #[derive(Copy, Clone)] diff --git a/src/test/run-pass/issue-28777.rs b/src/test/ui/run-pass/issues/issue-28777.rs similarity index 98% rename from src/test/run-pass/issue-28777.rs rename to src/test/ui/run-pass/issues/issue-28777.rs index ea5d4e4f3c27..a796d211df28 100644 --- a/src/test/run-pass/issue-28777.rs +++ b/src/test/ui/run-pass/issues/issue-28777.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let v1 = { 1 + {2} * {3} }; let v2 = 1 + {2} * {3} ; diff --git a/src/test/run-pass/issue-28822.rs b/src/test/ui/run-pass/issues/issue-28822.rs similarity index 97% rename from src/test/run-pass/issue-28822.rs rename to src/test/ui/run-pass/issues/issue-28822.rs index 10482139a978..39e4a23e3cdd 100644 --- a/src/test/run-pass/issue-28822.rs +++ b/src/test/ui/run-pass/issues/issue-28822.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(min_const_fn)] fn main() {} diff --git a/src/test/run-pass/issue-28828.rs b/src/test/ui/run-pass/issues/issue-28828.rs similarity index 98% rename from src/test/run-pass/issue-28828.rs rename to src/test/ui/run-pass/issues/issue-28828.rs index 24e4b83e8a67..2fb6b5875c19 100644 --- a/src/test/run-pass/issue-28828.rs +++ b/src/test/ui/run-pass/issues/issue-28828.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Foo { type Out; } diff --git a/src/test/run-pass/issue-28839.rs b/src/test/ui/run-pass/issues/issue-28839.rs similarity index 98% rename from src/test/run-pass/issue-28839.rs rename to src/test/ui/run-pass/issues/issue-28839.rs index 2ff4403a42f9..1b536fe83c7a 100644 --- a/src/test/run-pass/issue-28839.rs +++ b/src/test/ui/run-pass/issues/issue-28839.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37199 pub struct Foo; diff --git a/src/test/run-pass/issue-28871.rs b/src/test/ui/run-pass/issues/issue-28871.rs similarity index 98% rename from src/test/run-pass/issue-28871.rs rename to src/test/ui/run-pass/issues/issue-28871.rs index 92ba98f50625..2be324092742 100644 --- a/src/test/run-pass/issue-28871.rs +++ b/src/test/ui/run-pass/issues/issue-28871.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #28871. The problem is that rustc encountered // two ways to project, one from a where clause and one from the where // clauses on the trait definition. (In fact, in this case, the where diff --git a/src/test/run-pass/issue-28936.rs b/src/test/ui/run-pass/issues/issue-28936.rs similarity index 98% rename from src/test/run-pass/issue-28936.rs rename to src/test/ui/run-pass/issues/issue-28936.rs index 992fbdce2689..1e3e3474c171 100644 --- a/src/test/run-pass/issue-28936.rs +++ b/src/test/ui/run-pass/issues/issue-28936.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub type Session = i32; pub struct StreamParser<'a, T> { _tokens: T, diff --git a/src/test/run-pass/issue-2895.rs b/src/test/ui/run-pass/issues/issue-2895.rs similarity index 98% rename from src/test/run-pass/issue-2895.rs rename to src/test/ui/run-pass/issues/issue-2895.rs index b0fd0e148c8c..e52126e16f8d 100644 --- a/src/test/run-pass/issue-2895.rs +++ b/src/test/ui/run-pass/issues/issue-2895.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; diff --git a/src/test/run-pass/issue-28950.rs b/src/test/ui/run-pass/issues/issue-28950.rs similarity index 98% rename from src/test/run-pass/issue-28950.rs rename to src/test/ui/run-pass/issues/issue-28950.rs index 4e4530789c8d..b7426571fbd8 100644 --- a/src/test/run-pass/issue-28950.rs +++ b/src/test/ui/run-pass/issues/issue-28950.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads // compile-flags: -O diff --git a/src/test/run-pass/issue-28983.rs b/src/test/ui/run-pass/issues/issue-28983.rs similarity index 98% rename from src/test/run-pass/issue-28983.rs rename to src/test/ui/run-pass/issues/issue-28983.rs index f70f87687664..d38a519cb982 100644 --- a/src/test/run-pass/issue-28983.rs +++ b/src/test/ui/run-pass/issues/issue-28983.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Test { type T; } impl Test for u32 { diff --git a/src/test/run-pass/issue-28999.rs b/src/test/ui/run-pass/issues/issue-28999.rs similarity index 98% rename from src/test/run-pass/issue-28999.rs rename to src/test/ui/run-pass/issues/issue-28999.rs index 87112ef17198..bb5747ca7443 100644 --- a/src/test/run-pass/issue-28999.rs +++ b/src/test/ui/run-pass/issues/issue-28999.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub struct Xyz<'a, V> { pub v: (V, &'a u32), } diff --git a/src/test/run-pass/issue-29030.rs b/src/test/ui/run-pass/issues/issue-29030.rs similarity index 97% rename from src/test/run-pass/issue-29030.rs rename to src/test/ui/run-pass/issues/issue-29030.rs index 43de3601df10..51dbf58a77d3 100644 --- a/src/test/run-pass/issue-29030.rs +++ b/src/test/ui/run-pass/issues/issue-29030.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] struct Message<'a, P: 'a = &'a [u8]> { header: &'a [u8], diff --git a/src/test/run-pass/issue-29037.rs b/src/test/ui/run-pass/issues/issue-29037.rs similarity index 98% rename from src/test/run-pass/issue-29037.rs rename to src/test/ui/run-pass/issues/issue-29037.rs index dc1d67cc6455..2ee4446820bd 100644 --- a/src/test/run-pass/issue-29037.rs +++ b/src/test/ui/run-pass/issues/issue-29037.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test ensures that each pointer type `P` is covariant in `X`. use std::rc::Rc; diff --git a/src/test/run-pass/issue-2904.rs b/src/test/ui/run-pass/issues/issue-2904.rs similarity index 97% rename from src/test/run-pass/issue-2904.rs rename to src/test/ui/run-pass/issues/issue-2904.rs index d82fce97c41d..dcb8515c7768 100644 --- a/src/test/run-pass/issue-2904.rs +++ b/src/test/ui/run-pass/issues/issue-2904.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] // Map representation diff --git a/src/test/run-pass/issue-29048.rs b/src/test/ui/run-pass/issues/issue-29048.rs similarity index 98% rename from src/test/run-pass/issue-29048.rs rename to src/test/ui/run-pass/issues/issue-29048.rs index 48f4327d3e99..f889cd8af617 100644 --- a/src/test/run-pass/issue-29048.rs +++ b/src/test/ui/run-pass/issues/issue-29048.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub struct Chan; pub struct ChanSelect<'c, T> { chans: Vec<(&'c Chan, T)>, diff --git a/src/test/run-pass/issue-29053.rs b/src/test/ui/run-pass/issues/issue-29053.rs similarity index 98% rename from src/test/run-pass/issue-29053.rs rename to src/test/ui/run-pass/issues/issue-29053.rs index 72655071e413..47800b48de4a 100644 --- a/src/test/run-pass/issue-29053.rs +++ b/src/test/ui/run-pass/issues/issue-29053.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let x: &'static str = "x"; diff --git a/src/test/run-pass/issue-29071-2.rs b/src/test/ui/run-pass/issues/issue-29071-2.rs similarity index 98% rename from src/test/run-pass/issue-29071-2.rs rename to src/test/ui/run-pass/issues/issue-29071-2.rs index 8e69c063f99a..f0025f25557c 100644 --- a/src/test/run-pass/issue-29071-2.rs +++ b/src/test/ui/run-pass/issues/issue-29071-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn t1() -> u32 { let x; x = if true { [1, 2, 3] } else { [2, 3, 4] }[0]; diff --git a/src/test/run-pass/issue-29071.rs b/src/test/ui/run-pass/issues/issue-29071.rs similarity index 93% rename from src/test/run-pass/issue-29071.rs rename to src/test/ui/run-pass/issues/issue-29071.rs index 09c17a85ab50..06570f41a533 100644 --- a/src/test/run-pass/issue-29071.rs +++ b/src/test/ui/run-pass/issues/issue-29071.rs @@ -7,6 +7,10 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass +#![allow(non_upper_case_globals)] + fn ret() -> u32 { static x: u32 = 10; x & if true { 10u32 } else { 20u32 } & x diff --git a/src/test/run-pass/issue-29092.rs b/src/test/ui/run-pass/issues/issue-29092.rs similarity index 98% rename from src/test/run-pass/issue-29092.rs rename to src/test/ui/run-pass/issues/issue-29092.rs index c55cc91cc928..3517f0166756 100644 --- a/src/test/run-pass/issue-29092.rs +++ b/src/test/ui/run-pass/issues/issue-29092.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for Issue #29092. // // (Possibly redundant with regression test run-pass/issue-30530.rs) diff --git a/src/test/run-pass/issue-29147.rs b/src/test/ui/run-pass/issues/issue-29147.rs similarity index 99% rename from src/test/run-pass/issue-29147.rs rename to src/test/ui/run-pass/issues/issue-29147.rs index 026b98905d09..93ff713eafe6 100644 --- a/src/test/run-pass/issue-29147.rs +++ b/src/test/ui/run-pass/issues/issue-29147.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![recursion_limit="1024"] use std::mem; diff --git a/src/test/run-pass/issue-29166.rs b/src/test/ui/run-pass/issues/issue-29166.rs similarity index 98% rename from src/test/run-pass/issue-29166.rs rename to src/test/ui/run-pass/issues/issue-29166.rs index 193f977ff99b..1cc2c7a88939 100644 --- a/src/test/run-pass/issue-29166.rs +++ b/src/test/ui/run-pass/issues/issue-29166.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test ensures that vec.into_iter does not overconstrain element lifetime. pub fn main() { diff --git a/src/test/run-pass/issue-29227.rs b/src/test/ui/run-pass/issues/issue-29227.rs similarity index 99% rename from src/test/run-pass/issue-29227.rs rename to src/test/ui/run-pass/issues/issue-29227.rs index 7e27f7093ad6..a33bb6986348 100644 --- a/src/test/run-pass/issue-29227.rs +++ b/src/test/ui/run-pass/issues/issue-29227.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-tidy-linelength // Regression test for #29227. The problem here was that MIR diff --git a/src/test/run-pass/issue-29276.rs b/src/test/ui/run-pass/issues/issue-29276.rs similarity index 97% rename from src/test/run-pass/issue-29276.rs rename to src/test/ui/run-pass/issues/issue-29276.rs index 393b2226031b..6797dbc31c1c 100644 --- a/src/test/run-pass/issue-29276.rs +++ b/src/test/ui/run-pass/issues/issue-29276.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S([u8; { struct Z; 0 }]); fn main() {} diff --git a/src/test/run-pass/issue-2935.rs b/src/test/ui/run-pass/issues/issue-2935.rs similarity index 95% rename from src/test/run-pass/issue-2935.rs rename to src/test/ui/run-pass/issues/issue-2935.rs index b2ea183e9f87..d2af83251819 100644 --- a/src/test/run-pass/issue-2935.rs +++ b/src/test/ui/run-pass/issues/issue-2935.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] #![feature(box_syntax)] //type t = { a: isize }; diff --git a/src/test/run-pass/issue-2936.rs b/src/test/ui/run-pass/issues/issue-2936.rs similarity index 94% rename from src/test/run-pass/issue-2936.rs rename to src/test/ui/run-pass/issues/issue-2936.rs index c277073a79dc..84201348af3d 100644 --- a/src/test/run-pass/issue-2936.rs +++ b/src/test/ui/run-pass/issues/issue-2936.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] trait bar { fn get_bar(&self) -> T; diff --git a/src/test/run-pass/issue-29466.rs b/src/test/ui/run-pass/issues/issue-29466.rs similarity index 99% rename from src/test/run-pass/issue-29466.rs rename to src/test/ui/run-pass/issues/issue-29466.rs index 9e7b73467229..1c8fc88f8f2b 100644 --- a/src/test/run-pass/issue-29466.rs +++ b/src/test/ui/run-pass/issues/issue-29466.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! m( ($e1:expr => $e2:expr) => ({ $e1 }) ); diff --git a/src/test/run-pass/issue-29485.rs b/src/test/ui/run-pass/issues/issue-29485.rs similarity index 98% rename from src/test/run-pass/issue-29485.rs rename to src/test/ui/run-pass/issues/issue-29485.rs index 828b495d4081..67725b02ded9 100644 --- a/src/test/run-pass/issue-29485.rs +++ b/src/test/ui/run-pass/issues/issue-29485.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-29485.rs // ignore-emscripten no threads diff --git a/src/test/run-pass/issue-29488.rs b/src/test/ui/run-pass/issues/issue-29488.rs similarity index 98% rename from src/test/run-pass/issue-29488.rs rename to src/test/ui/run-pass/issues/issue-29488.rs index 17a6e9bd6b2e..d9d53ceaaeb5 100644 --- a/src/test/run-pass/issue-29488.rs +++ b/src/test/ui/run-pass/issues/issue-29488.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/issue-29516.rs b/src/test/ui/run-pass/issues/issue-29516.rs similarity index 98% rename from src/test/run-pass/issue-29516.rs rename to src/test/ui/run-pass/issues/issue-29516.rs index 465986583b15..55caa65f1cfe 100644 --- a/src/test/run-pass/issue-29516.rs +++ b/src/test/ui/run-pass/issues/issue-29516.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(optin_builtin_traits)] auto trait NotSame {} diff --git a/src/test/run-pass/issue-29522.rs b/src/test/ui/run-pass/issues/issue-29522.rs similarity index 98% rename from src/test/run-pass/issue-29522.rs rename to src/test/ui/run-pass/issues/issue-29522.rs index de7c7aee0553..9d5a12dadbea 100644 --- a/src/test/run-pass/issue-29522.rs +++ b/src/test/ui/run-pass/issues/issue-29522.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // check that we don't accidentally capture upvars just because their name // occurs in a path diff --git a/src/test/run-pass/issue-29540.rs b/src/test/ui/run-pass/issues/issue-29540.rs similarity index 99% rename from src/test/run-pass/issue-29540.rs rename to src/test/ui/run-pass/issues/issue-29540.rs index 285cf5763cc3..7e01efcd05f3 100644 --- a/src/test/run-pass/issue-29540.rs +++ b/src/test/ui/run-pass/issues/issue-29540.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] pub struct Config { pub name: String, diff --git a/src/test/run-pass/issue-29663.rs b/src/test/ui/run-pass/issues/issue-29663.rs similarity index 97% rename from src/test/run-pass/issue-29663.rs rename to src/test/ui/run-pass/issues/issue-29663.rs index 9a77be049fee..709bea268d17 100644 --- a/src/test/run-pass/issue-29663.rs +++ b/src/test/ui/run-pass/issues/issue-29663.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] // write_volatile causes an LLVM assert with composite types #![feature(volatile)] diff --git a/src/test/run-pass/issue-29668.rs b/src/test/ui/run-pass/issues/issue-29668.rs similarity index 98% rename from src/test/run-pass/issue-29668.rs rename to src/test/ui/run-pass/issues/issue-29668.rs index be785de44d19..f10152b29c95 100644 --- a/src/test/run-pass/issue-29668.rs +++ b/src/test/ui/run-pass/issues/issue-29668.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Functions can return unnameable types mod m1 { diff --git a/src/test/run-pass/issue-29710.rs b/src/test/ui/run-pass/issues/issue-29710.rs similarity index 98% rename from src/test/run-pass/issue-29710.rs rename to src/test/ui/run-pass/issues/issue-29710.rs index f4cfb7e3af88..fa768340b71a 100644 --- a/src/test/run-pass/issue-29710.rs +++ b/src/test/ui/run-pass/issues/issue-29710.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(unused_results)] #![allow(dead_code)] diff --git a/src/test/run-pass/issue-29740.rs b/src/test/ui/run-pass/issues/issue-29740.rs similarity index 99% rename from src/test/run-pass/issue-29740.rs rename to src/test/ui/run-pass/issues/issue-29740.rs index eb7b740db6e4..b0959e830093 100644 --- a/src/test/run-pass/issue-29740.rs +++ b/src/test/ui/run-pass/issues/issue-29740.rs @@ -8,8 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #29740. Inefficient MIR matching algorithms // generated way too much code for this sort of case, leading to OOM. +#![allow(non_snake_case)] pub mod KeyboardEventConstants { pub const DOM_KEY_LOCATION_STANDARD: u32 = 0; diff --git a/src/test/run-pass/issue-29746.rs b/src/test/ui/run-pass/issues/issue-29746.rs similarity index 99% rename from src/test/run-pass/issue-29746.rs rename to src/test/ui/run-pass/issues/issue-29746.rs index d4463fed1a67..c2072ddddce3 100644 --- a/src/test/run-pass/issue-29746.rs +++ b/src/test/ui/run-pass/issues/issue-29746.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // zip!(a1,a2,a3,a4) is equivalent to: // a1.zip(a2).zip(a3).zip(a4).map(|(((x1,x2),x3),x4)| (x1,x2,x3,x4)) macro_rules! zip { diff --git a/src/test/run-pass/issue-29844.rs b/src/test/ui/run-pass/issues/issue-29844.rs similarity index 98% rename from src/test/run-pass/issue-29844.rs rename to src/test/ui/run-pass/issues/issue-29844.rs index 51df4d60f045..0a17b708fcff 100644 --- a/src/test/run-pass/issue-29844.rs +++ b/src/test/ui/run-pass/issues/issue-29844.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::sync::Arc; pub struct DescriptorSet<'a> { diff --git a/src/test/run-pass/issue-2989.rs b/src/test/ui/run-pass/issues/issue-2989.rs similarity index 96% rename from src/test/run-pass/issue-2989.rs rename to src/test/ui/run-pass/issues/issue-2989.rs index a4342f33402d..7690d9a69275 100644 --- a/src/test/run-pass/issue-2989.rs +++ b/src/test/ui/run-pass/issues/issue-2989.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + trait methods { fn to_bytes(&self) -> Vec ; } diff --git a/src/test/run-pass/issue-29914-2.rs b/src/test/ui/run-pass/issues/issue-29914-2.rs similarity index 97% rename from src/test/run-pass/issue-29914-2.rs rename to src/test/ui/run-pass/issues/issue-29914-2.rs index fe0a6cf28802..e3b9aa1afae3 100644 --- a/src/test/run-pass/issue-29914-2.rs +++ b/src/test/ui/run-pass/issues/issue-29914-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const ARR: [usize; 5] = [5, 4, 3, 2, 1]; fn main() { diff --git a/src/test/run-pass/issue-29914-3.rs b/src/test/ui/run-pass/issues/issue-29914-3.rs similarity index 97% rename from src/test/run-pass/issue-29914-3.rs rename to src/test/ui/run-pass/issues/issue-29914-3.rs index 3a02764164ce..1d54e068a72d 100644 --- a/src/test/run-pass/issue-29914-3.rs +++ b/src/test/ui/run-pass/issues/issue-29914-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const ARR: [usize; 5] = [5, 4, 3, 2, 1]; const BLA: usize = ARR[ARR[3]]; diff --git a/src/test/run-pass/issue-29914.rs b/src/test/ui/run-pass/issues/issue-29914.rs similarity index 93% rename from src/test/run-pass/issue-29914.rs rename to src/test/ui/run-pass/issues/issue-29914.rs index bb933f0e4227..16f035927567 100644 --- a/src/test/run-pass/issue-29914.rs +++ b/src/test/ui/run-pass/issues/issue-29914.rs @@ -7,6 +7,10 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass +#![allow(stable_features)] + #![feature(const_indexing)] const ARR: [usize; 5] = [5, 4, 3, 2, 1]; diff --git a/src/test/run-pass/issue-29927.rs b/src/test/ui/run-pass/issues/issue-29927.rs similarity index 98% rename from src/test/run-pass/issue-29927.rs rename to src/test/ui/run-pass/issues/issue-29927.rs index 3079d9de3c23..4eab938609fc 100644 --- a/src/test/run-pass/issue-29927.rs +++ b/src/test/ui/run-pass/issues/issue-29927.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(min_const_fn)] struct A { field: usize, diff --git a/src/test/run-pass/issue-29948.rs b/src/test/ui/run-pass/issues/issue-29948.rs similarity index 99% rename from src/test/run-pass/issue-29948.rs rename to src/test/ui/run-pass/issues/issue-29948.rs index 3a7e9ba93e19..2beaaec55a16 100644 --- a/src/test/run-pass/issue-29948.rs +++ b/src/test/ui/run-pass/issues/issue-29948.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare compiled with panic=abort by default use std::panic; diff --git a/src/test/run-pass/issue-30018-nopanic.rs b/src/test/ui/run-pass/issues/issue-30018-nopanic.rs similarity index 99% rename from src/test/run-pass/issue-30018-nopanic.rs rename to src/test/ui/run-pass/issues/issue-30018-nopanic.rs index 25eff9def9df..bb94d4f8517a 100644 --- a/src/test/run-pass/issue-30018-nopanic.rs +++ b/src/test/ui/run-pass/issues/issue-30018-nopanic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // More thorough regression test for Issues #30018 and #30822. This // attempts to explore different ways that array element construction // (for both scratch arrays and non-scratch ones) interacts with diff --git a/src/test/run-pass/issue-30018-panic.rs b/src/test/ui/run-pass/issues/issue-30018-panic.rs similarity index 98% rename from src/test/run-pass/issue-30018-panic.rs rename to src/test/ui/run-pass/issues/issue-30018-panic.rs index e39ffb87425d..0922cfb9c21d 100644 --- a/src/test/run-pass/issue-30018-panic.rs +++ b/src/test/ui/run-pass/issues/issue-30018-panic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for Issue #30018. This is very similar to the // original reported test, except that the panic is wrapped in a // spawned thread to isolate the expected error result from the diff --git a/src/test/run-pass/issue-30081.rs b/src/test/ui/run-pass/issues/issue-30081.rs similarity index 98% rename from src/test/run-pass/issue-30081.rs rename to src/test/ui/run-pass/issues/issue-30081.rs index 13e9daa7883c..b866f7f8f335 100644 --- a/src/test/run-pass/issue-30081.rs +++ b/src/test/ui/run-pass/issues/issue-30081.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This used to segfault #30081 pub enum Instruction { diff --git a/src/test/run-pass/issue-3012-2.rs b/src/test/ui/run-pass/issues/issue-3012-2.rs similarity index 98% rename from src/test/run-pass/issue-3012-2.rs rename to src/test/ui/run-pass/issues/issue-3012-2.rs index bcf8a9180918..1a64d6bb9ae5 100644 --- a/src/test/run-pass/issue-3012-2.rs +++ b/src/test/ui/run-pass/issues/issue-3012-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-3012-1.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-30240.rs b/src/test/ui/run-pass/issues/issue-30240.rs similarity index 98% rename from src/test/run-pass/issue-30240.rs rename to src/test/ui/run-pass/issues/issue-30240.rs index 3be661ce35e3..c18a821c0e8b 100644 --- a/src/test/run-pass/issue-30240.rs +++ b/src/test/ui/run-pass/issues/issue-30240.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let &ref a = &[0i32] as &[_]; assert_eq!(a, &[0i32] as &[_]); diff --git a/src/test/run-pass/issue-3026.rs b/src/test/ui/run-pass/issues/issue-3026.rs similarity index 98% rename from src/test/run-pass/issue-3026.rs rename to src/test/ui/run-pass/issues/issue-3026.rs index 7c0dc8a00489..dcd1572c1a4e 100644 --- a/src/test/run-pass/issue-3026.rs +++ b/src/test/ui/run-pass/issues/issue-3026.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-3037.rs b/src/test/ui/run-pass/issues/issue-3037.rs similarity index 93% rename from src/test/run-pass/issue-3037.rs rename to src/test/ui/run-pass/issues/issue-3037.rs index 83a522a69e3d..ab2d5a5ae889 100644 --- a/src/test/run-pass/issue-3037.rs +++ b/src/test/ui/run-pass/issues/issue-3037.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_camel_case_types)] enum what { } diff --git a/src/test/run-pass/issue-30371.rs b/src/test/ui/run-pass/issues/issue-30371.rs similarity index 97% rename from src/test/run-pass/issue-30371.rs rename to src/test/ui/run-pass/issues/issue-30371.rs index a4ab475e9eac..f95d442c1b98 100644 --- a/src/test/run-pass/issue-30371.rs +++ b/src/test/ui/run-pass/issues/issue-30371.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(unused_variables)] fn main() { diff --git a/src/test/run-pass/issue-30490.rs b/src/test/ui/run-pass/issues/issue-30490.rs similarity index 99% rename from src/test/run-pass/issue-30490.rs rename to src/test/ui/run-pass/issues/issue-30490.rs index 633bd53864d1..500999cc1cf1 100644 --- a/src/test/run-pass/issue-30490.rs +++ b/src/test/ui/run-pass/issues/issue-30490.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-3052.rs b/src/test/ui/run-pass/issues/issue-3052.rs similarity index 98% rename from src/test/run-pass/issue-3052.rs rename to src/test/ui/run-pass/issues/issue-3052.rs index 3b56b2e28ff2..6c2d3899bf37 100644 --- a/src/test/run-pass/issue-3052.rs +++ b/src/test/ui/run-pass/issues/issue-3052.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 type Connection = Box) + 'static>; diff --git a/src/test/run-pass/issue-30530.rs b/src/test/ui/run-pass/issues/issue-30530.rs similarity index 98% rename from src/test/run-pass/issue-30530.rs rename to src/test/ui/run-pass/issues/issue-30530.rs index d5139c908bda..0e25d72ed880 100644 --- a/src/test/run-pass/issue-30530.rs +++ b/src/test/ui/run-pass/issues/issue-30530.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for Issue #30530: alloca's created for storing // intermediate scratch values during brace-less match arms need to be // initialized with their drop-flag set to "dropped" (or else we end diff --git a/src/test/run-pass/issue-30615.rs b/src/test/ui/run-pass/issues/issue-30615.rs similarity index 97% rename from src/test/run-pass/issue-30615.rs rename to src/test/ui/run-pass/issues/issue-30615.rs index a26509d19829..28a21adbd295 100644 --- a/src/test/run-pass/issue-30615.rs +++ b/src/test/ui/run-pass/issues/issue-30615.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { &0u8 as *const u8 as *const PartialEq; &[0u8] as *const [u8; 1] as *const [u8]; diff --git a/src/test/run-pass/issue-30756.rs b/src/test/ui/run-pass/issues/issue-30756.rs similarity index 97% rename from src/test/run-pass/issue-30756.rs rename to src/test/ui/run-pass/issues/issue-30756.rs index 621607e5f6fa..6ed0d441b93e 100644 --- a/src/test/run-pass/issue-30756.rs +++ b/src/test/ui/run-pass/issues/issue-30756.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![forbid(unsafe_code)] thread_local!(static FOO: u8 = 1); diff --git a/src/test/run-pass/issue-30891.rs b/src/test/ui/run-pass/issues/issue-30891.rs similarity index 98% rename from src/test/run-pass/issue-30891.rs rename to src/test/ui/run-pass/issues/issue-30891.rs index 622e5fa544ec..0ec42d449028 100644 --- a/src/test/run-pass/issue-30891.rs +++ b/src/test/ui/run-pass/issues/issue-30891.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const ERROR_CONST: bool = true; fn get() -> bool { diff --git a/src/test/run-pass/issue-3091.rs b/src/test/ui/run-pass/issues/issue-3091.rs similarity index 97% rename from src/test/run-pass/issue-3091.rs rename to src/test/ui/run-pass/issues/issue-3091.rs index c67399a89e9c..c6103bf017f0 100644 --- a/src/test/run-pass/issue-3091.rs +++ b/src/test/ui/run-pass/issues/issue-3091.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = 1; diff --git a/src/test/run-pass/issue-3109.rs b/src/test/ui/run-pass/issues/issue-3109.rs similarity index 97% rename from src/test/run-pass/issue-3109.rs rename to src/test/ui/run-pass/issues/issue-3109.rs index dc22ebce804e..6017a9ffbe6d 100644 --- a/src/test/run-pass/issue-3109.rs +++ b/src/test/ui/run-pass/issues/issue-3109.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { println!("{:?}", ("hi there!", "you")); } diff --git a/src/test/run-pass/issue-3121.rs b/src/test/ui/run-pass/issues/issue-3121.rs similarity index 95% rename from src/test/run-pass/issue-3121.rs rename to src/test/ui/run-pass/issues/issue-3121.rs index a0bdcf18ec52..9d70cf90d1cd 100644 --- a/src/test/run-pass/issue-3121.rs +++ b/src/test/ui/run-pass/issues/issue-3121.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] #![feature(box_syntax)] #[derive(Copy, Clone)] diff --git a/src/test/run-pass/issue-31260.rs b/src/test/ui/run-pass/issues/issue-31260.rs similarity index 98% rename from src/test/run-pass/issue-31260.rs rename to src/test/ui/run-pass/issues/issue-31260.rs index d21ffb96bef2..6b31a1ac996c 100644 --- a/src/test/run-pass/issue-31260.rs +++ b/src/test/ui/run-pass/issues/issue-31260.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub struct Struct { pub field: K, } diff --git a/src/test/run-pass/issue-31267-additional.rs b/src/test/ui/run-pass/issues/issue-31267-additional.rs similarity index 98% rename from src/test/run-pass/issue-31267-additional.rs rename to src/test/ui/run-pass/issues/issue-31267-additional.rs index 06ab310f6d21..d07cd8e2a77c 100644 --- a/src/test/run-pass/issue-31267-additional.rs +++ b/src/test/ui/run-pass/issues/issue-31267-additional.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Clone, Copy, Debug)] struct Bar; diff --git a/src/test/run-pass/issue-31267.rs b/src/test/ui/run-pass/issues/issue-31267.rs similarity index 98% rename from src/test/run-pass/issue-31267.rs rename to src/test/ui/run-pass/issues/issue-31267.rs index 9cbdde404916..761ef1f89ff7 100644 --- a/src/test/run-pass/issue-31267.rs +++ b/src/test/ui/run-pass/issues/issue-31267.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #31267 diff --git a/src/test/run-pass/issue-31299.rs b/src/test/ui/run-pass/issues/issue-31299.rs similarity index 99% rename from src/test/run-pass/issue-31299.rs rename to src/test/ui/run-pass/issues/issue-31299.rs index 6c04e66068e6..6d3be9555777 100644 --- a/src/test/run-pass/issue-31299.rs +++ b/src/test/ui/run-pass/issues/issue-31299.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #31299. This was generating an overflow error // because of eager normalization: // diff --git a/src/test/run-pass/issue-3149.rs b/src/test/ui/run-pass/issues/issue-3149.rs similarity index 96% rename from src/test/run-pass/issue-3149.rs rename to src/test/ui/run-pass/issues/issue-3149.rs index fa33bd8fce80..324aec23ab08 100644 --- a/src/test/run-pass/issue-3149.rs +++ b/src/test/ui/run-pass/issues/issue-3149.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] // pretty-expanded FIXME #23616 fn Matrix4(m11: T, m12: T, m13: T, m14: T, diff --git a/src/test/run-pass/issue-31597.rs b/src/test/ui/run-pass/issues/issue-31597.rs similarity index 98% rename from src/test/run-pass/issue-31597.rs rename to src/test/ui/run-pass/issues/issue-31597.rs index 9acd6384b75e..50aefb7d870f 100644 --- a/src/test/run-pass/issue-31597.rs +++ b/src/test/ui/run-pass/issues/issue-31597.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Make { type Out; diff --git a/src/test/run-pass/issue-31702.rs b/src/test/ui/run-pass/issues/issue-31702.rs similarity index 98% rename from src/test/run-pass/issue-31702.rs rename to src/test/ui/run-pass/issues/issue-31702.rs index 334c1b2a28b1..8ce06e8d3433 100644 --- a/src/test/run-pass/issue-31702.rs +++ b/src/test/ui/run-pass/issues/issue-31702.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-31702-1.rs // aux-build:issue-31702-2.rs // ignore-test: FIXME(#31702) when this test was added it was thought that the diff --git a/src/test/run-pass/issue-31776.rs b/src/test/ui/run-pass/issues/issue-31776.rs similarity index 99% rename from src/test/run-pass/issue-31776.rs rename to src/test/ui/run-pass/issues/issue-31776.rs index 0f1f6290a257..db866b86a2a9 100644 --- a/src/test/run-pass/issue-31776.rs +++ b/src/test/ui/run-pass/issues/issue-31776.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Various scenarios in which `pub` is required in blocks struct S; diff --git a/src/test/run-pass/issue-32008.rs b/src/test/ui/run-pass/issues/issue-32008.rs similarity index 98% rename from src/test/run-pass/issue-32008.rs rename to src/test/ui/run-pass/issues/issue-32008.rs index 95890d2e1b47..7fccf09bdaaf 100644 --- a/src/test/run-pass/issue-32008.rs +++ b/src/test/ui/run-pass/issues/issue-32008.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that binary operators allow subtyping on both the LHS and RHS, // and as such do not introduce unnecessarily strict lifetime constraints. diff --git a/src/test/run-pass/issue-3211.rs b/src/test/ui/run-pass/issues/issue-3211.rs similarity index 98% rename from src/test/run-pass/issue-3211.rs rename to src/test/ui/run-pass/issues/issue-3211.rs index 28c9bf1e83a8..8f90b710daef 100644 --- a/src/test/run-pass/issue-3211.rs +++ b/src/test/ui/run-pass/issues/issue-3211.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut x = 0; for _ in 0..4096 { x += 1; } diff --git a/src/test/run-pass/issue-3220.rs b/src/test/ui/run-pass/issues/issue-3220.rs similarity index 94% rename from src/test/run-pass/issue-3220.rs rename to src/test/ui/run-pass/issues/issue-3220.rs index 0a37a0130377..2d32a08e37ba 100644 --- a/src/test/run-pass/issue-3220.rs +++ b/src/test/ui/run-pass/issues/issue-3220.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] // pretty-expanded FIXME #23616 struct thing { x: isize, } diff --git a/src/test/run-pass/issue-32292.rs b/src/test/ui/run-pass/issues/issue-32292.rs similarity index 98% rename from src/test/run-pass/issue-32292.rs rename to src/test/ui/run-pass/issues/issue-32292.rs index ed319b1391dc..856b7e2382ba 100644 --- a/src/test/run-pass/issue-32292.rs +++ b/src/test/ui/run-pass/issues/issue-32292.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(warnings)] #[derive(Hash, Ord, PartialOrd, Eq, PartialEq, Debug, Clone, Copy)] diff --git a/src/test/run-pass/issue-32324.rs b/src/test/ui/run-pass/issues/issue-32324.rs similarity index 98% rename from src/test/run-pass/issue-32324.rs rename to src/test/ui/run-pass/issues/issue-32324.rs index ca9dd6ada80b..483ddaeb9578 100644 --- a/src/test/run-pass/issue-32324.rs +++ b/src/test/ui/run-pass/issues/issue-32324.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] trait Resources { diff --git a/src/test/run-pass/issue-32389.rs b/src/test/ui/run-pass/issues/issue-32389.rs similarity index 98% rename from src/test/run-pass/issue-32389.rs rename to src/test/ui/run-pass/issues/issue-32389.rs index 2f6cfb61205c..31e4a5c9e478 100644 --- a/src/test/run-pass/issue-32389.rs +++ b/src/test/ui/run-pass/issues/issue-32389.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo() -> T { loop {} } fn test() { diff --git a/src/test/run-pass/issue-32518.rs b/src/test/ui/run-pass/issues/issue-32518.rs similarity index 98% rename from src/test/run-pass/issue-32518.rs rename to src/test/ui/run-pass/issues/issue-32518.rs index 386d3e6524c4..bc8b11d3e663 100644 --- a/src/test/run-pass/issue-32518.rs +++ b/src/test/ui/run-pass/issues/issue-32518.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // no-prefer-dynamic // aux-build:cgu_test.rs // aux-build:cgu_test_a.rs diff --git a/src/test/run-pass/issue-32805.rs b/src/test/ui/run-pass/issues/issue-32805.rs similarity index 98% rename from src/test/run-pass/issue-32805.rs rename to src/test/ui/run-pass/issues/issue-32805.rs index b7ff63b75ce8..4c68bed4b052 100644 --- a/src/test/run-pass/issue-32805.rs +++ b/src/test/ui/run-pass/issues/issue-32805.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn const_mir() -> f32 { 9007199791611905.0 } fn main() { diff --git a/src/test/run-pass/issue-3290.rs b/src/test/ui/run-pass/issues/issue-3290.rs similarity index 97% rename from src/test/run-pass/issue-3290.rs rename to src/test/ui/run-pass/issues/issue-3290.rs index 6c775e15fb56..02f27cbf4837 100644 --- a/src/test/run-pass/issue-3290.rs +++ b/src/test/ui/run-pass/issues/issue-3290.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/issue-32947.rs b/src/test/ui/run-pass/issues/issue-32947.rs similarity index 98% rename from src/test/run-pass/issue-32947.rs rename to src/test/ui/run-pass/issues/issue-32947.rs index d059a46b4df1..9b00a09338ec 100644 --- a/src/test/run-pass/issue-32947.rs +++ b/src/test/ui/run-pass/issues/issue-32947.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten FIXME(#45351) #![feature(repr_simd, test)] diff --git a/src/test/run-pass/issue-33096.rs b/src/test/ui/run-pass/issues/issue-33096.rs similarity index 98% rename from src/test/run-pass/issue-33096.rs rename to src/test/ui/run-pass/issues/issue-33096.rs index c3cf008c8251..f89295c0627b 100644 --- a/src/test/run-pass/issue-33096.rs +++ b/src/test/ui/run-pass/issues/issue-33096.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -g use std::ops::Deref; diff --git a/src/test/run-pass/issue-33185.rs b/src/test/ui/run-pass/issues/issue-33185.rs similarity index 98% rename from src/test/run-pass/issue-33185.rs rename to src/test/ui/run-pass/issues/issue-33185.rs index f12e65323bc9..6268454658f6 100644 --- a/src/test/run-pass/issue-33185.rs +++ b/src/test/ui/run-pass/issues/issue-33185.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] #[macro_export] diff --git a/src/test/run-pass/issue-33187.rs b/src/test/ui/run-pass/issues/issue-33187.rs similarity index 98% rename from src/test/run-pass/issue-33187.rs rename to src/test/ui/run-pass/issues/issue-33187.rs index 477112ab3c5a..a998a953b064 100644 --- a/src/test/run-pass/issue-33187.rs +++ b/src/test/ui/run-pass/issues/issue-33187.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo(::Data); impl Copy for Foo where ::Data: Copy { } diff --git a/src/test/run-pass/issue-33202.rs b/src/test/ui/run-pass/issues/issue-33202.rs similarity index 98% rename from src/test/run-pass/issue-33202.rs rename to src/test/ui/run-pass/issues/issue-33202.rs index eb4192942f5e..1101861c09ed 100644 --- a/src/test/run-pass/issue-33202.rs +++ b/src/test/ui/run-pass/issues/issue-33202.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[repr(C)] pub enum CPOption { PSome(T), diff --git a/src/test/run-pass/issue-33264.rs b/src/test/ui/run-pass/issues/issue-33264.rs similarity index 98% rename from src/test/run-pass/issue-33264.rs rename to src/test/ui/run-pass/issues/issue-33264.rs index cb4b227548aa..1c0ad2a659e8 100644 --- a/src/test/run-pass/issue-33264.rs +++ b/src/test/ui/run-pass/issues/issue-33264.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // only-x86_64 #![allow(dead_code, non_upper_case_globals)] diff --git a/src/test/run-pass/issue-33287.rs b/src/test/ui/run-pass/issues/issue-33287.rs similarity index 97% rename from src/test/run-pass/issue-33287.rs rename to src/test/ui/run-pass/issues/issue-33287.rs index a2021e0e5279..e99c53caa87d 100644 --- a/src/test/run-pass/issue-33287.rs +++ b/src/test/ui/run-pass/issues/issue-33287.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const A: [u32; 1] = [0]; fn test() { diff --git a/src/test/run-pass/issue-333.rs b/src/test/ui/run-pass/issues/issue-333.rs similarity index 98% rename from src/test/run-pass/issue-333.rs rename to src/test/ui/run-pass/issues/issue-333.rs index bdd0a5353039..4c47ab77a48f 100644 --- a/src/test/run-pass/issue-333.rs +++ b/src/test/ui/run-pass/issues/issue-333.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn quux(x: T) -> T { let f = id::; return f(x); } diff --git a/src/test/run-pass/issue-33387.rs b/src/test/ui/run-pass/issues/issue-33387.rs similarity index 98% rename from src/test/run-pass/issue-33387.rs rename to src/test/ui/run-pass/issues/issue-33387.rs index d30e88b3968c..def4059b9dfc 100644 --- a/src/test/run-pass/issue-33387.rs +++ b/src/test/ui/run-pass/issues/issue-33387.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(rustc_attrs)] use std::sync::Arc; diff --git a/src/test/run-pass/issue-33461.rs b/src/test/ui/run-pass/issues/issue-33461.rs similarity index 98% rename from src/test/run-pass/issue-33461.rs rename to src/test/ui/run-pass/issues/issue-33461.rs index ac7f7ff42298..17938a38474d 100644 --- a/src/test/run-pass/issue-33461.rs +++ b/src/test/ui/run-pass/issues/issue-33461.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::marker::PhantomData; struct TheType { diff --git a/src/test/run-pass/issue-33498.rs b/src/test/ui/run-pass/issues/issue-33498.rs similarity index 98% rename from src/test/run-pass/issue-33498.rs rename to src/test/ui/run-pass/issues/issue-33498.rs index 9b4e1918baea..e7e890830329 100644 --- a/src/test/run-pass/issue-33498.rs +++ b/src/test/ui/run-pass/issues/issue-33498.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let x = (0, 2); diff --git a/src/test/run-pass/issue-33537.rs b/src/test/ui/run-pass/issues/issue-33537.rs similarity index 98% rename from src/test/run-pass/issue-33537.rs rename to src/test/ui/run-pass/issues/issue-33537.rs index 7be79f3a4509..3ef1595b9588 100644 --- a/src/test/run-pass/issue-33537.rs +++ b/src/test/ui/run-pass/issues/issue-33537.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(min_const_fn)] const fn foo() -> *const i8 { diff --git a/src/test/run-pass/issue-33687.rs b/src/test/ui/run-pass/issues/issue-33687.rs similarity index 98% rename from src/test/run-pass/issue-33687.rs rename to src/test/ui/run-pass/issues/issue-33687.rs index 59badca065a1..e6841595916a 100644 --- a/src/test/run-pass/issue-33687.rs +++ b/src/test/ui/run-pass/issues/issue-33687.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(unboxed_closures)] #![feature(fn_traits)] diff --git a/src/test/run-pass/issue-33770.rs b/src/test/ui/run-pass/issues/issue-33770.rs similarity index 99% rename from src/test/run-pass/issue-33770.rs rename to src/test/ui/run-pass/issues/issue-33770.rs index 7fad2b3e4a29..5d1de986b47d 100644 --- a/src/test/run-pass/issue-33770.rs +++ b/src/test/ui/run-pass/issues/issue-33770.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/issue-3389.rs b/src/test/ui/run-pass/issues/issue-3389.rs similarity index 95% rename from src/test/run-pass/issue-3389.rs rename to src/test/ui/run-pass/issues/issue-3389.rs index 70e3484a0c57..7102bb469e4e 100644 --- a/src/test/run-pass/issue-3389.rs +++ b/src/test/ui/run-pass/issues/issue-3389.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] struct trie_node { content: Vec , diff --git a/src/test/run-pass/issue-33903.rs b/src/test/ui/run-pass/issues/issue-33903.rs similarity index 98% rename from src/test/run-pass/issue-33903.rs rename to src/test/ui/run-pass/issues/issue-33903.rs index 3bc0f7a0fdee..df2f5e3e7a0c 100644 --- a/src/test/run-pass/issue-33903.rs +++ b/src/test/ui/run-pass/issues/issue-33903.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue 33903: // Built-in indexing should be used even when the index is not // trivially an integer diff --git a/src/test/run-pass/issue-33992.rs b/src/test/ui/run-pass/issues/issue-33992.rs similarity index 98% rename from src/test/run-pass/issue-33992.rs rename to src/test/ui/run-pass/issues/issue-33992.rs index 98da7d46b1aa..d10c11644d5b 100644 --- a/src/test/run-pass/issue-33992.rs +++ b/src/test/ui/run-pass/issues/issue-33992.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-windows // ignore-macos diff --git a/src/test/run-pass/issue-34053.rs b/src/test/ui/run-pass/issues/issue-34053.rs similarity index 98% rename from src/test/run-pass/issue-34053.rs rename to src/test/ui/run-pass/issues/issue-34053.rs index 81c455241475..fb6417ee870f 100644 --- a/src/test/run-pass/issue-34053.rs +++ b/src/test/ui/run-pass/issues/issue-34053.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::sync::atomic::{AtomicUsize, ATOMIC_USIZE_INIT, Ordering}; static DROP_COUNTER: AtomicUsize = ATOMIC_USIZE_INIT; diff --git a/src/test/run-pass/issue-34074.rs b/src/test/ui/run-pass/issues/issue-34074.rs similarity index 98% rename from src/test/run-pass/issue-34074.rs rename to src/test/ui/run-pass/issues/issue-34074.rs index 17d2bee74661..3f64cfd2e58d 100644 --- a/src/test/run-pass/issue-34074.rs +++ b/src/test/ui/run-pass/issues/issue-34074.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Make sure several unnamed function parameters don't conflict with each other trait Tr { diff --git a/src/test/run-pass/issue-34194.rs b/src/test/ui/run-pass/issues/issue-34194.rs similarity index 98% rename from src/test/run-pass/issue-34194.rs rename to src/test/ui/run-pass/issues/issue-34194.rs index e1aef8996196..dfc0a34651a3 100644 --- a/src/test/run-pass/issue-34194.rs +++ b/src/test/ui/run-pass/issues/issue-34194.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] struct A { diff --git a/src/test/run-pass/issue-3424.rs b/src/test/ui/run-pass/issues/issue-3424.rs similarity index 94% rename from src/test/run-pass/issue-3424.rs rename to src/test/ui/run-pass/issues/issue-3424.rs index 74e58f31e23e..1e914eaee581 100644 --- a/src/test/run-pass/issue-3424.rs +++ b/src/test/ui/run-pass/issues/issue-3424.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] // rustc --test ignores2.rs && ./ignores2 pub struct Path; diff --git a/src/test/run-pass/issue-3429.rs b/src/test/ui/run-pass/issues/issue-3429.rs similarity index 97% rename from src/test/run-pass/issue-3429.rs rename to src/test/ui/run-pass/issues/issue-3429.rs index 325a3ec71512..d6bc87393775 100644 --- a/src/test/run-pass/issue-3429.rs +++ b/src/test/ui/run-pass/issues/issue-3429.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-34427.rs b/src/test/ui/run-pass/issues/issue-34427.rs similarity index 98% rename from src/test/run-pass/issue-34427.rs rename to src/test/ui/run-pass/issues/issue-34427.rs index 6bf8a2ac6a72..b43e9ff8b522 100644 --- a/src/test/run-pass/issue-34427.rs +++ b/src/test/ui/run-pass/issues/issue-34427.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #34427: On ARM, the code in `foo` at one time was generating // a machine code instruction of the form: `str r0, [r0, rN]!` (for // some N), which is not legal because the source register and base diff --git a/src/test/run-pass/issue-3447.rs b/src/test/ui/run-pass/issues/issue-3447.rs similarity index 93% rename from src/test/run-pass/issue-3447.rs rename to src/test/ui/run-pass/issues/issue-3447.rs index 1558d94bae79..ff4642e47ebe 100644 --- a/src/test/run-pass/issue-3447.rs +++ b/src/test/ui/run-pass/issues/issue-3447.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] +#![allow(non_camel_case_types)] #![feature(box_syntax)] use std::cell::RefCell; diff --git a/src/test/run-pass/issue-34503.rs b/src/test/ui/run-pass/issues/issue-34503.rs similarity index 98% rename from src/test/run-pass/issue-34503.rs rename to src/test/ui/run-pass/issues/issue-34503.rs index e6217243eeb4..b470518fd432 100644 --- a/src/test/run-pass/issue-34503.rs +++ b/src/test/ui/run-pass/issues/issue-34503.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { struct X; trait Foo { diff --git a/src/test/run-pass/issue-34569.rs b/src/test/ui/run-pass/issues/issue-34569.rs similarity index 98% rename from src/test/run-pass/issue-34569.rs rename to src/test/ui/run-pass/issues/issue-34569.rs index 5c7c5a2b3b96..1bdd56b15abd 100644 --- a/src/test/run-pass/issue-34569.rs +++ b/src/test/ui/run-pass/issues/issue-34569.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:-g // In this test we just want to make sure that the code below does not lead to diff --git a/src/test/run-pass/issue-34571.rs b/src/test/ui/run-pass/issues/issue-34571.rs similarity index 97% rename from src/test/run-pass/issue-34571.rs rename to src/test/ui/run-pass/issues/issue-34571.rs index 7d8041565765..dbb85007be8c 100644 --- a/src/test/run-pass/issue-34571.rs +++ b/src/test/ui/run-pass/issues/issue-34571.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[repr(u8)] enum Foo { Foo(u8), diff --git a/src/test/run-pass/issue-34751.rs b/src/test/ui/run-pass/issues/issue-34751.rs similarity index 98% rename from src/test/run-pass/issue-34751.rs rename to src/test/ui/run-pass/issues/issue-34751.rs index d4cea506f730..382212a19082 100644 --- a/src/test/run-pass/issue-34751.rs +++ b/src/test/ui/run-pass/issues/issue-34751.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // #34751 ICE: 'rustc' panicked at 'assertion failed: !substs.has_regions_escaping_depth(0)' #[allow(dead_code)] diff --git a/src/test/run-pass/issue-34780.rs b/src/test/ui/run-pass/issues/issue-34780.rs similarity index 94% rename from src/test/run-pass/issue-34780.rs rename to src/test/ui/run-pass/issues/issue-34780.rs index eda4ebb7132a..b7f2871a8d15 100644 --- a/src/test/run-pass/issue-34780.rs +++ b/src/test/ui/run-pass/issues/issue-34780.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] #![feature(associated_consts)] use std::marker::PhantomData; diff --git a/src/test/run-pass/issue-34784.rs b/src/test/ui/run-pass/issues/issue-34784.rs similarity index 98% rename from src/test/run-pass/issue-34784.rs rename to src/test/ui/run-pass/issues/issue-34784.rs index c9a214e0cedd..0a6a25c41d5e 100644 --- a/src/test/run-pass/issue-34784.rs +++ b/src/test/ui/run-pass/issues/issue-34784.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const C: *const u8 = &0; fn foo(x: *const u8) { diff --git a/src/test/run-pass/issue-34796.rs b/src/test/ui/run-pass/issues/issue-34796.rs similarity index 99% rename from src/test/run-pass/issue-34796.rs rename to src/test/ui/run-pass/issues/issue-34796.rs index 0fb6ccc0dc8b..ea9172ae4837 100644 --- a/src/test/run-pass/issue-34796.rs +++ b/src/test/ui/run-pass/issues/issue-34796.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test case exposes conditions where the encoding of a trait object type // with projection predicates would differ between this crate and the upstream // crate, because the predicates were encoded in different order within each diff --git a/src/test/run-pass/issue-34798.rs b/src/test/ui/run-pass/issues/issue-34798.rs similarity index 98% rename from src/test/run-pass/issue-34798.rs rename to src/test/ui/run-pass/issues/issue-34798.rs index e217d07ed725..33e78be48897 100644 --- a/src/test/run-pass/issue-34798.rs +++ b/src/test/ui/run-pass/issues/issue-34798.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![forbid(improper_ctypes)] #![allow(dead_code)] diff --git a/src/test/run-pass/issue-34932.rs b/src/test/ui/run-pass/issues/issue-34932.rs similarity index 98% rename from src/test/run-pass/issue-34932.rs rename to src/test/ui/run-pass/issues/issue-34932.rs index dca387dcc211..8f249c321107 100644 --- a/src/test/run-pass/issue-34932.rs +++ b/src/test/ui/run-pass/issues/issue-34932.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:--test // rustc-env:RUSTC_BOOTSTRAP_KEY= #![cfg(any())] // This test should be configured away diff --git a/src/test/run-pass/issue-3500.rs b/src/test/ui/run-pass/issues/issue-3500.rs similarity index 98% rename from src/test/run-pass/issue-3500.rs rename to src/test/ui/run-pass/issues/issue-3500.rs index f1d9f888b081..c4d3255cd300 100644 --- a/src/test/run-pass/issue-3500.rs +++ b/src/test/ui/run-pass/issues/issue-3500.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-35376.rs b/src/test/ui/run-pass/issues/issue-35376.rs similarity index 98% rename from src/test/run-pass/issue-35376.rs rename to src/test/ui/run-pass/issues/issue-35376.rs index 9e4eb84edc67..ee8c6c9f35c2 100644 --- a/src/test/run-pass/issue-35376.rs +++ b/src/test/ui/run-pass/issues/issue-35376.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(specialization)] fn main() {} diff --git a/src/test/run-pass/issue-35423.rs b/src/test/ui/run-pass/issues/issue-35423.rs similarity index 98% rename from src/test/run-pass/issue-35423.rs rename to src/test/ui/run-pass/issues/issue-35423.rs index 34cb2930db0c..969925679fa8 100644 --- a/src/test/run-pass/issue-35423.rs +++ b/src/test/ui/run-pass/issues/issue-35423.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main () { let x = 4; match x { diff --git a/src/test/run-pass/issue-35546.rs b/src/test/ui/run-pass/issues/issue-35546.rs similarity index 98% rename from src/test/run-pass/issue-35546.rs rename to src/test/ui/run-pass/issues/issue-35546.rs index e8d14f1d4214..9c39941232f3 100644 --- a/src/test/run-pass/issue-35546.rs +++ b/src/test/ui/run-pass/issues/issue-35546.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #35546. Check that we are able to codegen // this. Before we had problems because of the drop glue signature // around dropping a trait object (specifically, when dropping the diff --git a/src/test/run-pass/issue-3556.rs b/src/test/ui/run-pass/issues/issue-3556.rs similarity index 99% rename from src/test/run-pass/issue-3556.rs rename to src/test/ui/run-pass/issues/issue-3556.rs index e6b577ada0c8..b71d94adfeba 100644 --- a/src/test/run-pass/issue-3556.rs +++ b/src/test/ui/run-pass/issues/issue-3556.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] enum Token { diff --git a/src/test/run-pass/issue-3559.rs b/src/test/ui/run-pass/issues/issue-3559.rs similarity index 98% rename from src/test/run-pass/issue-3559.rs rename to src/test/ui/run-pass/issues/issue-3559.rs index 64f053d9a8c6..8ca001691bb8 100644 --- a/src/test/run-pass/issue-3559.rs +++ b/src/test/ui/run-pass/issues/issue-3559.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::HashMap; fn check_strs(actual: &str, expected: &str) -> bool { diff --git a/src/test/run-pass/issue-35600.rs b/src/test/ui/run-pass/issues/issue-35600.rs similarity index 98% rename from src/test/run-pass/issue-35600.rs rename to src/test/ui/run-pass/issues/issue-35600.rs index 88358eff08d0..1083aa808cb2 100644 --- a/src/test/run-pass/issue-35600.rs +++ b/src/test/ui/run-pass/issues/issue-35600.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { type bar; fn bar(); diff --git a/src/test/run-pass/issue-3563-2.rs b/src/test/ui/run-pass/issues/issue-3563-2.rs similarity index 98% rename from src/test/run-pass/issue-3563-2.rs rename to src/test/ui/run-pass/issues/issue-3563-2.rs index 65c21317cf24..534bec59018e 100644 --- a/src/test/run-pass/issue-3563-2.rs +++ b/src/test/ui/run-pass/issues/issue-3563-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Canvas { diff --git a/src/test/run-pass/issue-3563-3.rs b/src/test/ui/run-pass/issues/issue-3563-3.rs similarity index 99% rename from src/test/run-pass/issue-3563-3.rs rename to src/test/ui/run-pass/issues/issue-3563-3.rs index 56208d08779c..cd31abaca356 100644 --- a/src/test/run-pass/issue-3563-3.rs +++ b/src/test/ui/run-pass/issues/issue-3563-3.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // ASCII art shape renderer. Demonstrates traits, impls, operator overloading, // non-copyable struct, unit testing. To run execute: rustc --test shapes.rs && // ./shapes diff --git a/src/test/run-pass/issue-3574.rs b/src/test/ui/run-pass/issues/issue-3574.rs similarity index 98% rename from src/test/run-pass/issue-3574.rs rename to src/test/ui/run-pass/issues/issue-3574.rs index 9aac52fa2f8a..1b5f80031b7c 100644 --- a/src/test/run-pass/issue-3574.rs +++ b/src/test/ui/run-pass/issues/issue-3574.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // rustc --test match_borrowed_str.rs.rs && ./match_borrowed_str.rs diff --git a/src/test/run-pass/issue-35815.rs b/src/test/ui/run-pass/issues/issue-35815.rs similarity index 98% rename from src/test/run-pass/issue-35815.rs rename to src/test/ui/run-pass/issues/issue-35815.rs index 619542926500..62bd6aa37fd2 100644 --- a/src/test/run-pass/issue-35815.rs +++ b/src/test/ui/run-pass/issues/issue-35815.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; struct Foo { diff --git a/src/test/run-pass/issue-36023.rs b/src/test/ui/run-pass/issues/issue-36023.rs similarity index 98% rename from src/test/run-pass/issue-36023.rs rename to src/test/ui/run-pass/issues/issue-36023.rs index f6c03b384f23..a654a813edf0 100644 --- a/src/test/run-pass/issue-36023.rs +++ b/src/test/ui/run-pass/issues/issue-36023.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Deref; fn main() { diff --git a/src/test/run-pass/issue-36036-associated-type-layout.rs b/src/test/ui/run-pass/issues/issue-36036-associated-type-layout.rs similarity index 98% rename from src/test/run-pass/issue-36036-associated-type-layout.rs rename to src/test/ui/run-pass/issues/issue-36036-associated-type-layout.rs index 4ee3be0eb7b8..772a936af868 100644 --- a/src/test/run-pass/issue-36036-associated-type-layout.rs +++ b/src/test/ui/run-pass/issues/issue-36036-associated-type-layout.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue 36036: computing the layout of a type composed from another // trait's associated type caused compiler to ICE when the associated // type was allowed to be unsized, even though the known instantiated diff --git a/src/test/run-pass/issue-36053.rs b/src/test/ui/run-pass/issues/issue-36053.rs similarity index 98% rename from src/test/run-pass/issue-36053.rs rename to src/test/ui/run-pass/issues/issue-36053.rs index ece58eedc56e..3f1fa529d724 100644 --- a/src/test/run-pass/issue-36053.rs +++ b/src/test/ui/run-pass/issues/issue-36053.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #36053. ICE was caused due to obligations being // added to a special, dedicated fulfillment cx during a // probe. Problem seems to be related to the particular definition of diff --git a/src/test/run-pass/issue-36075.rs b/src/test/ui/run-pass/issues/issue-36075.rs similarity index 98% rename from src/test/run-pass/issue-36075.rs rename to src/test/ui/run-pass/issues/issue-36075.rs index fe399e10c1c3..e11d35669f5f 100644 --- a/src/test/run-pass/issue-36075.rs +++ b/src/test/ui/run-pass/issues/issue-36075.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait DeclarationParser { type Declaration; } diff --git a/src/test/run-pass/issue-3609.rs b/src/test/ui/run-pass/issues/issue-3609.rs similarity index 98% rename from src/test/run-pass/issue-3609.rs rename to src/test/ui/run-pass/issues/issue-3609.rs index f53053f2edcb..384964188db6 100644 --- a/src/test/run-pass/issue-3609.rs +++ b/src/test/ui/run-pass/issues/issue-3609.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::thread; use std::sync::mpsc::Sender; diff --git a/src/test/run-pass/issue-36139-normalize-closure-sig.rs b/src/test/ui/run-pass/issues/issue-36139-normalize-closure-sig.rs similarity index 98% rename from src/test/run-pass/issue-36139-normalize-closure-sig.rs rename to src/test/ui/run-pass/issues/issue-36139-normalize-closure-sig.rs index adde0ed30667..04693f4e6157 100644 --- a/src/test/run-pass/issue-36139-normalize-closure-sig.rs +++ b/src/test/ui/run-pass/issues/issue-36139-normalize-closure-sig.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Previously the closure's argument would be inferred to // >::Item, causing an error in MIR type // checking diff --git a/src/test/run-pass/issue-36260.rs b/src/test/ui/run-pass/issues/issue-36260.rs similarity index 98% rename from src/test/run-pass/issue-36260.rs rename to src/test/ui/run-pass/issues/issue-36260.rs index 08dbbb5c9fe1..052fd9d8477e 100644 --- a/src/test/run-pass/issue-36260.rs +++ b/src/test/ui/run-pass/issues/issue-36260.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Make sure this compiles without getting a linker error because of missing // drop-glue because the collector missed adding drop-glue for the closure: diff --git a/src/test/run-pass/issue-36278-prefix-nesting.rs b/src/test/ui/run-pass/issues/issue-36278-prefix-nesting.rs similarity index 98% rename from src/test/run-pass/issue-36278-prefix-nesting.rs rename to src/test/ui/run-pass/issues/issue-36278-prefix-nesting.rs index 95269d0569de..41c01db076ef 100644 --- a/src/test/run-pass/issue-36278-prefix-nesting.rs +++ b/src/test/ui/run-pass/issues/issue-36278-prefix-nesting.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue 36278: On an unsized struct with >1 level of nontrivial // nesting, ensure we are computing dynamic size of prefix correctly. diff --git a/src/test/run-pass/issue-36381.rs b/src/test/ui/run-pass/issues/issue-36381.rs similarity index 98% rename from src/test/run-pass/issue-36381.rs rename to src/test/ui/run-pass/issues/issue-36381.rs index 2694c98dd916..e7e0dca4f64e 100644 --- a/src/test/run-pass/issue-36381.rs +++ b/src/test/ui/run-pass/issues/issue-36381.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #36381. The monomorphization collector was asserting that // there are no projection types, but the `<&str as // StreamOnce>::Position` projection contained a late-bound region, diff --git a/src/test/run-pass/issue-36401.rs b/src/test/ui/run-pass/issues/issue-36401.rs similarity index 98% rename from src/test/run-pass/issue-36401.rs rename to src/test/ui/run-pass/issues/issue-36401.rs index 7b08eba9e498..fb180a359ddc 100644 --- a/src/test/run-pass/issue-36401.rs +++ b/src/test/ui/run-pass/issues/issue-36401.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] pub enum Event { Key(u8), diff --git a/src/test/run-pass/issue-36474.rs b/src/test/ui/run-pass/issues/issue-36474.rs similarity index 98% rename from src/test/run-pass/issue-36474.rs rename to src/test/ui/run-pass/issues/issue-36474.rs index 025244ca6648..cfb136c1157b 100644 --- a/src/test/run-pass/issue-36474.rs +++ b/src/test/ui/run-pass/issues/issue-36474.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { remove_axis(&3, 0); } diff --git a/src/test/run-pass/issue-3656.rs b/src/test/ui/run-pass/issues/issue-3656.rs similarity index 96% rename from src/test/run-pass/issue-3656.rs rename to src/test/ui/run-pass/issues/issue-3656.rs index c278dcef9dde..1e626e2e9c1f 100644 --- a/src/test/run-pass/issue-3656.rs +++ b/src/test/ui/run-pass/issues/issue-3656.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // Issue #3656 // Incorrect struct size computation in the FFI, because of not taking // the alignment of elements into account. diff --git a/src/test/run-pass/issue-36744-bitcast-args-if-needed.rs b/src/test/ui/run-pass/issues/issue-36744-bitcast-args-if-needed.rs similarity index 98% rename from src/test/run-pass/issue-36744-bitcast-args-if-needed.rs rename to src/test/ui/run-pass/issues/issue-36744-bitcast-args-if-needed.rs index 1859cc9ca00b..4a566d94a50a 100644 --- a/src/test/run-pass/issue-36744-bitcast-args-if-needed.rs +++ b/src/test/ui/run-pass/issues/issue-36744-bitcast-args-if-needed.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This tests for an ICE (and, if ignored, subsequent LLVM abort) when // a lifetime-parametric fn is passed into a context whose expected // type has a differing lifetime parameterization. diff --git a/src/test/run-pass/issue-36744-without-calls.rs b/src/test/ui/run-pass/issues/issue-36744-without-calls.rs similarity index 98% rename from src/test/run-pass/issue-36744-without-calls.rs rename to src/test/ui/run-pass/issues/issue-36744-without-calls.rs index 1766edb06b48..ad54d6e403cb 100644 --- a/src/test/run-pass/issue-36744-without-calls.rs +++ b/src/test/ui/run-pass/issues/issue-36744-without-calls.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests for an LLVM abort when storing a lifetime-parametric fn into // context that is expecting one that is not lifetime-parametric // (i.e. has no `for <'_>`). diff --git a/src/test/run-pass/issue-36768.rs b/src/test/ui/run-pass/issues/issue-36768.rs similarity index 98% rename from src/test/run-pass/issue-36768.rs rename to src/test/ui/run-pass/issues/issue-36768.rs index bb4d12919a1c..c6a76b2ca135 100644 --- a/src/test/run-pass/issue-36768.rs +++ b/src/test/ui/run-pass/issues/issue-36768.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:--test #![deny(private_in_public)] diff --git a/src/test/run-pass/issue-36786-resolve-call.rs b/src/test/ui/run-pass/issues/issue-36786-resolve-call.rs similarity index 98% rename from src/test/run-pass/issue-36786-resolve-call.rs rename to src/test/ui/run-pass/issues/issue-36786-resolve-call.rs index 0d718c7ba468..51aa7906b94b 100644 --- a/src/test/run-pass/issue-36786-resolve-call.rs +++ b/src/test/ui/run-pass/issues/issue-36786-resolve-call.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Ensure that types that rely on obligations are autoderefed // correctly diff --git a/src/test/run-pass/issue-36792.rs b/src/test/ui/run-pass/issues/issue-36792.rs similarity index 97% rename from src/test/run-pass/issue-36792.rs rename to src/test/ui/run-pass/issues/issue-36792.rs index f2755ec3f846..91e76140b821 100644 --- a/src/test/run-pass/issue-36792.rs +++ b/src/test/ui/run-pass/issues/issue-36792.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo() -> impl Copy { foo } diff --git a/src/test/run-pass/issue-36816.rs b/src/test/ui/run-pass/issues/issue-36816.rs similarity index 97% rename from src/test/run-pass/issue-36816.rs rename to src/test/ui/run-pass/issues/issue-36816.rs index 22f3a52b26e7..292829b4d243 100644 --- a/src/test/run-pass/issue-36816.rs +++ b/src/test/ui/run-pass/issues/issue-36816.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! m { () => { 1 } } macro_rules! n { () => { 1 + m!() } } diff --git a/src/test/run-pass/issue-3683.rs b/src/test/ui/run-pass/issues/issue-3683.rs similarity index 98% rename from src/test/run-pass/issue-3683.rs rename to src/test/ui/run-pass/issues/issue-3683.rs index ed9b8066104f..9b39577ec651 100644 --- a/src/test/run-pass/issue-3683.rs +++ b/src/test/ui/run-pass/issues/issue-3683.rs @@ -7,8 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// +// run-pass trait Foo { fn a(&self) -> isize; diff --git a/src/test/run-pass/issue-36856.rs b/src/test/ui/run-pass/issues/issue-36856.rs similarity index 98% rename from src/test/run-pass/issue-36856.rs rename to src/test/ui/run-pass/issues/issue-36856.rs index 91a0dadd6532..9aebb9001832 100644 --- a/src/test/run-pass/issue-36856.rs +++ b/src/test/ui/run-pass/issues/issue-36856.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #36856. // compile-flags:-g diff --git a/src/test/run-pass/issue-36936.rs b/src/test/ui/run-pass/issues/issue-36936.rs similarity index 98% rename from src/test/run-pass/issue-36936.rs rename to src/test/ui/run-pass/issues/issue-36936.rs index 34a9c2916683..da187ac173dc 100644 --- a/src/test/run-pass/issue-36936.rs +++ b/src/test/ui/run-pass/issues/issue-36936.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // check that casts are not being treated as lexprs. fn main() { diff --git a/src/test/run-pass/issue-36954.rs b/src/test/ui/run-pass/issues/issue-36954.rs similarity index 97% rename from src/test/run-pass/issue-36954.rs rename to src/test/ui/run-pass/issues/issue-36954.rs index f8330ba99b7a..d12e9e41ee6c 100644 --- a/src/test/run-pass/issue-36954.rs +++ b/src/test/ui/run-pass/issues/issue-36954.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-36954.rs extern crate issue_36954 as lib; diff --git a/src/test/run-pass/issue-3702.rs b/src/test/ui/run-pass/issues/issue-3702.rs similarity index 98% rename from src/test/run-pass/issue-3702.rs rename to src/test/ui/run-pass/issues/issue-3702.rs index 9c09b8cd1c72..5ca851f8b779 100644 --- a/src/test/run-pass/issue-3702.rs +++ b/src/test/ui/run-pass/issues/issue-3702.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { trait Text { diff --git a/src/test/run-pass/issue-37109.rs b/src/test/ui/run-pass/issues/issue-37109.rs similarity index 98% rename from src/test/run-pass/issue-37109.rs rename to src/test/ui/run-pass/issues/issue-37109.rs index 1c893071d558..a683af9bbb2d 100644 --- a/src/test/run-pass/issue-37109.rs +++ b/src/test/ui/run-pass/issues/issue-37109.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait ToRef<'a> { type Ref: 'a; } diff --git a/src/test/run-pass/issue-37175.rs b/src/test/ui/run-pass/issues/issue-37175.rs similarity index 97% rename from src/test/run-pass/issue-37175.rs rename to src/test/ui/run-pass/issues/issue-37175.rs index 0d3613b573e1..a51f829abd89 100644 --- a/src/test/run-pass/issue-37175.rs +++ b/src/test/ui/run-pass/issues/issue-37175.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! m { (<$t:ty>) => { stringify!($t) } } fn main() { println!("{}", m!(>)); diff --git a/src/test/run-pass/issue-37222.rs b/src/test/ui/run-pass/issues/issue-37222.rs similarity index 98% rename from src/test/run-pass/issue-37222.rs rename to src/test/ui/run-pass/issues/issue-37222.rs index 381a5799cc55..af19a922faec 100644 --- a/src/test/run-pass/issue-37222.rs +++ b/src/test/ui/run-pass/issues/issue-37222.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug, PartialEq)] enum Bar { A(i64), diff --git a/src/test/run-pass/issue-37291/auxiliary/lib.rs b/src/test/ui/run-pass/issues/issue-37291/auxiliary/lib.rs similarity index 100% rename from src/test/run-pass/issue-37291/auxiliary/lib.rs rename to src/test/ui/run-pass/issues/issue-37291/auxiliary/lib.rs diff --git a/src/test/run-pass/issue-37291/main.rs b/src/test/ui/run-pass/issues/issue-37291/main.rs similarity index 98% rename from src/test/run-pass/issue-37291/main.rs rename to src/test/ui/run-pass/issues/issue-37291/main.rs index 2461f7485f26..c30e87ad785a 100644 --- a/src/test/run-pass/issue-37291/main.rs +++ b/src/test/ui/run-pass/issues/issue-37291/main.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:lib.rs // Regression test for #37291. The problem was that the starting diff --git a/src/test/run-pass/issue-3743.rs b/src/test/ui/run-pass/issues/issue-3743.rs similarity index 99% rename from src/test/run-pass/issue-3743.rs rename to src/test/ui/run-pass/issues/issue-3743.rs index cd62c04a3258..e884bc4d5c41 100644 --- a/src/test/run-pass/issue-3743.rs +++ b/src/test/ui/run-pass/issues/issue-3743.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // If `Mul` used an associated type for its output, this test would // work more smoothly. diff --git a/src/test/run-pass/issue-3753.rs b/src/test/ui/run-pass/issues/issue-3753.rs similarity index 98% rename from src/test/run-pass/issue-3753.rs rename to src/test/ui/run-pass/issues/issue-3753.rs index e6eb8efe442f..7941b016d14b 100644 --- a/src/test/run-pass/issue-3753.rs +++ b/src/test/ui/run-pass/issues/issue-3753.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #3656 // Issue Name: pub method preceded by attribute can't be parsed // Abstract: Visibility parsing failed when compiler parsing diff --git a/src/test/run-pass/issue-37598.rs b/src/test/ui/run-pass/issues/issue-37598.rs similarity index 98% rename from src/test/run-pass/issue-37598.rs rename to src/test/ui/run-pass/issues/issue-37598.rs index e97c8d9f4176..b5a11f5a0fd6 100644 --- a/src/test/run-pass/issue-37598.rs +++ b/src/test/ui/run-pass/issues/issue-37598.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(slice_patterns)] fn check(list: &[u8]) { diff --git a/src/test/run-pass/issue-37655.rs b/src/test/ui/run-pass/issues/issue-37655.rs similarity index 98% rename from src/test/run-pass/issue-37655.rs rename to src/test/ui/run-pass/issues/issue-37655.rs index d229bcacc501..899686befc23 100644 --- a/src/test/run-pass/issue-37655.rs +++ b/src/test/ui/run-pass/issues/issue-37655.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #37655. The problem was a false edge created by // coercion that wound up requiring that `'a` (in `split()`) outlive // `'b`, which shouldn't be necessary. diff --git a/src/test/run-pass/issue-37686.rs b/src/test/ui/run-pass/issues/issue-37686.rs similarity index 97% rename from src/test/run-pass/issue-37686.rs rename to src/test/ui/run-pass/issues/issue-37686.rs index 47881d4d530f..824f80c04f9c 100644 --- a/src/test/run-pass/issue-37686.rs +++ b/src/test/ui/run-pass/issues/issue-37686.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { match (0, 0) { (std::usize::MIN, std::usize::MAX) => {} diff --git a/src/test/run-pass/issue-37725.rs b/src/test/ui/run-pass/issues/issue-37725.rs similarity index 97% rename from src/test/run-pass/issue-37725.rs rename to src/test/ui/run-pass/issues/issue-37725.rs index a8fb11f9c62b..ce952a7e5203 100644 --- a/src/test/run-pass/issue-37725.rs +++ b/src/test/ui/run-pass/issues/issue-37725.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { fn foo(&self); } diff --git a/src/test/run-pass/issue-37733.rs b/src/test/ui/run-pass/issues/issue-37733.rs similarity index 97% rename from src/test/run-pass/issue-37733.rs rename to src/test/ui/run-pass/issues/issue-37733.rs index 358b93254de9..0b1b08d4e7b9 100644 --- a/src/test/run-pass/issue-37733.rs +++ b/src/test/ui/run-pass/issues/issue-37733.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass type A = for<> fn(); type B = for<'a,> fn(); diff --git a/src/test/run-pass/issue-3794.rs b/src/test/ui/run-pass/issues/issue-3794.rs similarity index 98% rename from src/test/run-pass/issue-3794.rs rename to src/test/ui/run-pass/issues/issue-3794.rs index badb833ee800..936e9db6715e 100644 --- a/src/test/run-pass/issue-3794.rs +++ b/src/test/ui/run-pass/issues/issue-3794.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] trait T { diff --git a/src/test/run-pass/issue-37991.rs b/src/test/ui/run-pass/issues/issue-37991.rs similarity index 98% rename from src/test/run-pass/issue-37991.rs rename to src/test/ui/run-pass/issues/issue-37991.rs index 9b3289e67859..578c22fe2322 100644 --- a/src/test/run-pass/issue-37991.rs +++ b/src/test/ui/run-pass/issues/issue-37991.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(min_const_fn)] const fn foo() -> i64 { diff --git a/src/test/run-pass/issue-38002.rs b/src/test/ui/run-pass/issues/issue-38002.rs similarity index 98% rename from src/test/run-pass/issue-38002.rs rename to src/test/ui/run-pass/issues/issue-38002.rs index 4eb381b9eac2..70892ba7d624 100644 --- a/src/test/run-pass/issue-38002.rs +++ b/src/test/ui/run-pass/issues/issue-38002.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that constant ADTs are codegened OK, part k of N. enum Bar { diff --git a/src/test/run-pass/issue-38033.rs b/src/test/ui/run-pass/issues/issue-38033.rs similarity index 99% rename from src/test/run-pass/issue-38033.rs rename to src/test/ui/run-pass/issues/issue-38033.rs index 50549dc8b238..3f6ef26ed797 100644 --- a/src/test/run-pass/issue-38033.rs +++ b/src/test/ui/run-pass/issues/issue-38033.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::marker; use std::mem; diff --git a/src/test/run-pass/issue-38074.rs b/src/test/ui/run-pass/issues/issue-38074.rs similarity index 98% rename from src/test/run-pass/issue-38074.rs rename to src/test/ui/run-pass/issues/issue-38074.rs index 2368ba8a110b..bae0f5fd3ffe 100644 --- a/src/test/run-pass/issue-38074.rs +++ b/src/test/ui/run-pass/issues/issue-38074.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten FIXME(#45351) #![feature(platform_intrinsics, repr_simd)] diff --git a/src/test/run-pass/issue-38091.rs b/src/test/ui/run-pass/issues/issue-38091.rs similarity index 98% rename from src/test/run-pass/issue-38091.rs rename to src/test/ui/run-pass/issues/issue-38091.rs index 34050242f84f..2e3cf210c4a8 100644 --- a/src/test/run-pass/issue-38091.rs +++ b/src/test/ui/run-pass/issues/issue-38091.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(specialization)] trait Iterate<'a> { diff --git a/src/test/run-pass/issue-38190.rs b/src/test/ui/run-pass/issues/issue-38190.rs similarity index 98% rename from src/test/run-pass/issue-38190.rs rename to src/test/ui/run-pass/issues/issue-38190.rs index ed9bf9e80952..86bc2ba02b8f 100644 --- a/src/test/run-pass/issue-38190.rs +++ b/src/test/ui/run-pass/issues/issue-38190.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_38190.rs // ignore-pretty issue #37195 diff --git a/src/test/run-pass/issue-38226.rs b/src/test/ui/run-pass/issues/issue-38226.rs similarity index 98% rename from src/test/run-pass/issue-38226.rs rename to src/test/ui/run-pass/issues/issue-38226.rs index dd9f9be7da71..d26807a4d680 100644 --- a/src/test/run-pass/issue-38226.rs +++ b/src/test/ui/run-pass/issues/issue-38226.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test makes sure that we don't run into a linker error because of the // middle::reachable pass missing trait methods with default impls. diff --git a/src/test/run-pass/issue-38437.rs b/src/test/ui/run-pass/issues/issue-38437.rs similarity index 99% rename from src/test/run-pass/issue-38437.rs rename to src/test/ui/run-pass/issues/issue-38437.rs index a6e7df1c0102..cea55270aa0f 100644 --- a/src/test/run-pass/issue-38437.rs +++ b/src/test/ui/run-pass/issues/issue-38437.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that drop elaboration clears the "master" discriminant // drop flag even if it protects no fields. diff --git a/src/test/run-pass/issue-3847.rs b/src/test/ui/run-pass/issues/issue-3847.rs similarity index 98% rename from src/test/run-pass/issue-3847.rs rename to src/test/ui/run-pass/issues/issue-3847.rs index bd3a726991b9..1342843f870b 100644 --- a/src/test/run-pass/issue-3847.rs +++ b/src/test/ui/run-pass/issues/issue-3847.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod buildings { pub struct Tower { pub height: usize } } diff --git a/src/test/run-pass/issue-38556.rs b/src/test/ui/run-pass/issues/issue-38556.rs similarity index 98% rename from src/test/run-pass/issue-38556.rs rename to src/test/ui/run-pass/issues/issue-38556.rs index f6f334f650b2..b1a30f910dff 100644 --- a/src/test/run-pass/issue-38556.rs +++ b/src/test/ui/run-pass/issues/issue-38556.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub struct Foo; macro_rules! reexport { diff --git a/src/test/run-pass/issue-38715.rs b/src/test/ui/run-pass/issues/issue-38715.rs similarity index 98% rename from src/test/run-pass/issue-38715.rs rename to src/test/ui/run-pass/issues/issue-38715.rs index b158234eb115..8cc1d8af89c2 100644 --- a/src/test/run-pass/issue-38715.rs +++ b/src/test/ui/run-pass/issues/issue-38715.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_38715.rs // aux-build:issue_38715-modern.rs diff --git a/src/test/run-pass/issue-38727.rs b/src/test/ui/run-pass/issues/issue-38727.rs similarity index 97% rename from src/test/run-pass/issue-38727.rs rename to src/test/ui/run-pass/issues/issue-38727.rs index e60b6a99f921..81e63476524c 100644 --- a/src/test/run-pass/issue-38727.rs +++ b/src/test/ui/run-pass/issues/issue-38727.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[repr(u64)] enum A { A = 0u64, diff --git a/src/test/run-pass/issue-3874.rs b/src/test/ui/run-pass/issues/issue-3874.rs similarity index 98% rename from src/test/run-pass/issue-3874.rs rename to src/test/ui/run-pass/issues/issue-3874.rs index a29a26758654..53a57c9943b3 100644 --- a/src/test/run-pass/issue-3874.rs +++ b/src/test/ui/run-pass/issues/issue-3874.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 enum PureCounter { PureCounterVariant(usize) } diff --git a/src/test/run-pass/issue-38763.rs b/src/test/ui/run-pass/issues/issue-38763.rs similarity index 98% rename from src/test/run-pass/issue-38763.rs rename to src/test/ui/run-pass/issues/issue-38763.rs index e038062ff9ae..c488aa5ca1ac 100644 --- a/src/test/run-pass/issue-38763.rs +++ b/src/test/ui/run-pass/issues/issue-38763.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten #[repr(C)] diff --git a/src/test/run-pass/issue-3878.rs b/src/test/ui/run-pass/issues/issue-3878.rs similarity index 98% rename from src/test/run-pass/issue-3878.rs rename to src/test/ui/run-pass/issues/issue-3878.rs index e0e11b4fd865..9e073c749bb5 100644 --- a/src/test/run-pass/issue-3878.rs +++ b/src/test/ui/run-pass/issues/issue-3878.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(path_statements)] diff --git a/src/test/run-pass/issue-3888-2.rs b/src/test/ui/run-pass/issues/issue-3888-2.rs similarity index 97% rename from src/test/run-pass/issue-3888-2.rs rename to src/test/ui/run-pass/issues/issue-3888-2.rs index 24c1a5d05c89..707145392c7d 100644 --- a/src/test/run-pass/issue-3888-2.rs +++ b/src/test/ui/run-pass/issues/issue-3888-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn vec_peek<'r, T>(v: &'r [T]) -> &'r [T] { diff --git a/src/test/run-pass/issue-38942.rs b/src/test/ui/run-pass/issues/issue-38942.rs similarity index 98% rename from src/test/run-pass/issue-38942.rs rename to src/test/ui/run-pass/issues/issue-38942.rs index 9c1c999d090e..740bf9528280 100644 --- a/src/test/run-pass/issue-38942.rs +++ b/src/test/ui/run-pass/issues/issue-38942.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // See https://github.com/rust-lang/rust/issues/38942 #[repr(u64)] diff --git a/src/test/run-pass/issue-3895.rs b/src/test/ui/run-pass/issues/issue-3895.rs similarity index 98% rename from src/test/run-pass/issue-3895.rs rename to src/test/ui/run-pass/issues/issue-3895.rs index ffe14dab3003..3620cb874f56 100644 --- a/src/test/run-pass/issue-3895.rs +++ b/src/test/ui/run-pass/issues/issue-3895.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { enum State { BadChar, BadSyntax } diff --git a/src/test/run-pass/issue-38987.rs b/src/test/ui/run-pass/issues/issue-38987.rs similarity index 97% rename from src/test/run-pass/issue-38987.rs rename to src/test/ui/run-pass/issues/issue-38987.rs index 31a3b7233d8c..ef89ed6fee4e 100644 --- a/src/test/run-pass/issue-38987.rs +++ b/src/test/ui/run-pass/issues/issue-38987.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let _ = -0x8000_0000_0000_0000_0000_0000_0000_0000i128; } diff --git a/src/test/run-pass/issue-3904.rs b/src/test/ui/run-pass/issues/issue-3904.rs similarity index 98% rename from src/test/run-pass/issue-3904.rs rename to src/test/ui/run-pass/issues/issue-3904.rs index e917ecc745f0..1f5b777c4d2f 100644 --- a/src/test/run-pass/issue-3904.rs +++ b/src/test/ui/run-pass/issues/issue-3904.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn example_err(prog: &str, arg: &str) { println!("{}: {}", prog, arg) } diff --git a/src/test/run-pass/issue-39089.rs b/src/test/ui/run-pass/issues/issue-39089.rs similarity index 97% rename from src/test/run-pass/issue-39089.rs rename to src/test/ui/run-pass/issues/issue-39089.rs index c3a58844547d..e4ace4299bd2 100644 --- a/src/test/run-pass/issue-39089.rs +++ b/src/test/ui/run-pass/issues/issue-39089.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn f Sized>() {} fn main() {} diff --git a/src/test/run-pass/issue-39292.rs b/src/test/ui/run-pass/issues/issue-39292.rs similarity index 98% rename from src/test/run-pass/issue-39292.rs rename to src/test/ui/run-pass/issues/issue-39292.rs index dc2b21f3470e..4b79e08f3345 100644 --- a/src/test/run-pass/issue-39292.rs +++ b/src/test/ui/run-pass/issues/issue-39292.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #39292. The object vtable was being // incorrectly left with a null pointer. diff --git a/src/test/run-pass/issue-3935.rs b/src/test/ui/run-pass/issues/issue-3935.rs similarity index 98% rename from src/test/run-pass/issue-3935.rs rename to src/test/ui/run-pass/issues/issue-3935.rs index 45ff20fc0a9c..756bc7b57974 100644 --- a/src/test/run-pass/issue-3935.rs +++ b/src/test/ui/run-pass/issues/issue-3935.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq)] struct Bike { diff --git a/src/test/run-pass/issue-39367.rs b/src/test/ui/run-pass/issues/issue-39367.rs similarity index 99% rename from src/test/run-pass/issue-39367.rs rename to src/test/ui/run-pass/issues/issue-39367.rs index 3e72efada84e..4f6ed57a7ae5 100644 --- a/src/test/run-pass/issue-39367.rs +++ b/src/test/ui/run-pass/issues/issue-39367.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Deref; struct ArenaSet::Target>(U, &'static V) diff --git a/src/test/run-pass/issue-39467.rs b/src/test/ui/run-pass/issues/issue-39467.rs similarity index 97% rename from src/test/run-pass/issue-39467.rs rename to src/test/ui/run-pass/issues/issue-39467.rs index 9f94be271eeb..3fab06d9a683 100644 --- a/src/test/run-pass/issue-39467.rs +++ b/src/test/ui/run-pass/issues/issue-39467.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! expr { () => { () } } enum A {} diff --git a/src/test/run-pass/issue-39548.rs b/src/test/ui/run-pass/issues/issue-39548.rs similarity index 97% rename from src/test/run-pass/issue-39548.rs rename to src/test/ui/run-pass/issues/issue-39548.rs index 7da50670d1de..28bf971c830b 100644 --- a/src/test/run-pass/issue-39548.rs +++ b/src/test/ui/run-pass/issues/issue-39548.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass type Array = [(); ((1 < 2) == false) as usize]; fn main() { diff --git a/src/test/run-pass/issue-39709.rs b/src/test/ui/run-pass/issues/issue-39709.rs similarity index 97% rename from src/test/run-pass/issue-39709.rs rename to src/test/ui/run-pass/issues/issue-39709.rs index ebca9312a64b..44caa644edf4 100644 --- a/src/test/run-pass/issue-39709.rs +++ b/src/test/ui/run-pass/issues/issue-39709.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { println!("{}", { macro_rules! x { ($(t:tt)*) => {} } 33 }); } diff --git a/src/test/run-pass/issue-39720.rs b/src/test/ui/run-pass/issues/issue-39720.rs similarity index 95% rename from src/test/run-pass/issue-39720.rs rename to src/test/ui/run-pass/issues/issue-39720.rs index 9873a8c2bf44..157cc41cdd38 100644 --- a/src/test/run-pass/issue-39720.rs +++ b/src/test/ui/run-pass/issues/issue-39720.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // ignore-emscripten FIXME(#45351) #![feature(repr_simd, platform_intrinsics)] diff --git a/src/test/ui/run-pass/issues/issue-39720.stderr b/src/test/ui/run-pass/issues/issue-39720.stderr new file mode 100644 index 000000000000..7b717d86335b --- /dev/null +++ b/src/test/ui/run-pass/issues/issue-39720.stderr @@ -0,0 +1,16 @@ +warning[E0566]: conflicting representation hints + --> $DIR/issue-39720.rs:18:8 + | +LL | #[repr(C)] + | ^ +LL | #[repr(simd)] + | ^^^^ + +warning[E0566]: conflicting representation hints + --> $DIR/issue-39720.rs:23:8 + | +LL | #[repr(C)] + | ^ +LL | #[repr(simd)] + | ^^^^ + diff --git a/src/test/run-pass/issue-3979-2.rs b/src/test/ui/run-pass/issues/issue-3979-2.rs similarity index 98% rename from src/test/run-pass/issue-3979-2.rs rename to src/test/ui/run-pass/issues/issue-3979-2.rs index 4cd3c04bac3c..9b8e5817c6c1 100644 --- a/src/test/run-pass/issue-3979-2.rs +++ b/src/test/ui/run-pass/issues/issue-3979-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait A { diff --git a/src/test/run-pass/issue-3979-generics.rs b/src/test/ui/run-pass/issues/issue-3979-generics.rs similarity index 96% rename from src/test/run-pass/issue-3979-generics.rs rename to src/test/ui/run-pass/issues/issue-3979-generics.rs index 2b56799f6b07..7766d7d1bdc8 100644 --- a/src/test/run-pass/issue-3979-generics.rs +++ b/src/test/ui/run-pass/issues/issue-3979-generics.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] use std::ops::Add; diff --git a/src/test/run-pass/issue-3979-xcrate.rs b/src/test/ui/run-pass/issues/issue-3979-xcrate.rs similarity index 98% rename from src/test/run-pass/issue-3979-xcrate.rs rename to src/test/ui/run-pass/issues/issue-3979-xcrate.rs index acacc4885664..d698e7ac775e 100644 --- a/src/test/run-pass/issue-3979-xcrate.rs +++ b/src/test/ui/run-pass/issues/issue-3979-xcrate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_3979_traits.rs extern crate issue_3979_traits; diff --git a/src/test/run-pass/issue-3979.rs b/src/test/ui/run-pass/issues/issue-3979.rs similarity index 96% rename from src/test/run-pass/issue-3979.rs rename to src/test/ui/run-pass/issues/issue-3979.rs index 9b5f7296ab59..4cc2e882baaa 100644 --- a/src/test/run-pass/issue-3979.rs +++ b/src/test/ui/run-pass/issues/issue-3979.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] trait Positioned { fn SetX(&mut self, _: isize); diff --git a/src/test/run-pass/issue-39808.rs b/src/test/ui/run-pass/issues/issue-39808.rs similarity index 98% rename from src/test/run-pass/issue-39808.rs rename to src/test/ui/run-pass/issues/issue-39808.rs index 91c70d76eefb..78c67302a99f 100644 --- a/src/test/run-pass/issue-39808.rs +++ b/src/test/ui/run-pass/issues/issue-39808.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unreachable_code)] // Regression test for #39808. The type parameter of `Owned` was diff --git a/src/test/run-pass/issue-39823.rs b/src/test/ui/run-pass/issues/issue-39823.rs similarity index 98% rename from src/test/run-pass/issue-39823.rs rename to src/test/ui/run-pass/issues/issue-39823.rs index 061a55b03b21..4a2e4846a59f 100644 --- a/src/test/run-pass/issue-39823.rs +++ b/src/test/ui/run-pass/issues/issue-39823.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_39823.rs extern crate issue_39823; diff --git a/src/test/run-pass/issue-39827.rs b/src/test/ui/run-pass/issues/issue-39827.rs similarity index 99% rename from src/test/run-pass/issue-39827.rs rename to src/test/ui/run-pass/issues/issue-39827.rs index b753cf5844fa..c7b2a0d4fc02 100644 --- a/src/test/run-pass/issue-39827.rs +++ b/src/test/ui/run-pass/issues/issue-39827.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass #![feature(core_intrinsics)] use std::intrinsics::{ volatile_copy_memory, volatile_store, volatile_load, diff --git a/src/test/run-pass/issue-3991.rs b/src/test/ui/run-pass/issues/issue-3991.rs similarity index 98% rename from src/test/run-pass/issue-3991.rs rename to src/test/ui/run-pass/issues/issue-3991.rs index d89cf8c2e106..d3efcaf636e8 100644 --- a/src/test/run-pass/issue-3991.rs +++ b/src/test/ui/run-pass/issues/issue-3991.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-39984.rs b/src/test/ui/run-pass/issues/issue-39984.rs similarity index 98% rename from src/test/run-pass/issue-39984.rs rename to src/test/ui/run-pass/issues/issue-39984.rs index a0019e7215c9..450620da35ac 100644 --- a/src/test/run-pass/issue-39984.rs +++ b/src/test/ui/run-pass/issues/issue-39984.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #39984. // // The key here is that the error type of the `Ok` call ought to be diff --git a/src/test/run-pass/issue-40003.rs b/src/test/ui/run-pass/issues/issue-40003.rs similarity index 99% rename from src/test/run-pass/issue-40003.rs rename to src/test/ui/run-pass/issues/issue-40003.rs index 103a365af0eb..cf18ab47c39a 100644 --- a/src/test/run-pass/issue-40003.rs +++ b/src/test/ui/run-pass/issues/issue-40003.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { if false { test(); } } diff --git a/src/test/run-pass/issue-40085.rs b/src/test/ui/run-pass/issues/issue-40085.rs similarity index 98% rename from src/test/run-pass/issue-40085.rs rename to src/test/ui/run-pass/issues/issue-40085.rs index b6d02908a0f7..062366941d91 100644 --- a/src/test/run-pass/issue-40085.rs +++ b/src/test/ui/run-pass/issues/issue-40085.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Index; fn bar() {} static UNIT: () = (); diff --git a/src/test/run-pass/issue-40136.rs b/src/test/ui/run-pass/issues/issue-40136.rs similarity index 98% rename from src/test/run-pass/issue-40136.rs rename to src/test/ui/run-pass/issues/issue-40136.rs index 488754af06fb..5c1a527dbeb9 100644 --- a/src/test/run-pass/issue-40136.rs +++ b/src/test/ui/run-pass/issues/issue-40136.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! m { () => { 0 } } diff --git a/src/test/run-pass/issue-40235.rs b/src/test/ui/run-pass/issues/issue-40235.rs similarity index 97% rename from src/test/run-pass/issue-40235.rs rename to src/test/ui/run-pass/issues/issue-40235.rs index 90f170d8e42e..3c26183f1467 100644 --- a/src/test/run-pass/issue-40235.rs +++ b/src/test/ui/run-pass/issues/issue-40235.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo() {} fn main() { diff --git a/src/test/run-pass/issue-4025.rs b/src/test/ui/run-pass/issues/issue-4025.rs similarity index 98% rename from src/test/run-pass/issue-4025.rs rename to src/test/ui/run-pass/issues/issue-4025.rs index dec148ca0f6d..f216ba9b9c98 100644 --- a/src/test/run-pass/issue-4025.rs +++ b/src/test/ui/run-pass/issues/issue-4025.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass /* # if b { x } else { y } requires identical types for x and y */ diff --git a/src/test/run-pass/issue-40408.rs b/src/test/ui/run-pass/issues/issue-40408.rs similarity index 98% rename from src/test/run-pass/issue-40408.rs rename to src/test/ui/run-pass/issues/issue-40408.rs index a73dc1966b4b..68f2858df479 100644 --- a/src/test/run-pass/issue-40408.rs +++ b/src/test/ui/run-pass/issues/issue-40408.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { println!("{}", 0E+10); println!("{}", 0e+10); diff --git a/src/test/run-pass/issue-40469.rs b/src/test/ui/run-pass/issues/issue-40469.rs similarity index 98% rename from src/test/run-pass/issue-40469.rs rename to src/test/ui/run-pass/issues/issue-40469.rs index 30055e532cd4..fd0ad2d0e083 100644 --- a/src/test/run-pass/issue-40469.rs +++ b/src/test/ui/run-pass/issues/issue-40469.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37195 #![allow(dead_code)] diff --git a/src/test/run-pass/issue-40770.rs b/src/test/ui/run-pass/issues/issue-40770.rs similarity index 97% rename from src/test/run-pass/issue-40770.rs rename to src/test/ui/run-pass/issues/issue-40770.rs index 599d0b273e3f..d27b13c3a10e 100644 --- a/src/test/run-pass/issue-40770.rs +++ b/src/test/ui/run-pass/issues/issue-40770.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! m { ($e:expr) => { macro_rules! n { () => { $e } } diff --git a/src/test/run-pass/issue-40847.rs b/src/test/ui/run-pass/issues/issue-40847.rs similarity index 98% rename from src/test/run-pass/issue-40847.rs rename to src/test/ui/run-pass/issues/issue-40847.rs index 2fa99984401c..4d18cd6c7ded 100644 --- a/src/test/run-pass/issue-40847.rs +++ b/src/test/ui/run-pass/issues/issue-40847.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! gen { ($name:ident ( $($dol:tt $var:ident)* ) $($body:tt)*) => { macro_rules! $name { diff --git a/src/test/run-pass/issue-40883.rs b/src/test/ui/run-pass/issues/issue-40883.rs similarity index 99% rename from src/test/run-pass/issue-40883.rs rename to src/test/ui/run-pass/issues/issue-40883.rs index c1f3b2028aa7..357152b60e5a 100644 --- a/src/test/run-pass/issue-40883.rs +++ b/src/test/ui/run-pass/issues/issue-40883.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // check that we don't have linear stack usage with multiple calls to `push` #![feature(test)] diff --git a/src/test/run-pass/issue-40951.rs b/src/test/ui/run-pass/issues/issue-40951.rs similarity index 98% rename from src/test/run-pass/issue-40951.rs rename to src/test/ui/run-pass/issues/issue-40951.rs index adc7101b16aa..b6f74f4f1cd2 100644 --- a/src/test/run-pass/issue-40951.rs +++ b/src/test/ui/run-pass/issues/issue-40951.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #40951. const FOO: [&'static str; 1] = ["foo"]; diff --git a/src/test/run-pass/issue-40962.rs b/src/test/ui/run-pass/issues/issue-40962.rs similarity index 97% rename from src/test/run-pass/issue-40962.rs rename to src/test/ui/run-pass/issues/issue-40962.rs index b35cfa12eab1..9c9fb2ce9cbe 100644 --- a/src/test/run-pass/issue-40962.rs +++ b/src/test/ui/run-pass/issues/issue-40962.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! m { ($i:meta) => { #[derive($i)] diff --git a/src/test/run-pass/issue-41053.rs b/src/test/ui/run-pass/issues/issue-41053.rs similarity index 98% rename from src/test/run-pass/issue-41053.rs rename to src/test/ui/run-pass/issues/issue-41053.rs index 769d841e364d..2d9dec6bbc79 100644 --- a/src/test/run-pass/issue-41053.rs +++ b/src/test/ui/run-pass/issues/issue-41053.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_41053.rs pub trait Trait { fn foo(&self) {} } diff --git a/src/test/run-pass/issue-4107.rs b/src/test/ui/run-pass/issues/issue-4107.rs similarity index 98% rename from src/test/run-pass/issue-4107.rs rename to src/test/ui/run-pass/issues/issue-4107.rs index 6c5f4bf36de8..a05b1ddd9f46 100644 --- a/src/test/run-pass/issue-4107.rs +++ b/src/test/ui/run-pass/issues/issue-4107.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let _id: &Mat2 = &Matrix::identity(1.0); diff --git a/src/test/run-pass/issue-41213.rs b/src/test/ui/run-pass/issues/issue-41213.rs similarity index 98% rename from src/test/run-pass/issue-41213.rs rename to src/test/ui/run-pass/issues/issue-41213.rs index d4755020fef2..0f1d8fe72493 100644 --- a/src/test/run-pass/issue-41213.rs +++ b/src/test/ui/run-pass/issues/issue-41213.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum A { A1, A2, diff --git a/src/test/run-pass/issue-41272.rs b/src/test/ui/run-pass/issues/issue-41272.rs similarity index 98% rename from src/test/run-pass/issue-41272.rs rename to src/test/ui/run-pass/issues/issue-41272.rs index d6a0034690af..3debd77d1236 100644 --- a/src/test/run-pass/issue-41272.rs +++ b/src/test/ui/run-pass/issues/issue-41272.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo; impl Foo { diff --git a/src/test/run-pass/issue-41298.rs b/src/test/ui/run-pass/issues/issue-41298.rs similarity index 98% rename from src/test/run-pass/issue-41298.rs rename to src/test/ui/run-pass/issues/issue-41298.rs index 2b9baa746748..62e1afb92304 100644 --- a/src/test/run-pass/issue-41298.rs +++ b/src/test/ui/run-pass/issues/issue-41298.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Function { t: T, f: F } impl Function R> { fn foo() { } } diff --git a/src/test/run-pass/issue-41394.rs b/src/test/ui/run-pass/issues/issue-41394.rs similarity index 97% rename from src/test/run-pass/issue-41394.rs rename to src/test/ui/run-pass/issues/issue-41394.rs index 798905599a85..9287c6721085 100644 --- a/src/test/run-pass/issue-41394.rs +++ b/src/test/ui/run-pass/issues/issue-41394.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-41394.rs extern crate issue_41394 as lib; diff --git a/src/test/run-pass/issue-41479.rs b/src/test/ui/run-pass/issues/issue-41479.rs similarity index 97% rename from src/test/run-pass/issue-41479.rs rename to src/test/ui/run-pass/issues/issue-41479.rs index cc97b3323cf3..f527257207ab 100644 --- a/src/test/run-pass/issue-41479.rs +++ b/src/test/ui/run-pass/issues/issue-41479.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn split(pair: (A, B)) { let _a = pair.0; let _b = pair.1; diff --git a/src/test/run-pass/issue-41498.rs b/src/test/ui/run-pass/issues/issue-41498.rs similarity index 98% rename from src/test/run-pass/issue-41498.rs rename to src/test/ui/run-pass/issues/issue-41498.rs index 66fd30bdbbbe..18acc7d7c31d 100644 --- a/src/test/run-pass/issue-41498.rs +++ b/src/test/ui/run-pass/issues/issue-41498.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // regression test for issue #41498. struct S; diff --git a/src/test/run-pass/issue-41604.rs b/src/test/ui/run-pass/issues/issue-41604.rs similarity index 97% rename from src/test/run-pass/issue-41604.rs rename to src/test/ui/run-pass/issues/issue-41604.rs index 20fb8c7e7d6b..c4eda86c9c04 100644 --- a/src/test/run-pass/issue-41604.rs +++ b/src/test/ui/run-pass/issues/issue-41604.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct B; impl B { diff --git a/src/test/run-pass/issue-41628.rs b/src/test/ui/run-pass/issues/issue-41628.rs similarity index 97% rename from src/test/run-pass/issue-41628.rs rename to src/test/ui/run-pass/issues/issue-41628.rs index cba47f984415..75924274f1c4 100644 --- a/src/test/run-pass/issue-41628.rs +++ b/src/test/ui/run-pass/issues/issue-41628.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(dead_code)] #![feature(used)] diff --git a/src/test/run-pass/issue-41677.rs b/src/test/ui/run-pass/issues/issue-41677.rs similarity index 98% rename from src/test/run-pass/issue-41677.rs rename to src/test/ui/run-pass/issues/issue-41677.rs index d014382ca39b..b99a5f7f2a79 100644 --- a/src/test/run-pass/issue-41677.rs +++ b/src/test/ui/run-pass/issues/issue-41677.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #41677. The local variable was winding up with // a type `Receiver` where `?T` was unconstrained, because we // failed to enforce the WF obligations and `?T` is a bivariant type diff --git a/src/test/run-pass/issue-41696.rs b/src/test/ui/run-pass/issues/issue-41696.rs similarity index 99% rename from src/test/run-pass/issue-41696.rs rename to src/test/ui/run-pass/issues/issue-41696.rs index 1888be58c57d..780290dce7fa 100644 --- a/src/test/run-pass/issue-41696.rs +++ b/src/test/ui/run-pass/issues/issue-41696.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // this used to cause exponential code-size blowup during LLVM passes. #![feature(test)] diff --git a/src/test/run-pass/issue-41744.rs b/src/test/ui/run-pass/issues/issue-41744.rs similarity index 97% rename from src/test/run-pass/issue-41744.rs rename to src/test/ui/run-pass/issues/issue-41744.rs index 276067d7d749..b667b1d929b7 100644 --- a/src/test/run-pass/issue-41744.rs +++ b/src/test/ui/run-pass/issues/issue-41744.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Tc {} impl Tc for bool {} diff --git a/src/test/run-pass/issue-41803.rs b/src/test/ui/run-pass/issues/issue-41803.rs similarity index 98% rename from src/test/run-pass/issue-41803.rs rename to src/test/ui/run-pass/issues/issue-41803.rs index e18b4204584e..30e3d60bd348 100644 --- a/src/test/run-pass/issue-41803.rs +++ b/src/test/ui/run-pass/issues/issue-41803.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass /// A compile-time map from identifiers to arbitrary (heterogeneous) expressions macro_rules! ident_map { ( $name:ident = { $($key:ident => $e:expr,)* } ) => { diff --git a/src/test/run-pass/issue-41849-variance-req.rs b/src/test/ui/run-pass/issues/issue-41849-variance-req.rs similarity index 98% rename from src/test/run-pass/issue-41849-variance-req.rs rename to src/test/ui/run-pass/issues/issue-41849-variance-req.rs index 0557a6ef376b..2f8c108f590b 100644 --- a/src/test/run-pass/issue-41849-variance-req.rs +++ b/src/test/ui/run-pass/issues/issue-41849-variance-req.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #41849. use std::ops::Mul; diff --git a/src/test/run-pass/issue-41888.rs b/src/test/ui/run-pass/issues/issue-41888.rs similarity index 99% rename from src/test/run-pass/issue-41888.rs rename to src/test/ui/run-pass/issues/issue-41888.rs index e145cde039df..5ae8029e2249 100644 --- a/src/test/run-pass/issue-41888.rs +++ b/src/test/ui/run-pass/issues/issue-41888.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let _ = g(Some(E::F(K))); } type R = Result<(), ()>; diff --git a/src/test/run-pass/issue-41936-variance-coerce-unsized-cycle.rs b/src/test/ui/run-pass/issues/issue-41936-variance-coerce-unsized-cycle.rs similarity index 99% rename from src/test/run-pass/issue-41936-variance-coerce-unsized-cycle.rs rename to src/test/ui/run-pass/issues/issue-41936-variance-coerce-unsized-cycle.rs index bfbead878917..f47e69931d55 100644 --- a/src/test/run-pass/issue-41936-variance-coerce-unsized-cycle.rs +++ b/src/test/ui/run-pass/issues/issue-41936-variance-coerce-unsized-cycle.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #41936. The coerce-unsized trait check in // coherence was using subtyping, which triggered variance // computation, which failed because it required type info for fields diff --git a/src/test/run-pass/issue-42007.rs b/src/test/ui/run-pass/issues/issue-42007.rs similarity index 97% rename from src/test/run-pass/issue-42007.rs rename to src/test/ui/run-pass/issues/issue-42007.rs index cc7e3bc372cc..b72343f05c60 100644 --- a/src/test/run-pass/issue-42007.rs +++ b/src/test/ui/run-pass/issues/issue-42007.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_42007_s.rs extern crate issue_42007_s; diff --git a/src/test/run-pass/issue-4208.rs b/src/test/ui/run-pass/issues/issue-4208.rs similarity index 98% rename from src/test/run-pass/issue-4208.rs rename to src/test/ui/run-pass/issues/issue-4208.rs index 52f5d53c046a..fa6f56bc817c 100644 --- a/src/test/run-pass/issue-4208.rs +++ b/src/test/ui/run-pass/issues/issue-4208.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-4208-cc.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-42148.rs b/src/test/ui/run-pass/issues/issue-42148.rs similarity index 97% rename from src/test/run-pass/issue-42148.rs rename to src/test/ui/run-pass/issues/issue-42148.rs index 0196649a3f62..76947e8b0baf 100644 --- a/src/test/run-pass/issue-42148.rs +++ b/src/test/ui/run-pass/issues/issue-42148.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Zst; fn main() { diff --git a/src/test/run-pass/issue-42210.rs b/src/test/ui/run-pass/issues/issue-42210.rs similarity index 98% rename from src/test/run-pass/issue-42210.rs rename to src/test/ui/run-pass/issues/issue-42210.rs index ecdf78cd5bdf..d3b0da5e0441 100644 --- a/src/test/run-pass/issue-42210.rs +++ b/src/test/ui/run-pass/issues/issue-42210.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #42210. // compile-flags: -g diff --git a/src/test/run-pass/issue-4228.rs b/src/test/ui/run-pass/issues/issue-4228.rs similarity index 98% rename from src/test/run-pass/issue-4228.rs rename to src/test/ui/run-pass/issues/issue-4228.rs index 3d283849b1f9..e66921fe115a 100644 --- a/src/test/run-pass/issue-4228.rs +++ b/src/test/ui/run-pass/issues/issue-4228.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Foo; diff --git a/src/test/run-pass/issue-42453.rs b/src/test/ui/run-pass/issues/issue-42453.rs similarity index 91% rename from src/test/run-pass/issue-42453.rs rename to src/test/ui/run-pass/issues/issue-42453.rs index dfe3a21961e3..649f52ef82e2 100644 --- a/src/test/run-pass/issue-42453.rs +++ b/src/test/ui/run-pass/issues/issue-42453.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #[derive(Debug)] struct builder; diff --git a/src/test/run-pass/issue-42463.rs b/src/test/ui/run-pass/issues/issue-42463.rs similarity index 98% rename from src/test/run-pass/issue-42463.rs rename to src/test/ui/run-pass/issues/issue-42463.rs index 7182fc213f74..9074ab8b6dd3 100644 --- a/src/test/run-pass/issue-42463.rs +++ b/src/test/ui/run-pass/issues/issue-42463.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::{Deref, DerefMut}; struct CheckedDeref { diff --git a/src/test/run-pass/issue-42467.rs b/src/test/ui/run-pass/issues/issue-42467.rs similarity index 98% rename from src/test/run-pass/issue-42467.rs rename to src/test/ui/run-pass/issues/issue-42467.rs index 1b2ee959b2de..0f89d5057519 100644 --- a/src/test/run-pass/issue-42467.rs +++ b/src/test/ui/run-pass/issues/issue-42467.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo(T); struct IntoIter(T); diff --git a/src/test/run-pass/issue-4252.rs b/src/test/ui/run-pass/issues/issue-4252.rs similarity index 98% rename from src/test/run-pass/issue-4252.rs rename to src/test/ui/run-pass/issues/issue-4252.rs index e604141dab81..c733bf5b7649 100644 --- a/src/test/run-pass/issue-4252.rs +++ b/src/test/ui/run-pass/issues/issue-4252.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait X { fn call(&self, x: &T); fn default_method(&self, x: &T) { diff --git a/src/test/run-pass/issue-42552.rs b/src/test/ui/run-pass/issues/issue-42552.rs similarity index 98% rename from src/test/run-pass/issue-42552.rs rename to src/test/ui/run-pass/issues/issue-42552.rs index fd1265b7174f..e1c3a1bd141b 100644 --- a/src/test/run-pass/issue-42552.rs +++ b/src/test/ui/run-pass/issues/issue-42552.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for an obscure issue with the projection cache. fn into_iter(a: &I) -> Groups { diff --git a/src/test/run-pass/issue-42679.rs b/src/test/ui/run-pass/issues/issue-42679.rs similarity index 98% rename from src/test/run-pass/issue-42679.rs rename to src/test/ui/run-pass/issues/issue-42679.rs index 312835225edf..452d231a8468 100644 --- a/src/test/run-pass/issue-42679.rs +++ b/src/test/ui/run-pass/issues/issue-42679.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] #![feature(box_patterns)] diff --git a/src/test/run-pass/issue-42747.rs b/src/test/ui/run-pass/issues/issue-42747.rs similarity index 99% rename from src/test/run-pass/issue-42747.rs rename to src/test/ui/run-pass/issues/issue-42747.rs index 05043ae6b214..c91de3f40eab 100644 --- a/src/test/run-pass/issue-42747.rs +++ b/src/test/ui/run-pass/issues/issue-42747.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! fooN { ($cur:ident $prev:ty) => { #[allow(dead_code)] diff --git a/src/test/run-pass/issue-42956.rs b/src/test/ui/run-pass/issues/issue-42956.rs similarity index 95% rename from src/test/run-pass/issue-42956.rs rename to src/test/ui/run-pass/issues/issue-42956.rs index 9bda6ee4bcb5..cee9d8be98dd 100644 --- a/src/test/run-pass/issue-42956.rs +++ b/src/test/ui/run-pass/issues/issue-42956.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] #![feature(associated_consts)] impl A for i32 { diff --git a/src/test/run-pass/issue-43057.rs b/src/test/ui/run-pass/issues/issue-43057.rs similarity index 98% rename from src/test/run-pass/issue-43057.rs rename to src/test/ui/run-pass/issues/issue-43057.rs index 152ddfb193fc..26140246a7f1 100644 --- a/src/test/run-pass/issue-43057.rs +++ b/src/test/ui/run-pass/issues/issue-43057.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused)] macro_rules! column { diff --git a/src/test/run-pass/issue-43132.rs b/src/test/ui/run-pass/issues/issue-43132.rs similarity index 99% rename from src/test/run-pass/issue-43132.rs rename to src/test/ui/run-pass/issues/issue-43132.rs index 64b3b092b893..b80e000d2e7b 100644 --- a/src/test/run-pass/issue-43132.rs +++ b/src/test/ui/run-pass/issues/issue-43132.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused)] fn main() { diff --git a/src/test/run-pass/issue-43205.rs b/src/test/ui/run-pass/issues/issue-43205.rs similarity index 97% rename from src/test/run-pass/issue-43205.rs rename to src/test/ui/run-pass/issues/issue-43205.rs index 0e613ac0727a..8f89942ddfc3 100644 --- a/src/test/run-pass/issue-43205.rs +++ b/src/test/ui/run-pass/issues/issue-43205.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { &&[()][0]; println!("{:?}", &[(),()][1]); diff --git a/src/test/run-pass/issue-43291.rs b/src/test/ui/run-pass/issues/issue-43291.rs similarity index 98% rename from src/test/run-pass/issue-43291.rs rename to src/test/ui/run-pass/issues/issue-43291.rs index 98de8f788594..cb850b54f7b9 100644 --- a/src/test/run-pass/issue-43291.rs +++ b/src/test/ui/run-pass/issues/issue-43291.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { assert_eq!(!0usize as *const (), foo(0, 1)); assert_eq!(!0usize as *const (), (0i8 - 1) as *const ()); diff --git a/src/test/run-pass/issue-4333.rs b/src/test/ui/run-pass/issues/issue-4333.rs similarity index 98% rename from src/test/run-pass/issue-4333.rs rename to src/test/ui/run-pass/issues/issue-4333.rs index a84d7f3fe828..193a438fc9c8 100644 --- a/src/test/run-pass/issue-4333.rs +++ b/src/test/ui/run-pass/issues/issue-4333.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::io; diff --git a/src/test/run-pass/issue-43357.rs b/src/test/ui/run-pass/issues/issue-43357.rs similarity index 97% rename from src/test/run-pass/issue-43357.rs rename to src/test/ui/run-pass/issues/issue-43357.rs index 9a5f65d67b10..75d05c064289 100644 --- a/src/test/run-pass/issue-43357.rs +++ b/src/test/ui/run-pass/issues/issue-43357.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Trait { type Output; } diff --git a/src/test/run-pass/issue-43483.rs b/src/test/ui/run-pass/issues/issue-43483.rs similarity index 98% rename from src/test/run-pass/issue-43483.rs rename to src/test/ui/run-pass/issues/issue-43483.rs index 48482af76dbf..52ee080125fa 100644 --- a/src/test/run-pass/issue-43483.rs +++ b/src/test/ui/run-pass/issues/issue-43483.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait VecN { const DIM: usize; } diff --git a/src/test/run-pass/issue-43692.rs b/src/test/ui/run-pass/issues/issue-43692.rs similarity index 98% rename from src/test/run-pass/issue-43692.rs rename to src/test/ui/run-pass/issues/issue-43692.rs index 23e96f8c1bf2..a84dd86a1562 100644 --- a/src/test/run-pass/issue-43692.rs +++ b/src/test/ui/run-pass/issues/issue-43692.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { assert_eq!('\u{10__FFFF}', '\u{10FFFF}'); assert_eq!("\u{10_F0FF__}foo\u{1_0_0_0__}", "\u{10F0FF}foo\u{1000}"); diff --git a/src/test/run-pass/issue-43853.rs b/src/test/ui/run-pass/issues/issue-43853.rs similarity index 98% rename from src/test/run-pass/issue-43853.rs rename to src/test/ui/run-pass/issues/issue-43853.rs index e9f8d2744a16..bb8af71b54d9 100644 --- a/src/test/run-pass/issue-43853.rs +++ b/src/test/ui/run-pass/issues/issue-43853.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare compiled with panic=abort by default use std::panic; diff --git a/src/test/run-pass/issue-4387.rs b/src/test/ui/run-pass/issues/issue-4387.rs similarity index 97% rename from src/test/run-pass/issue-4387.rs rename to src/test/ui/run-pass/issues/issue-4387.rs index 9c4ae04bf7b7..45c26433a205 100644 --- a/src/test/run-pass/issue-4387.rs +++ b/src/test/ui/run-pass/issues/issue-4387.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-43910.rs b/src/test/ui/run-pass/issues/issue-43910.rs similarity index 97% rename from src/test/run-pass/issue-43910.rs rename to src/test/ui/run-pass/issues/issue-43910.rs index d61ce7f4689b..5c401a7f82df 100644 --- a/src/test/run-pass/issue-43910.rs +++ b/src/test/ui/run-pass/issues/issue-43910.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(unused_variables)] fn main() { diff --git a/src/test/run-pass/issue-43923.rs b/src/test/ui/run-pass/issues/issue-43923.rs similarity index 98% rename from src/test/run-pass/issue-43923.rs rename to src/test/ui/run-pass/issues/issue-43923.rs index e1992e4fc503..220a68e1335c 100644 --- a/src/test/run-pass/issue-43923.rs +++ b/src/test/ui/run-pass/issues/issue-43923.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct A { ptr: T } fn foo(x: &A<[T]>) {} diff --git a/src/test/run-pass/issue-44005.rs b/src/test/ui/run-pass/issues/issue-44005.rs similarity index 98% rename from src/test/run-pass/issue-44005.rs rename to src/test/ui/run-pass/issues/issue-44005.rs index a53026f36ab7..699cb18ffc72 100644 --- a/src/test/run-pass/issue-44005.rs +++ b/src/test/ui/run-pass/issues/issue-44005.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Foo<'a> { type Bar; fn foo(&'a self) -> Self::Bar; diff --git a/src/test/run-pass/issue-4401.rs b/src/test/ui/run-pass/issues/issue-4401.rs similarity index 98% rename from src/test/run-pass/issue-4401.rs rename to src/test/ui/run-pass/issues/issue-4401.rs index e4fea724c798..5935901efe7e 100644 --- a/src/test/run-pass/issue-4401.rs +++ b/src/test/ui/run-pass/issues/issue-4401.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut count = 0; for _ in 0..999_999 { count += 1; } diff --git a/src/test/run-pass/issue-44056.rs b/src/test/ui/run-pass/issues/issue-44056.rs similarity index 97% rename from src/test/run-pass/issue-44056.rs rename to src/test/ui/run-pass/issues/issue-44056.rs index dcaa0bf86294..50fe99970668 100644 --- a/src/test/run-pass/issue-44056.rs +++ b/src/test/ui/run-pass/issues/issue-44056.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // only-x86_64 // no-prefer-dynamic // compile-flags: -Ctarget-feature=+avx -Clto diff --git a/src/test/run-pass/issue-44247.rs b/src/test/ui/run-pass/issues/issue-44247.rs similarity index 98% rename from src/test/run-pass/issue-44247.rs rename to src/test/ui/run-pass/issues/issue-44247.rs index 27b0aeaac559..f431e94889cb 100644 --- a/src/test/run-pass/issue-44247.rs +++ b/src/test/ui/run-pass/issues/issue-44247.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait T { type X; const X: Self::X; diff --git a/src/test/run-pass/issue-44333.rs b/src/test/ui/run-pass/issues/issue-44333.rs similarity index 98% rename from src/test/run-pass/issue-44333.rs rename to src/test/ui/run-pass/issues/issue-44333.rs index 72731f413211..28fadb9014d2 100644 --- a/src/test/run-pass/issue-44333.rs +++ b/src/test/ui/run-pass/issues/issue-44333.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass type Func = fn(usize, usize) -> usize; fn foo(a: usize, b: usize) -> usize { a + b } diff --git a/src/test/run-pass/issue-44373.rs b/src/test/ui/run-pass/issues/issue-44373.rs similarity index 98% rename from src/test/run-pass/issue-44373.rs rename to src/test/ui/run-pass/issues/issue-44373.rs index d0f8ed96f4cb..4d5bb5449b7b 100644 --- a/src/test/run-pass/issue-44373.rs +++ b/src/test/ui/run-pass/issues/issue-44373.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -Z borrowck=compare struct Foo(bool); diff --git a/src/test/run-pass/issue-44402.rs b/src/test/ui/run-pass/issues/issue-44402.rs similarity index 98% rename from src/test/run-pass/issue-44402.rs rename to src/test/ui/run-pass/issues/issue-44402.rs index 5cbd3446d9b6..427ac016c08c 100644 --- a/src/test/run-pass/issue-44402.rs +++ b/src/test/ui/run-pass/issues/issue-44402.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(never_type)] #![feature(exhaustive_patterns)] diff --git a/src/test/run-pass/issue-4446.rs b/src/test/ui/run-pass/issues/issue-4446.rs similarity index 98% rename from src/test/run-pass/issue-4446.rs rename to src/test/ui/run-pass/issues/issue-4446.rs index 5eec800d5884..3cd70df23cf2 100644 --- a/src/test/run-pass/issue-4446.rs +++ b/src/test/ui/run-pass/issues/issue-4446.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::sync::mpsc::channel; diff --git a/src/test/run-pass/issue-4448.rs b/src/test/ui/run-pass/issues/issue-4448.rs similarity index 98% rename from src/test/run-pass/issue-4448.rs rename to src/test/ui/run-pass/issues/issue-4448.rs index 6f0356b5bfbc..eb474d4c459a 100644 --- a/src/test/run-pass/issue-4448.rs +++ b/src/test/ui/run-pass/issues/issue-4448.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::sync::mpsc::channel; diff --git a/src/test/run-pass/issue-4464.rs b/src/test/ui/run-pass/issues/issue-4464.rs similarity index 97% rename from src/test/run-pass/issue-4464.rs rename to src/test/ui/run-pass/issues/issue-4464.rs index 675ca2c3b7ef..bb788aaf88dd 100644 --- a/src/test/run-pass/issue-4464.rs +++ b/src/test/ui/run-pass/issues/issue-4464.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn broken(v: &[u8], i: usize, j: usize) -> &[u8] { &v[i..j] } diff --git a/src/test/run-pass/issue-44730.rs b/src/test/ui/run-pass/issues/issue-44730.rs similarity index 98% rename from src/test/run-pass/issue-44730.rs rename to src/test/ui/run-pass/issues/issue-44730.rs index 6e8aba012552..0f4d2e174fc0 100644 --- a/src/test/run-pass/issue-44730.rs +++ b/src/test/ui/run-pass/issues/issue-44730.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass //! dox #![deny(missing_docs)] diff --git a/src/test/run-pass/issue-44851.rs b/src/test/ui/run-pass/issues/issue-44851.rs similarity index 98% rename from src/test/run-pass/issue-44851.rs rename to src/test/ui/run-pass/issues/issue-44851.rs index 62d675b13be3..1e9f4d3e4e54 100644 --- a/src/test/run-pass/issue-44851.rs +++ b/src/test/ui/run-pass/issues/issue-44851.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! a { () => { "a" } } diff --git a/src/test/run-pass/issue-45124.rs b/src/test/ui/run-pass/issues/issue-45124.rs similarity index 98% rename from src/test/run-pass/issue-45124.rs rename to src/test/ui/run-pass/issues/issue-45124.rs index cb79eda8b073..774ad8ac7601 100644 --- a/src/test/run-pass/issue-45124.rs +++ b/src/test/ui/run-pass/issues/issue-45124.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: --edition 2018 #![feature(try_blocks)] diff --git a/src/test/run-pass/issue-45152.rs b/src/test/ui/run-pass/issues/issue-45152.rs similarity index 98% rename from src/test/run-pass/issue-45152.rs rename to src/test/ui/run-pass/issues/issue-45152.rs index a5c349adb8d2..71c1f92baa7f 100644 --- a/src/test/run-pass/issue-45152.rs +++ b/src/test/ui/run-pass/issues/issue-45152.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(unsize, coerce_unsized)] #[repr(packed)] diff --git a/src/test/run-pass/issue-4541.rs b/src/test/ui/run-pass/issues/issue-4541.rs similarity index 98% rename from src/test/run-pass/issue-4541.rs rename to src/test/ui/run-pass/issues/issue-4541.rs index 68f6945cd9cb..99415297febe 100644 --- a/src/test/run-pass/issue-4541.rs +++ b/src/test/ui/run-pass/issues/issue-4541.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no std::env fn parse_args() -> String { diff --git a/src/test/run-pass/issue-4542.rs b/src/test/ui/run-pass/issues/issue-4542.rs similarity index 98% rename from src/test/run-pass/issue-4542.rs rename to src/test/ui/run-pass/issues/issue-4542.rs index 59837e4bd53f..3e19e7fa583f 100644 --- a/src/test/run-pass/issue-4542.rs +++ b/src/test/ui/run-pass/issues/issue-4542.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 // ignore-cloudabi no std::env diff --git a/src/test/run-pass/issue-45425.rs b/src/test/ui/run-pass/issues/issue-45425.rs similarity index 98% rename from src/test/run-pass/issue-45425.rs rename to src/test/ui/run-pass/issues/issue-45425.rs index 06ffa6b3dea9..c75236640478 100644 --- a/src/test/run-pass/issue-45425.rs +++ b/src/test/ui/run-pass/issues/issue-45425.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Add; fn ref_add(a: &T, b: &T) -> T diff --git a/src/test/run-pass/issue-4545.rs b/src/test/ui/run-pass/issues/issue-4545.rs similarity index 98% rename from src/test/run-pass/issue-4545.rs rename to src/test/ui/run-pass/issues/issue-4545.rs index 6cb7ccc0e954..94eedbdb93a5 100644 --- a/src/test/run-pass/issue-4545.rs +++ b/src/test/ui/run-pass/issues/issue-4545.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-4545.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-45731.rs b/src/test/ui/run-pass/issues/issue-45731.rs similarity index 99% rename from src/test/run-pass/issue-45731.rs rename to src/test/ui/run-pass/issues/issue-45731.rs index e2c04c964d77..568d6674c3a0 100644 --- a/src/test/run-pass/issue-45731.rs +++ b/src/test/ui/run-pass/issues/issue-45731.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:--test -g #[cfg(target_os = "macos")] diff --git a/src/test/run-pass/issue-46069.rs b/src/test/ui/run-pass/issues/issue-46069.rs similarity index 98% rename from src/test/run-pass/issue-46069.rs rename to src/test/ui/run-pass/issues/issue-46069.rs index 70db20e4a6c9..573b2b8198a9 100644 --- a/src/test/run-pass/issue-46069.rs +++ b/src/test/ui/run-pass/issues/issue-46069.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::iter::{Fuse, Cloned}; use std::slice::Iter; diff --git a/src/test/run-pass/issue-46095.rs b/src/test/ui/run-pass/issues/issue-46095.rs similarity index 98% rename from src/test/run-pass/issue-46095.rs rename to src/test/ui/run-pass/issues/issue-46095.rs index 35e51ebe70b8..ac6ca3923f79 100644 --- a/src/test/run-pass/issue-46095.rs +++ b/src/test/ui/run-pass/issues/issue-46095.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct A; impl A { diff --git a/src/test/run-pass/issue-46519.rs b/src/test/ui/run-pass/issues/issue-46519.rs similarity index 98% rename from src/test/run-pass/issue-46519.rs rename to src/test/ui/run-pass/issues/issue-46519.rs index 878cae4e387f..94b7032417ac 100644 --- a/src/test/run-pass/issue-46519.rs +++ b/src/test/ui/run-pass/issues/issue-46519.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:--test -O #[test] diff --git a/src/test/run-pass/issue-46553.rs b/src/test/ui/run-pass/issues/issue-46553.rs similarity index 98% rename from src/test/run-pass/issue-46553.rs rename to src/test/ui/run-pass/issues/issue-46553.rs index cf00ae4c4675..001db9d86914 100644 --- a/src/test/run-pass/issue-46553.rs +++ b/src/test/ui/run-pass/issues/issue-46553.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(const_fn)] #![deny(const_err)] diff --git a/src/test/run-pass/issue-46845.rs b/src/test/ui/run-pass/issues/issue-46845.rs similarity index 99% rename from src/test/run-pass/issue-46845.rs rename to src/test/ui/run-pass/issues/issue-46845.rs index 92f68dcfc349..f8f3a2bb5bd5 100644 --- a/src/test/run-pass/issue-46845.rs +++ b/src/test/ui/run-pass/issues/issue-46845.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // To work around #46855 // compile-flags: -Z mir-opt-level=0 // Regression test for the inhabitedness of unions with uninhabited variants, issue #46845 diff --git a/src/test/run-pass/issue-46855.rs b/src/test/ui/run-pass/issues/issue-46855.rs similarity index 98% rename from src/test/run-pass/issue-46855.rs rename to src/test/ui/run-pass/issues/issue-46855.rs index 28aa6c731ec8..8e6a37083e35 100644 --- a/src/test/run-pass/issue-46855.rs +++ b/src/test/ui/run-pass/issues/issue-46855.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -Zmir-opt-level=1 use std::mem; diff --git a/src/test/run-pass/issue-46920-byte-array-patterns.rs b/src/test/ui/run-pass/issues/issue-46920-byte-array-patterns.rs similarity index 98% rename from src/test/run-pass/issue-46920-byte-array-patterns.rs rename to src/test/ui/run-pass/issues/issue-46920-byte-array-patterns.rs index 236f6995c51b..1e1f1f0baa9f 100644 --- a/src/test/run-pass/issue-46920-byte-array-patterns.rs +++ b/src/test/ui/run-pass/issues/issue-46920-byte-array-patterns.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const CURSOR_PARTITION_LABEL: &'static [u8] = b"partition"; const CURSOR_EVENT_TYPE_LABEL: &'static [u8] = b"event_type"; const BYTE_PATTERN: &'static [u8; 5] = b"hello"; diff --git a/src/test/run-pass/issue-46959.rs b/src/test/ui/run-pass/issues/issue-46959.rs similarity index 98% rename from src/test/run-pass/issue-46959.rs rename to src/test/ui/run-pass/issues/issue-46959.rs index 7f050c055b0c..baaff2d4581d 100644 --- a/src/test/run-pass/issue-46959.rs +++ b/src/test/ui/run-pass/issues/issue-46959.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(non_camel_case_types)] #[allow(dead_code)] diff --git a/src/test/run-pass/issue-46964.rs b/src/test/ui/run-pass/issues/issue-46964.rs similarity index 98% rename from src/test/run-pass/issue-46964.rs rename to src/test/ui/run-pass/issues/issue-46964.rs index 2a82c6dd4381..ad4d6e3ac1a6 100644 --- a/src/test/run-pass/issue-46964.rs +++ b/src/test/ui/run-pass/issues/issue-46964.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod my_mod { #[derive(Clone, Copy, Eq, PartialEq, PartialOrd, Ord, Hash)] pub struct Name<'a> { diff --git a/src/test/run-pass/issue-47139-1.rs b/src/test/ui/run-pass/issues/issue-47139-1.rs similarity index 99% rename from src/test/run-pass/issue-47139-1.rs rename to src/test/ui/run-pass/issues/issue-47139-1.rs index cb87991a491d..df225b6e0d95 100644 --- a/src/test/run-pass/issue-47139-1.rs +++ b/src/test/ui/run-pass/issues/issue-47139-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #47139: // // Coherence was encountering an (unnecessary) overflow trying to diff --git a/src/test/run-pass/issue-47139-2.rs b/src/test/ui/run-pass/issues/issue-47139-2.rs similarity index 99% rename from src/test/run-pass/issue-47139-2.rs rename to src/test/ui/run-pass/issues/issue-47139-2.rs index 08eaee5acd73..dfc506dc8f10 100644 --- a/src/test/run-pass/issue-47139-2.rs +++ b/src/test/ui/run-pass/issues/issue-47139-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #47139: // // Same as issue-47139-1.rs, but the impls of dummy are in the diff --git a/src/test/run-pass/issue-4734.rs b/src/test/ui/run-pass/issues/issue-4734.rs similarity index 98% rename from src/test/run-pass/issue-4734.rs rename to src/test/ui/run-pass/issues/issue-4734.rs index 9fb826712adc..216fd5370223 100644 --- a/src/test/run-pass/issue-4734.rs +++ b/src/test/ui/run-pass/issues/issue-4734.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Ensures that destructors are run for expressions of the form "e;" where // `e` is a type which requires a destructor. diff --git a/src/test/run-pass/issue-4735.rs b/src/test/ui/run-pass/issues/issue-4735.rs similarity index 98% rename from src/test/run-pass/issue-4735.rs rename to src/test/ui/run-pass/issues/issue-4735.rs index 7eb09e055a29..1b136be9a919 100644 --- a/src/test/run-pass/issue-4735.rs +++ b/src/test/ui/run-pass/issues/issue-4735.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::mem::transmute; diff --git a/src/test/run-pass/issue-47364.rs b/src/test/ui/run-pass/issues/issue-47364.rs similarity index 97% rename from src/test/run-pass/issue-47364.rs rename to src/test/ui/run-pass/issues/issue-47364.rs index 2847ac2a0ba4..61dd0714a1f1 100644 --- a/src/test/run-pass/issue-47364.rs +++ b/src/test/ui/run-pass/issues/issue-47364.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -C codegen-units=8 -O +#![allow(non_snake_case)] fn main() { nom_sql::selection(b"x "); diff --git a/src/test/run-pass/issue-4759-1.rs b/src/test/ui/run-pass/issues/issue-4759-1.rs similarity index 97% rename from src/test/run-pass/issue-4759-1.rs rename to src/test/ui/run-pass/issues/issue-4759-1.rs index a565460c42e2..f05cea777af6 100644 --- a/src/test/run-pass/issue-4759-1.rs +++ b/src/test/ui/run-pass/issues/issue-4759-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait U { fn f(self); } impl U for isize { fn f(self) {} } pub fn main() { 4.f(); } diff --git a/src/test/run-pass/issue-4759.rs b/src/test/ui/run-pass/issues/issue-4759.rs similarity index 93% rename from src/test/run-pass/issue-4759.rs rename to src/test/ui/run-pass/issues/issue-4759.rs index 7788a8f3ec23..12f2874341fc 100644 --- a/src/test/run-pass/issue-4759.rs +++ b/src/test/ui/run-pass/issues/issue-4759.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_shorthand_field_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-47638.rs b/src/test/ui/run-pass/issues/issue-47638.rs similarity index 98% rename from src/test/run-pass/issue-47638.rs rename to src/test/ui/run-pass/issues/issue-47638.rs index 6f627b2a3c13..c3c662ea2d4a 100644 --- a/src/test/run-pass/issue-47638.rs +++ b/src/test/ui/run-pass/issues/issue-47638.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn id<'c, 'b>(f: &'c &'b Fn(&i32)) -> &'c &'b Fn(&'static i32) { f } diff --git a/src/test/run-pass/issue-47673.rs b/src/test/ui/run-pass/issues/issue-47673.rs similarity index 95% rename from src/test/run-pass/issue-47673.rs rename to src/test/ui/run-pass/issues/issue-47673.rs index 22f7f169e298..96f38deec4c2 100644 --- a/src/test/run-pass/issue-47673.rs +++ b/src/test/ui/run-pass/issues/issue-47673.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![allow(unused_import)] +// run-pass use {{}, {}}; diff --git a/src/test/run-pass/issue-47703-1.rs b/src/test/ui/run-pass/issues/issue-47703-1.rs similarity index 98% rename from src/test/run-pass/issue-47703-1.rs rename to src/test/ui/run-pass/issues/issue-47703-1.rs index facdee5cc176..8fa931abb860 100644 --- a/src/test/run-pass/issue-47703-1.rs +++ b/src/test/ui/run-pass/issues/issue-47703-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(nll)] struct AtomicRefMut<'a> { diff --git a/src/test/run-pass/issue-47703-tuple.rs b/src/test/ui/run-pass/issues/issue-47703-tuple.rs similarity index 98% rename from src/test/run-pass/issue-47703-tuple.rs rename to src/test/ui/run-pass/issues/issue-47703-tuple.rs index 4fec3efc0a08..188d4bc55200 100644 --- a/src/test/run-pass/issue-47703-tuple.rs +++ b/src/test/ui/run-pass/issues/issue-47703-tuple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(nll)] struct WithDrop; diff --git a/src/test/run-pass/issue-47703.rs b/src/test/ui/run-pass/issues/issue-47703.rs similarity index 98% rename from src/test/run-pass/issue-47703.rs rename to src/test/ui/run-pass/issues/issue-47703.rs index 2146986377a0..0a0388ac48ed 100644 --- a/src/test/run-pass/issue-47703.rs +++ b/src/test/ui/run-pass/issues/issue-47703.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(nll)] struct MyStruct<'a> { diff --git a/src/test/run-pass/issue-47722.rs b/src/test/ui/run-pass/issues/issue-47722.rs similarity index 98% rename from src/test/run-pass/issue-47722.rs rename to src/test/ui/run-pass/issues/issue-47722.rs index 3b5d808e1f54..92309297356c 100644 --- a/src/test/run-pass/issue-47722.rs +++ b/src/test/ui/run-pass/issues/issue-47722.rs @@ -7,7 +7,9 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass + // Tests that automatic coercions from &mut T to *mut T // allow borrows of T to expire immediately - essentially, that // they work identically to 'foo as *mut T' diff --git a/src/test/run-pass/issue-47789.rs b/src/test/ui/run-pass/issues/issue-47789.rs similarity index 92% rename from src/test/run-pass/issue-47789.rs rename to src/test/ui/run-pass/issues/issue-47789.rs index 3148939992ca..57aac45e51a9 100644 --- a/src/test/run-pass/issue-47789.rs +++ b/src/test/ui/run-pass/issues/issue-47789.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] #![feature(nll)] diff --git a/src/test/run-pass/issue-48159.rs b/src/test/ui/run-pass/issues/issue-48159.rs similarity index 98% rename from src/test/run-pass/issue-48159.rs rename to src/test/ui/run-pass/issues/issue-48159.rs index ce4585607e9b..2f625747b259 100644 --- a/src/test/run-pass/issue-48159.rs +++ b/src/test/ui/run-pass/issues/issue-48159.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(repr_packed)] #![allow(non_camel_case_types)] diff --git a/src/test/run-pass/issue-4830.rs b/src/test/ui/run-pass/issues/issue-4830.rs similarity index 98% rename from src/test/run-pass/issue-4830.rs rename to src/test/ui/run-pass/issues/issue-4830.rs index f615767c2155..42800255c6be 100644 --- a/src/test/run-pass/issue-4830.rs +++ b/src/test/ui/run-pass/issues/issue-4830.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-48508-aux.rs b/src/test/ui/run-pass/issues/issue-48508-aux.rs similarity index 97% rename from src/test/run-pass/issue-48508-aux.rs rename to src/test/ui/run-pass/issues/issue-48508-aux.rs index a00361a2c9d3..1d5ae23cb5e1 100644 --- a/src/test/run-pass/issue-48508-aux.rs +++ b/src/test/ui/run-pass/issues/issue-48508-aux.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-test Not a test. Used by issue-48508.rs pub fn other() -> f64 { diff --git a/src/test/run-pass/issue-48508.rs b/src/test/ui/run-pass/issues/issue-48508.rs similarity index 98% rename from src/test/run-pass/issue-48508.rs rename to src/test/ui/run-pass/issues/issue-48508.rs index 1b10d873f11c..8297d7c33a71 100644 --- a/src/test/run-pass/issue-48508.rs +++ b/src/test/ui/run-pass/issues/issue-48508.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #48508: // // Confusion between global and local file offsets caused incorrect handling of multibyte character diff --git a/src/test/run-pass/issue-48551.rs b/src/test/ui/run-pass/issues/issue-48551.rs similarity index 99% rename from src/test/run-pass/issue-48551.rs rename to src/test/ui/run-pass/issues/issue-48551.rs index 93bddbc53354..b4059d1fd751 100644 --- a/src/test/run-pass/issue-48551.rs +++ b/src/test/ui/run-pass/issues/issue-48551.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #48551. Covers a case where duplicate candidates // arose during associated type projection. diff --git a/src/test/run-pass/issue-4865-1.rs b/src/test/ui/run-pass/issues/issue-4865-1.rs similarity index 98% rename from src/test/run-pass/issue-4865-1.rs rename to src/test/ui/run-pass/issues/issue-4865-1.rs index 3c4777951302..9a22cf08c048 100644 --- a/src/test/run-pass/issue-4865-1.rs +++ b/src/test/ui/run-pass/issues/issue-4865-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This should resolve fine. // Prior to fix, the crossed imports between a and b // would block on the glob import, itself never being resolved diff --git a/src/test/run-pass/issue-4865-2.rs b/src/test/ui/run-pass/issues/issue-4865-2.rs similarity index 98% rename from src/test/run-pass/issue-4865-2.rs rename to src/test/ui/run-pass/issues/issue-4865-2.rs index 6de2f437b20b..6d0395f7ab28 100644 --- a/src/test/run-pass/issue-4865-2.rs +++ b/src/test/ui/run-pass/issues/issue-4865-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Previously, this would have failed to resolve due to the circular // block between `use say` and `pub use hello::*`. // diff --git a/src/test/run-pass/issue-4865-3.rs b/src/test/ui/run-pass/issues/issue-4865-3.rs similarity index 98% rename from src/test/run-pass/issue-4865-3.rs rename to src/test/ui/run-pass/issues/issue-4865-3.rs index d800ea6a6658..4a18539c3028 100644 --- a/src/test/run-pass/issue-4865-3.rs +++ b/src/test/ui/run-pass/issues/issue-4865-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This should resolve fine even with the circular imports as // they are not `pub`. diff --git a/src/test/run-pass/issue-4875.rs b/src/test/ui/run-pass/issues/issue-4875.rs similarity index 98% rename from src/test/run-pass/issue-4875.rs rename to src/test/ui/run-pass/issues/issue-4875.rs index 7ac96c21c621..d33d08ab18cd 100644 --- a/src/test/run-pass/issue-4875.rs +++ b/src/test/ui/run-pass/issues/issue-4875.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // regression test for issue 4875 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-48962.rs b/src/test/ui/run-pass/issues/issue-48962.rs similarity index 98% rename from src/test/run-pass/issue-48962.rs rename to src/test/ui/run-pass/issues/issue-48962.rs index 46aeb329c896..ea309981af1b 100644 --- a/src/test/run-pass/issue-48962.rs +++ b/src/test/ui/run-pass/issues/issue-48962.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to reinitialize box with moved referent #![feature(nll)] static mut ORDER: [usize; 3] = [0, 0, 0]; diff --git a/src/test/run-pass/issue-48984.rs b/src/test/ui/run-pass/issues/issue-48984.rs similarity index 98% rename from src/test/run-pass/issue-48984.rs rename to src/test/ui/run-pass/issues/issue-48984.rs index 227ad4e58f1f..faffc2e4fb05 100644 --- a/src/test/run-pass/issue-48984.rs +++ b/src/test/ui/run-pass/issues/issue-48984.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-48984-aux.rs extern crate issue48984aux; use issue48984aux::Bar; diff --git a/src/test/run-pass/issue-49298.rs b/src/test/ui/run-pass/issues/issue-49298.rs similarity index 98% rename from src/test/run-pass/issue-49298.rs rename to src/test/ui/run-pass/issues/issue-49298.rs index 0b2169c9476c..22a34f334cb2 100644 --- a/src/test/run-pass/issue-49298.rs +++ b/src/test/ui/run-pass/issues/issue-49298.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(test)] extern crate test; diff --git a/src/test/run-pass/issue-49556.rs b/src/test/ui/run-pass/issues/issue-49556.rs similarity index 98% rename from src/test/run-pass/issue-49556.rs rename to src/test/ui/run-pass/issues/issue-49556.rs index 70ccee99f664..aeeb55d6c600 100644 --- a/src/test/run-pass/issue-49556.rs +++ b/src/test/ui/run-pass/issues/issue-49556.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn iter<'a>(data: &'a [usize]) -> impl Iterator + 'a { data.iter() .map( diff --git a/src/test/run-pass/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs b/src/test/ui/run-pass/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs similarity index 98% rename from src/test/run-pass/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs rename to src/test/ui/run-pass/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs index 51b2b5a4f7c0..3a70bdfb2fd0 100644 --- a/src/test/run-pass/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs +++ b/src/test/ui/run-pass/issues/issue-49588-non-shorthand-field-patterns-in-pattern-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(non_shorthand_field_patterns)] pub struct Value { pub value: A } diff --git a/src/test/run-pass/issue-49632.rs b/src/test/ui/run-pass/issues/issue-49632.rs similarity index 98% rename from src/test/run-pass/issue-49632.rs rename to src/test/ui/run-pass/issues/issue-49632.rs index 8cbb7d21af70..2552363b9c92 100644 --- a/src/test/run-pass/issue-49632.rs +++ b/src/test/ui/run-pass/issues/issue-49632.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(stmt_expr_attributes)] pub fn main() { diff --git a/src/test/run-pass/issue-49685.rs b/src/test/ui/run-pass/issues/issue-49685.rs similarity index 98% rename from src/test/run-pass/issue-49685.rs rename to src/test/ui/run-pass/issues/issue-49685.rs index 1e4e79553237..e4dfef1e3da4 100644 --- a/src/test/run-pass/issue-49685.rs +++ b/src/test/ui/run-pass/issues/issue-49685.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for #49685: drop elaboration was not revealing the // value of `impl Trait` returns, leading to an ICE. diff --git a/src/test/run-pass/issue-49854.rs b/src/test/ui/run-pass/issues/issue-49854.rs similarity index 98% rename from src/test/run-pass/issue-49854.rs rename to src/test/ui/run-pass/issues/issue-49854.rs index 5bb80b5e2c6a..5dd323eaf8e5 100644 --- a/src/test/run-pass/issue-49854.rs +++ b/src/test/ui/run-pass/issues/issue-49854.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ffi::OsString; fn main() { diff --git a/src/test/run-pass/issue-49955-2.rs b/src/test/ui/run-pass/issues/issue-49955-2.rs similarity index 98% rename from src/test/run-pass/issue-49955-2.rs rename to src/test/ui/run-pass/issues/issue-49955-2.rs index 17e1de95dd30..40827b016220 100644 --- a/src/test/run-pass/issue-49955-2.rs +++ b/src/test/ui/run-pass/issues/issue-49955-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -Z borrowck=mir use std::cell::Cell; diff --git a/src/test/run-pass/issue-49955.rs b/src/test/ui/run-pass/issues/issue-49955.rs similarity index 98% rename from src/test/run-pass/issue-49955.rs rename to src/test/ui/run-pass/issues/issue-49955.rs index 57a1264aaee8..a5e67928115d 100644 --- a/src/test/run-pass/issue-49955.rs +++ b/src/test/ui/run-pass/issues/issue-49955.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -Z borrowck=compare const ALL_THE_NUMS: [u32; 1] = [ diff --git a/src/test/run-pass/issue-49973.rs b/src/test/ui/run-pass/issues/issue-49973.rs similarity index 98% rename from src/test/run-pass/issue-49973.rs rename to src/test/ui/run-pass/issues/issue-49973.rs index 641e9239177f..c5a3f6c124aa 100644 --- a/src/test/run-pass/issue-49973.rs +++ b/src/test/ui/run-pass/issues/issue-49973.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] #[repr(i32)] enum E { diff --git a/src/test/run-pass/issue-5008-borrowed-traitobject-method-call.rs b/src/test/ui/run-pass/issues/issue-5008-borrowed-traitobject-method-call.rs similarity index 98% rename from src/test/run-pass/issue-5008-borrowed-traitobject-method-call.rs rename to src/test/ui/run-pass/issues/issue-5008-borrowed-traitobject-method-call.rs index 90900ca46ce0..6a08a0c58ac3 100644 --- a/src/test/run-pass/issue-5008-borrowed-traitobject-method-call.rs +++ b/src/test/ui/run-pass/issues/issue-5008-borrowed-traitobject-method-call.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass /* #5008 cast to &Trait causes code to segfault on method call diff --git a/src/test/run-pass/issue-50415.rs b/src/test/ui/run-pass/issues/issue-50415.rs similarity index 98% rename from src/test/run-pass/issue-50415.rs rename to src/test/ui/run-pass/issues/issue-50415.rs index aa493ce03213..282b3b414fab 100644 --- a/src/test/run-pass/issue-50415.rs +++ b/src/test/ui/run-pass/issues/issue-50415.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { // -------- Simplified test case -------- diff --git a/src/test/run-pass/issue-50442.rs b/src/test/ui/run-pass/issues/issue-50442.rs similarity index 97% rename from src/test/run-pass/issue-50442.rs rename to src/test/ui/run-pass/issues/issue-50442.rs index 1e43bebf5c32..6a55f2d633bd 100644 --- a/src/test/run-pass/issue-50442.rs +++ b/src/test/ui/run-pass/issues/issue-50442.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Void {} enum Foo { diff --git a/src/test/run-pass/issue-5060.rs b/src/test/ui/run-pass/issues/issue-5060.rs similarity index 98% rename from src/test/run-pass/issue-5060.rs rename to src/test/ui/run-pass/issues/issue-5060.rs index 21e3343f4458..2caa6541f09a 100644 --- a/src/test/run-pass/issue-5060.rs +++ b/src/test/ui/run-pass/issues/issue-5060.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! print_hd_tl { ($field_hd:ident, $($field_tl:ident),+) => ({ print!("{}", stringify!($field_hd)); diff --git a/src/test/run-pass/issue-50689.rs b/src/test/ui/run-pass/issues/issue-50689.rs similarity index 97% rename from src/test/run-pass/issue-50689.rs rename to src/test/ui/run-pass/issues/issue-50689.rs index d437b9d88f4d..bc94066b0413 100644 --- a/src/test/run-pass/issue-50689.rs +++ b/src/test/ui/run-pass/issues/issue-50689.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Foo { Bar = (|x: i32| { }, 42).1, } diff --git a/src/test/run-pass/issue-50731.rs b/src/test/ui/run-pass/issues/issue-50731.rs similarity index 97% rename from src/test/run-pass/issue-50731.rs rename to src/test/ui/run-pass/issues/issue-50731.rs index 06df2b989af2..fd1d5579fbf9 100644 --- a/src/test/run-pass/issue-50731.rs +++ b/src/test/ui/run-pass/issues/issue-50731.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Void {} fn foo(_: Result<(Void, u32), (Void, String)>) {} fn main() { diff --git a/src/test/run-pass/issue-50811.rs b/src/test/ui/run-pass/issues/issue-50811.rs similarity index 99% rename from src/test/run-pass/issue-50811.rs rename to src/test/ui/run-pass/issues/issue-50811.rs index 05b168d98f1f..381afd4ee119 100644 --- a/src/test/run-pass/issue-50811.rs +++ b/src/test/ui/run-pass/issues/issue-50811.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(test)] extern crate test; diff --git a/src/test/run-pass/issue-50865-private-impl-trait/auxiliary/lib.rs b/src/test/ui/run-pass/issues/issue-50865-private-impl-trait/auxiliary/lib.rs similarity index 100% rename from src/test/run-pass/issue-50865-private-impl-trait/auxiliary/lib.rs rename to src/test/ui/run-pass/issues/issue-50865-private-impl-trait/auxiliary/lib.rs diff --git a/src/test/run-pass/issue-50865-private-impl-trait/main.rs b/src/test/ui/run-pass/issues/issue-50865-private-impl-trait/main.rs similarity index 98% rename from src/test/run-pass/issue-50865-private-impl-trait/main.rs rename to src/test/ui/run-pass/issues/issue-50865-private-impl-trait/main.rs index bc347edf8a76..8c53ecd9c550 100644 --- a/src/test/run-pass/issue-50865-private-impl-trait/main.rs +++ b/src/test/ui/run-pass/issues/issue-50865-private-impl-trait/main.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:lib.rs // Regression test for #50865. diff --git a/src/test/run-pass/issue-51185.rs b/src/test/ui/run-pass/issues/issue-51185.rs similarity index 97% rename from src/test/run-pass/issue-51185.rs rename to src/test/ui/run-pass/issues/issue-51185.rs index 8e286ad1419f..3fd38e76d1d5 100644 --- a/src/test/run-pass/issue-51185.rs +++ b/src/test/ui/run-pass/issues/issue-51185.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo() -> impl Into fn(&'a ())> { (|_| {}) as for<'a> fn(&'a ()) } diff --git a/src/test/run-pass/issue-51345.rs b/src/test/ui/run-pass/issues/issue-51345.rs similarity index 97% rename from src/test/run-pass/issue-51345.rs rename to src/test/ui/run-pass/issues/issue-51345.rs index 7d392944685b..887feada3c82 100644 --- a/src/test/run-pass/issue-51345.rs +++ b/src/test/ui/run-pass/issues/issue-51345.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(nll)] fn main() { diff --git a/src/test/run-pass/issue-51582.rs b/src/test/ui/run-pass/issues/issue-51582.rs similarity index 98% rename from src/test/run-pass/issue-51582.rs rename to src/test/ui/run-pass/issues/issue-51582.rs index bca05d83e406..6c513e843eb1 100644 --- a/src/test/run-pass/issue-51582.rs +++ b/src/test/ui/run-pass/issues/issue-51582.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(core_intrinsics)] #[repr(i8)] diff --git a/src/test/run-pass/issue-51655.rs b/src/test/ui/run-pass/issues/issue-51655.rs similarity index 98% rename from src/test/run-pass/issue-51655.rs rename to src/test/ui/run-pass/issues/issue-51655.rs index b5b89ede91b1..17c04a4097a8 100644 --- a/src/test/run-pass/issue-51655.rs +++ b/src/test/ui/run-pass/issues/issue-51655.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] const PATH_DOT: &[u8] = &[b'.']; diff --git a/src/test/run-pass/issue-51907.rs b/src/test/ui/run-pass/issues/issue-51907.rs similarity index 98% rename from src/test/run-pass/issue-51907.rs rename to src/test/ui/run-pass/issues/issue-51907.rs index de2a59c5f015..3ac31fde31fd 100644 --- a/src/test/run-pass/issue-51907.rs +++ b/src/test/ui/run-pass/issues/issue-51907.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { extern fn borrow(&self); extern fn take(self: Box); diff --git a/src/test/run-pass/issue-5192.rs b/src/test/ui/run-pass/issues/issue-5192.rs similarity index 98% rename from src/test/run-pass/issue-5192.rs rename to src/test/ui/run-pass/issues/issue-5192.rs index 0758ace42da9..df9664dc234a 100644 --- a/src/test/run-pass/issue-5192.rs +++ b/src/test/ui/run-pass/issues/issue-5192.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-52140/auxiliary/some_crate.rs b/src/test/ui/run-pass/issues/issue-52140/auxiliary/some_crate.rs similarity index 100% rename from src/test/run-pass/issue-52140/auxiliary/some_crate.rs rename to src/test/ui/run-pass/issues/issue-52140/auxiliary/some_crate.rs diff --git a/src/test/run-pass/issue-52140/main.rs b/src/test/ui/run-pass/issues/issue-52140/main.rs similarity index 98% rename from src/test/run-pass/issue-52140/main.rs rename to src/test/ui/run-pass/issues/issue-52140/main.rs index 6fae6adc4424..c17a4796555c 100644 --- a/src/test/run-pass/issue-52140/main.rs +++ b/src/test/ui/run-pass/issues/issue-52140/main.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:some_crate.rs // edition:2018 diff --git a/src/test/run-pass/issue-52141/auxiliary/some_crate.rs b/src/test/ui/run-pass/issues/issue-52141/auxiliary/some_crate.rs similarity index 100% rename from src/test/run-pass/issue-52141/auxiliary/some_crate.rs rename to src/test/ui/run-pass/issues/issue-52141/auxiliary/some_crate.rs diff --git a/src/test/run-pass/issue-52141/main.rs b/src/test/ui/run-pass/issues/issue-52141/main.rs similarity index 98% rename from src/test/run-pass/issue-52141/main.rs rename to src/test/ui/run-pass/issues/issue-52141/main.rs index 8f3fc9f96989..d1003bb2908a 100644 --- a/src/test/run-pass/issue-52141/main.rs +++ b/src/test/ui/run-pass/issues/issue-52141/main.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:some_crate.rs // edition:2018 diff --git a/src/test/run-pass/issue-52169.rs b/src/test/ui/run-pass/issues/issue-52169.rs similarity index 98% rename from src/test/run-pass/issue-52169.rs rename to src/test/ui/run-pass/issues/issue-52169.rs index f2163416922c..19c0f51d235b 100644 --- a/src/test/run-pass/issue-52169.rs +++ b/src/test/ui/run-pass/issues/issue-52169.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(macro_literal_matcher)] macro_rules! a { diff --git a/src/test/run-pass/issue-5239-2.rs b/src/test/ui/run-pass/issues/issue-5239-2.rs similarity index 98% rename from src/test/run-pass/issue-5239-2.rs rename to src/test/ui/run-pass/issues/issue-5239-2.rs index 406746ab8c54..2b328c5177c9 100644 --- a/src/test/run-pass/issue-5239-2.rs +++ b/src/test/ui/run-pass/issues/issue-5239-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #5239 diff --git a/src/test/run-pass/issue-5243.rs b/src/test/ui/run-pass/issues/issue-5243.rs similarity index 98% rename from src/test/run-pass/issue-5243.rs rename to src/test/ui/run-pass/issues/issue-5243.rs index 9bd13c4d3a0f..708187643d85 100644 --- a/src/test/run-pass/issue-5243.rs +++ b/src/test/ui/run-pass/issues/issue-5243.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that merely having lifetime parameters is not // enough for codegen to consider this as non-monomorphic, // which led to various assertions and failures in turn. diff --git a/src/test/run-pass/issue-52557.rs b/src/test/ui/run-pass/issues/issue-52557.rs similarity index 98% rename from src/test/run-pass/issue-52557.rs rename to src/test/ui/run-pass/issues/issue-52557.rs index 2b8dfe162cc3..3c987d32b90e 100644 --- a/src/test/run-pass/issue-52557.rs +++ b/src/test/ui/run-pass/issues/issue-52557.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test checks for namespace pollution by private tests. // Tests used to marked as public causing name conflicts with normal // functions only in test builds. diff --git a/src/test/run-pass/issue-52705/auxiliary/png2.rs b/src/test/ui/run-pass/issues/issue-52705/auxiliary/png2.rs similarity index 100% rename from src/test/run-pass/issue-52705/auxiliary/png2.rs rename to src/test/ui/run-pass/issues/issue-52705/auxiliary/png2.rs diff --git a/src/test/run-pass/issue-52705/main.rs b/src/test/ui/run-pass/issues/issue-52705/main.rs similarity index 98% rename from src/test/run-pass/issue-52705/main.rs rename to src/test/ui/run-pass/issues/issue-52705/main.rs index fb7b2f812c3c..3d828ba60d3c 100644 --- a/src/test/run-pass/issue-52705/main.rs +++ b/src/test/ui/run-pass/issues/issue-52705/main.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:png2.rs // edition:2018 diff --git a/src/test/run-pass/issue-5280.rs b/src/test/ui/run-pass/issues/issue-5280.rs similarity index 98% rename from src/test/run-pass/issue-5280.rs rename to src/test/ui/run-pass/issues/issue-5280.rs index 5e2e4df95b32..f80b80c72aff 100644 --- a/src/test/run-pass/issue-5280.rs +++ b/src/test/ui/run-pass/issues/issue-5280.rs @@ -7,7 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass type FontTableTag = u32; diff --git a/src/test/run-pass/issue-5315.rs b/src/test/ui/run-pass/issues/issue-5315.rs similarity index 97% rename from src/test/run-pass/issue-5315.rs rename to src/test/ui/run-pass/issues/issue-5315.rs index b8532c55c4cb..11a6b61dc58a 100644 --- a/src/test/run-pass/issue-5315.rs +++ b/src/test/ui/run-pass/issues/issue-5315.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct A(bool); diff --git a/src/test/run-pass/issue-5321-immediates-with-bare-self.rs b/src/test/ui/run-pass/issues/issue-5321-immediates-with-bare-self.rs similarity index 97% rename from src/test/run-pass/issue-5321-immediates-with-bare-self.rs rename to src/test/ui/run-pass/issues/issue-5321-immediates-with-bare-self.rs index dd00fab50203..54d45716de18 100644 --- a/src/test/run-pass/issue-5321-immediates-with-bare-self.rs +++ b/src/test/ui/run-pass/issues/issue-5321-immediates-with-bare-self.rs @@ -7,7 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass trait Fooable { fn yes(self); diff --git a/src/test/run-pass/issue-53333.rs b/src/test/ui/run-pass/issues/issue-53333.rs similarity index 97% rename from src/test/run-pass/issue-53333.rs rename to src/test/ui/run-pass/issues/issue-53333.rs index 51b90af7164f..8cb0d17cc166 100644 --- a/src/test/run-pass/issue-53333.rs +++ b/src/test/ui/run-pass/issues/issue-53333.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // edition:2018 fn main() { diff --git a/src/test/run-pass/issue-5353.rs b/src/test/ui/run-pass/issues/issue-5353.rs similarity index 98% rename from src/test/run-pass/issue-5353.rs rename to src/test/ui/run-pass/issues/issue-5353.rs index 34ef63572ae1..678a42e75494 100644 --- a/src/test/run-pass/issue-5353.rs +++ b/src/test/ui/run-pass/issues/issue-5353.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 const INVALID_ENUM : u32 = 0; diff --git a/src/test/run-pass/issue-5518.rs b/src/test/ui/run-pass/issues/issue-5518.rs similarity index 97% rename from src/test/run-pass/issue-5518.rs rename to src/test/ui/run-pass/issues/issue-5518.rs index 5981a0148a0a..4adcc7822e6b 100644 --- a/src/test/run-pass/issue-5518.rs +++ b/src/test/ui/run-pass/issues/issue-5518.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-5518.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-5521.rs b/src/test/ui/run-pass/issues/issue-5521.rs similarity index 98% rename from src/test/run-pass/issue-5521.rs rename to src/test/ui/run-pass/issues/issue-5521.rs index 136f7aa956c0..4890156f7b8e 100644 --- a/src/test/run-pass/issue-5521.rs +++ b/src/test/ui/run-pass/issues/issue-5521.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-5521.rs diff --git a/src/test/run-pass/issue-5530.rs b/src/test/ui/run-pass/issues/issue-5530.rs similarity index 99% rename from src/test/run-pass/issue-5530.rs rename to src/test/ui/run-pass/issues/issue-5530.rs index bd7d7af71df8..cf0a225290f7 100644 --- a/src/test/run-pass/issue-5530.rs +++ b/src/test/ui/run-pass/issues/issue-5530.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Enum { Foo { foo: usize }, diff --git a/src/test/run-pass/issue-5550.rs b/src/test/ui/run-pass/issues/issue-5550.rs similarity index 95% rename from src/test/run-pass/issue-5550.rs rename to src/test/ui/run-pass/issues/issue-5550.rs index 91741f938a5a..3b0f19b1f8ba 100644 --- a/src/test/run-pass/issue-5550.rs +++ b/src/test/ui/run-pass/issues/issue-5550.rs @@ -8,10 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 -#![allow(dead_assignment)] - pub fn main() { let s: String = "foobar".to_string(); let mut t: &str = &s; diff --git a/src/test/run-pass/issue-5554.rs b/src/test/ui/run-pass/issues/issue-5554.rs similarity index 98% rename from src/test/run-pass/issue-5554.rs rename to src/test/ui/run-pass/issues/issue-5554.rs index e8190a7245a1..8ff48c8600ec 100644 --- a/src/test/run-pass/issue-5554.rs +++ b/src/test/ui/run-pass/issues/issue-5554.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::default::Default; diff --git a/src/test/run-pass/issue-5572.rs b/src/test/ui/run-pass/issues/issue-5572.rs similarity index 97% rename from src/test/run-pass/issue-5572.rs rename to src/test/ui/run-pass/issues/issue-5572.rs index 6ae9dc68a5c6..418119e2fd6c 100644 --- a/src/test/run-pass/issue-5572.rs +++ b/src/test/ui/run-pass/issues/issue-5572.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn foo(_t: T) { } diff --git a/src/test/run-pass/issue-5666.rs b/src/test/ui/run-pass/issues/issue-5666.rs similarity index 98% rename from src/test/run-pass/issue-5666.rs rename to src/test/ui/run-pass/issues/issue-5666.rs index eba83227f449..c578397487e3 100644 --- a/src/test/run-pass/issue-5666.rs +++ b/src/test/ui/run-pass/issues/issue-5666.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct Dog { diff --git a/src/test/run-pass/issue-5688.rs b/src/test/ui/run-pass/issues/issue-5688.rs similarity index 98% rename from src/test/run-pass/issue-5688.rs rename to src/test/ui/run-pass/issues/issue-5688.rs index 88ff103723c7..fdad413776ec 100644 --- a/src/test/run-pass/issue-5688.rs +++ b/src/test/ui/run-pass/issues/issue-5688.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass /* # Corrupted initialization in the static struct diff --git a/src/test/run-pass/issue-5708.rs b/src/test/ui/run-pass/issues/issue-5708.rs similarity index 99% rename from src/test/run-pass/issue-5708.rs rename to src/test/ui/run-pass/issues/issue-5708.rs index 6ab339510991..2fef9bc19732 100644 --- a/src/test/run-pass/issue-5708.rs +++ b/src/test/ui/run-pass/issues/issue-5708.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass /* # ICE when returning struct with reference to trait diff --git a/src/test/run-pass/issue-5718.rs b/src/test/ui/run-pass/issues/issue-5718.rs similarity index 98% rename from src/test/run-pass/issue-5718.rs rename to src/test/ui/run-pass/issues/issue-5718.rs index 0bc9a07cb002..444d3103ada5 100644 --- a/src/test/run-pass/issue-5718.rs +++ b/src/test/ui/run-pass/issues/issue-5718.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-5741.rs b/src/test/ui/run-pass/issues/issue-5741.rs similarity index 94% rename from src/test/run-pass/issue-5741.rs rename to src/test/ui/run-pass/issues/issue-5741.rs index 5190bd95adad..f3beeff60fb0 100644 --- a/src/test/run-pass/issue-5741.rs +++ b/src/test/ui/run-pass/issues/issue-5741.rs @@ -8,8 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 - +#![allow(while_true)] #![allow(unreachable_code)] pub fn main() { diff --git a/src/test/run-pass/issue-5754.rs b/src/test/ui/run-pass/issues/issue-5754.rs similarity index 94% rename from src/test/run-pass/issue-5754.rs rename to src/test/ui/run-pass/issues/issue-5754.rs index e6bc516acc39..ba79c32a83de 100644 --- a/src/test/run-pass/issue-5754.rs +++ b/src/test/ui/run-pass/issues/issue-5754.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // pretty-expanded FIXME #23616 struct TwoDoubles { diff --git a/src/test/run-pass/issue-5791.rs b/src/test/ui/run-pass/issues/issue-5791.rs similarity index 98% rename from src/test/run-pass/issue-5791.rs rename to src/test/ui/run-pass/issues/issue-5791.rs index 2e93279f756f..e6c9106111f5 100644 --- a/src/test/run-pass/issue-5791.rs +++ b/src/test/ui/run-pass/issues/issue-5791.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 extern { diff --git a/src/test/run-pass/issue-5884.rs b/src/test/ui/run-pass/issues/issue-5884.rs similarity index 98% rename from src/test/run-pass/issue-5884.rs rename to src/test/ui/run-pass/issues/issue-5884.rs index c3247876c7ab..26816f235e95 100644 --- a/src/test/run-pass/issue-5884.rs +++ b/src/test/ui/run-pass/issues/issue-5884.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-5900.rs b/src/test/ui/run-pass/issues/issue-5900.rs similarity index 98% rename from src/test/run-pass/issue-5900.rs rename to src/test/ui/run-pass/issues/issue-5900.rs index d3a43b51dcff..d75291bf1f3d 100644 --- a/src/test/run-pass/issue-5900.rs +++ b/src/test/ui/run-pass/issues/issue-5900.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub mod foo { diff --git a/src/test/run-pass/issue-5917.rs b/src/test/ui/run-pass/issues/issue-5917.rs similarity index 92% rename from src/test/run-pass/issue-5917.rs rename to src/test/ui/run-pass/issues/issue-5917.rs index 112ad0185d8c..75466c01fedd 100644 --- a/src/test/run-pass/issue-5917.rs +++ b/src/test/ui/run-pass/issues/issue-5917.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] struct T (&'static [isize]); static t : T = T (&[5, 4, 3]); diff --git a/src/test/run-pass/issue-5950.rs b/src/test/ui/run-pass/issues/issue-5950.rs similarity index 97% rename from src/test/run-pass/issue-5950.rs rename to src/test/ui/run-pass/issues/issue-5950.rs index b0e01db14d85..239f96804139 100644 --- a/src/test/run-pass/issue-5950.rs +++ b/src/test/ui/run-pass/issues/issue-5950.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-5988.rs b/src/test/ui/run-pass/issues/issue-5988.rs similarity index 98% rename from src/test/run-pass/issue-5988.rs rename to src/test/ui/run-pass/issues/issue-5988.rs index 2cf0089c6bb6..d068195ade74 100644 --- a/src/test/run-pass/issue-5988.rs +++ b/src/test/ui/run-pass/issues/issue-5988.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait B { diff --git a/src/test/run-pass/issue-5997.rs b/src/test/ui/run-pass/issues/issue-5997.rs similarity index 98% rename from src/test/run-pass/issue-5997.rs rename to src/test/ui/run-pass/issues/issue-5997.rs index 0c41acf04aae..d888f691477b 100644 --- a/src/test/run-pass/issue-5997.rs +++ b/src/test/ui/run-pass/issues/issue-5997.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn f() -> bool { enum E { V(T) } diff --git a/src/test/run-pass/issue-6117.rs b/src/test/ui/run-pass/issues/issue-6117.rs similarity index 98% rename from src/test/run-pass/issue-6117.rs rename to src/test/ui/run-pass/issues/issue-6117.rs index 555272974021..fa9ef84746d6 100644 --- a/src/test/run-pass/issue-6117.rs +++ b/src/test/ui/run-pass/issues/issue-6117.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 enum Either { Left(T), Right(U) } diff --git a/src/test/run-pass/issue-6128.rs b/src/test/ui/run-pass/issues/issue-6128.rs similarity index 98% rename from src/test/run-pass/issue-6128.rs rename to src/test/ui/run-pass/issues/issue-6128.rs index b52900746e3c..d060da347230 100644 --- a/src/test/run-pass/issue-6128.rs +++ b/src/test/ui/run-pass/issues/issue-6128.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-6130.rs b/src/test/ui/run-pass/issues/issue-6130.rs similarity index 96% rename from src/test/run-pass/issue-6130.rs rename to src/test/ui/run-pass/issues/issue-6130.rs index f124b851f092..12c2abf9c980 100644 --- a/src/test/run-pass/issue-6130.rs +++ b/src/test/ui/run-pass/issues/issue-6130.rs @@ -8,8 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - -#![deny(type_limits)] +// run-pass pub fn main() { let i: usize = 0; diff --git a/src/test/run-pass/issue-6153.rs b/src/test/ui/run-pass/issues/issue-6153.rs similarity index 98% rename from src/test/run-pass/issue-6153.rs rename to src/test/ui/run-pass/issues/issue-6153.rs index 1b16418ac425..e6141b0121c3 100644 --- a/src/test/run-pass/issue-6153.rs +++ b/src/test/ui/run-pass/issues/issue-6153.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn swap(f: F) -> Vec where F: FnOnce(Vec) -> Vec { diff --git a/src/test/run-pass/issue-6157.rs b/src/test/ui/run-pass/issues/issue-6157.rs similarity index 98% rename from src/test/run-pass/issue-6157.rs rename to src/test/ui/run-pass/issues/issue-6157.rs index 2c5bc48abe84..ff4c6adc55df 100644 --- a/src/test/run-pass/issue-6157.rs +++ b/src/test/ui/run-pass/issues/issue-6157.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub trait OpInt { fn call(&mut self, _: isize, _: isize) -> isize; } diff --git a/src/test/run-pass/issue-6318.rs b/src/test/ui/run-pass/issues/issue-6318.rs similarity index 98% rename from src/test/run-pass/issue-6318.rs rename to src/test/ui/run-pass/issues/issue-6318.rs index 69c7ec4cf1f8..59ca54a4318b 100644 --- a/src/test/run-pass/issue-6318.rs +++ b/src/test/ui/run-pass/issues/issue-6318.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-6334.rs b/src/test/ui/run-pass/issues/issue-6334.rs similarity index 98% rename from src/test/run-pass/issue-6334.rs rename to src/test/ui/run-pass/issues/issue-6334.rs index fca1c296dddc..e7c6e74938fa 100644 --- a/src/test/run-pass/issue-6334.rs +++ b/src/test/ui/run-pass/issues/issue-6334.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that everything still compiles and runs fine even when // we reorder the bounds. diff --git a/src/test/run-pass/issue-6341.rs b/src/test/ui/run-pass/issues/issue-6341.rs similarity index 98% rename from src/test/run-pass/issue-6341.rs rename to src/test/ui/run-pass/issues/issue-6341.rs index 41abaa2c8b85..ca79e304b15f 100644 --- a/src/test/run-pass/issue-6341.rs +++ b/src/test/ui/run-pass/issues/issue-6341.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #[derive(PartialEq)] diff --git a/src/test/run-pass/issue-6344-let.rs b/src/test/ui/run-pass/issues/issue-6344-let.rs similarity index 92% rename from src/test/run-pass/issue-6344-let.rs rename to src/test/ui/run-pass/issues/issue-6344-let.rs index 8449d9f572bf..83d908d597c2 100644 --- a/src/test/run-pass/issue-6344-let.rs +++ b/src/test/ui/run-pass/issues/issue-6344-let.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_shorthand_field_patterns)] + struct A { x: usize } impl Drop for A { diff --git a/src/test/run-pass/issue-6344-match.rs b/src/test/ui/run-pass/issues/issue-6344-match.rs similarity index 92% rename from src/test/run-pass/issue-6344-match.rs rename to src/test/ui/run-pass/issues/issue-6344-match.rs index 4bb23295c858..c427ca6526c9 100644 --- a/src/test/run-pass/issue-6344-match.rs +++ b/src/test/ui/run-pass/issues/issue-6344-match.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_shorthand_field_patterns)] + struct A { x: usize } impl Drop for A { diff --git a/src/test/run-pass/issue-6449.rs b/src/test/ui/run-pass/issues/issue-6449.rs similarity index 99% rename from src/test/run-pass/issue-6449.rs rename to src/test/ui/run-pass/issues/issue-6449.rs index 09a4e288404f..1987bca93308 100644 --- a/src/test/run-pass/issue-6449.rs +++ b/src/test/ui/run-pass/issues/issue-6449.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Foo { Bar(isize), diff --git a/src/test/run-pass/issue-6470.rs b/src/test/ui/run-pass/issues/issue-6470.rs similarity index 90% rename from src/test/run-pass/issue-6470.rs rename to src/test/ui/run-pass/issues/issue-6470.rs index 9b5f78a14504..152b4bbedc3f 100644 --- a/src/test/run-pass/issue-6470.rs +++ b/src/test/ui/run-pass/issues/issue-6470.rs @@ -8,7 +8,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // pretty-expanded FIXME #23616 +#![allow(non_snake_case)] pub mod Bar { pub struct Foo { diff --git a/src/test/run-pass/issue-6557.rs b/src/test/ui/run-pass/issues/issue-6557.rs similarity index 98% rename from src/test/run-pass/issue-6557.rs rename to src/test/ui/run-pass/issues/issue-6557.rs index 109383b343bf..5179ddb472ba 100644 --- a/src/test/run-pass/issue-6557.rs +++ b/src/test/ui/run-pass/issues/issue-6557.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_patterns)] diff --git a/src/test/run-pass/issue-6892.rs b/src/test/ui/run-pass/issues/issue-6892.rs similarity index 99% rename from src/test/run-pass/issue-6892.rs rename to src/test/ui/run-pass/issues/issue-6892.rs index 75420ad6ff1c..173ad5833e58 100644 --- a/src/test/run-pass/issue-6892.rs +++ b/src/test/ui/run-pass/issues/issue-6892.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Ensures that destructors are run for expressions of the form "let _ = e;" // where `e` is a type which requires a destructor. diff --git a/src/test/run-pass/issue-6898.rs b/src/test/ui/run-pass/issues/issue-6898.rs similarity index 98% rename from src/test/run-pass/issue-6898.rs rename to src/test/ui/run-pass/issues/issue-6898.rs index e0d2f13ad689..b9a3a24585b5 100644 --- a/src/test/run-pass/issue-6898.rs +++ b/src/test/ui/run-pass/issues/issue-6898.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::mem; diff --git a/src/test/run-pass/issue-6919.rs b/src/test/ui/run-pass/issues/issue-6919.rs similarity index 98% rename from src/test/run-pass/issue-6919.rs rename to src/test/ui/run-pass/issues/issue-6919.rs index 3495c0eb1aed..94c1a1ae00ac 100644 --- a/src/test/run-pass/issue-6919.rs +++ b/src/test/ui/run-pass/issues/issue-6919.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:iss.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-6991.rs b/src/test/ui/run-pass/issues/issue-6991.rs similarity index 91% rename from src/test/run-pass/issue-6991.rs rename to src/test/ui/run-pass/issues/issue-6991.rs index 32a9a055d49b..13b738ac0e6d 100644 --- a/src/test/run-pass/issue-6991.rs +++ b/src/test/ui/run-pass/issues/issue-6991.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + static x: &'static usize = &1; static y: usize = *x; diff --git a/src/test/run-pass/issue-7012.rs b/src/test/ui/run-pass/issues/issue-7012.rs similarity index 92% rename from src/test/run-pass/issue-7012.rs rename to src/test/ui/run-pass/issues/issue-7012.rs index 3a9864f3a766..217c0dee560e 100644 --- a/src/test/run-pass/issue-7012.rs +++ b/src/test/ui/run-pass/issues/issue-7012.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_upper_case_globals)] + /* # Comparison of static arrays diff --git a/src/test/run-pass/issue-7178.rs b/src/test/ui/run-pass/issues/issue-7178.rs similarity index 98% rename from src/test/run-pass/issue-7178.rs rename to src/test/ui/run-pass/issues/issue-7178.rs index 0882203cb1ea..3a74ed833e91 100644 --- a/src/test/run-pass/issue-7178.rs +++ b/src/test/ui/run-pass/issues/issue-7178.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-7178.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-7222.rs b/src/test/ui/run-pass/issues/issue-7222.rs similarity index 88% rename from src/test/run-pass/issue-7222.rs rename to src/test/ui/run-pass/issues/issue-7222.rs index 3eb39ad6aad5..52c3e17fae65 100644 --- a/src/test/run-pass/issue-7222.rs +++ b/src/test/ui/run-pass/issues/issue-7222.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(illegal_floating_point_literal_pattern)] // FIXME #41620 pub fn main() { const FOO: f64 = 10.0; diff --git a/src/test/run-pass/issue-7268.rs b/src/test/ui/run-pass/issues/issue-7268.rs similarity index 97% rename from src/test/run-pass/issue-7268.rs rename to src/test/ui/run-pass/issues/issue-7268.rs index 626adfe292bf..3a93a144ee8b 100644 --- a/src/test/run-pass/issue-7268.rs +++ b/src/test/ui/run-pass/issues/issue-7268.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn foo(_: T) {} diff --git a/src/test/run-pass/issue-7344.rs b/src/test/ui/run-pass/issues/issue-7344.rs similarity index 98% rename from src/test/run-pass/issue-7344.rs rename to src/test/ui/run-pass/issues/issue-7344.rs index fb348fb45380..cc160c79ae9c 100644 --- a/src/test/run-pass/issue-7344.rs +++ b/src/test/ui/run-pass/issues/issue-7344.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(unreachable_code)] diff --git a/src/test/run-pass/issue-7519-match-unit-in-arg.rs b/src/test/ui/run-pass/issues/issue-7519-match-unit-in-arg.rs similarity index 98% rename from src/test/run-pass/issue-7519-match-unit-in-arg.rs rename to src/test/ui/run-pass/issues/issue-7519-match-unit-in-arg.rs index c5c59407ab23..3e60d24627ca 100644 --- a/src/test/run-pass/issue-7519-match-unit-in-arg.rs +++ b/src/test/ui/run-pass/issues/issue-7519-match-unit-in-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 /* diff --git a/src/test/run-pass/issue-7563.rs b/src/test/ui/run-pass/issues/issue-7563.rs similarity index 98% rename from src/test/run-pass/issue-7563.rs rename to src/test/ui/run-pass/issues/issue-7563.rs index 6d2a602fc8df..203c9cdfa496 100644 --- a/src/test/run-pass/issue-7563.rs +++ b/src/test/ui/run-pass/issues/issue-7563.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait IDummy { fn do_nothing(&self); } diff --git a/src/test/run-pass/issue-7575.rs b/src/test/ui/run-pass/issues/issue-7575.rs similarity index 98% rename from src/test/run-pass/issue-7575.rs rename to src/test/ui/run-pass/issues/issue-7575.rs index 508ebf3f69d1..e027119855e7 100644 --- a/src/test/run-pass/issue-7575.rs +++ b/src/test/ui/run-pass/issues/issue-7575.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { fn new() -> bool { false } diff --git a/src/test/run-pass/issue-7607-2.rs b/src/test/ui/run-pass/issues/issue-7607-2.rs similarity index 98% rename from src/test/run-pass/issue-7607-2.rs rename to src/test/ui/run-pass/issues/issue-7607-2.rs index 799513e6e4f2..7a1f0159df94 100644 --- a/src/test/run-pass/issue-7607-2.rs +++ b/src/test/ui/run-pass/issues/issue-7607-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub mod a { diff --git a/src/test/run-pass/issue-7660.rs b/src/test/ui/run-pass/issues/issue-7660.rs similarity index 98% rename from src/test/run-pass/issue-7660.rs rename to src/test/ui/run-pass/issues/issue-7660.rs index 3f3e11a2ddb0..774d9706d909 100644 --- a/src/test/run-pass/issue-7660.rs +++ b/src/test/ui/run-pass/issues/issue-7660.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue 7660 // rvalue lifetime too short when equivalent `match` works diff --git a/src/test/run-pass/issue-7663.rs b/src/test/ui/run-pass/issues/issue-7663.rs similarity index 98% rename from src/test/run-pass/issue-7663.rs rename to src/test/ui/run-pass/issues/issue-7663.rs index 87e0799f6346..2c2ce9483da5 100644 --- a/src/test/run-pass/issue-7663.rs +++ b/src/test/ui/run-pass/issues/issue-7663.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused_imports, dead_code)] diff --git a/src/test/run-pass/issue-7673-cast-generically-implemented-trait.rs b/src/test/ui/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs similarity index 98% rename from src/test/run-pass/issue-7673-cast-generically-implemented-trait.rs rename to src/test/ui/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs index f5acebf3a66f..f9dae8472a89 100644 --- a/src/test/run-pass/issue-7673-cast-generically-implemented-trait.rs +++ b/src/test/ui/run-pass/issues/issue-7673-cast-generically-implemented-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 /* diff --git a/src/test/run-pass/issue-7784.rs b/src/test/ui/run-pass/issues/issue-7784.rs similarity index 98% rename from src/test/run-pass/issue-7784.rs rename to src/test/ui/run-pass/issues/issue-7784.rs index 8d21594aa12c..864371cab4df 100644 --- a/src/test/run-pass/issue-7784.rs +++ b/src/test/ui/run-pass/issues/issue-7784.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(slice_patterns)] use std::ops::Add; diff --git a/src/test/run-pass/issue-7899.rs b/src/test/ui/run-pass/issues/issue-7899.rs similarity index 98% rename from src/test/run-pass/issue-7899.rs rename to src/test/ui/run-pass/issues/issue-7899.rs index a17565fa0ac5..74a5b0608224 100644 --- a/src/test/run-pass/issue-7899.rs +++ b/src/test/ui/run-pass/issues/issue-7899.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-7899.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-7911.rs b/src/test/ui/run-pass/issues/issue-7911.rs similarity index 99% rename from src/test/run-pass/issue-7911.rs rename to src/test/ui/run-pass/issues/issue-7911.rs index 764d6fa79180..f2299eecb405 100644 --- a/src/test/run-pass/issue-7911.rs +++ b/src/test/ui/run-pass/issues/issue-7911.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // (Closes #7911) Test that we can use the same self expression // with different mutability in macro in two methods diff --git a/src/test/run-pass/issue-8044.rs b/src/test/ui/run-pass/issues/issue-8044.rs similarity index 98% rename from src/test/run-pass/issue-8044.rs rename to src/test/ui/run-pass/issues/issue-8044.rs index 4f72409c36e1..3a3d08dc35ae 100644 --- a/src/test/run-pass/issue-8044.rs +++ b/src/test/ui/run-pass/issues/issue-8044.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-8044.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-8171-default-method-self-inherit-builtin-trait.rs b/src/test/ui/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs similarity index 98% rename from src/test/run-pass/issue-8171-default-method-self-inherit-builtin-trait.rs rename to src/test/ui/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs index 92d1c7c5a1c3..311fd129ab07 100644 --- a/src/test/run-pass/issue-8171-default-method-self-inherit-builtin-trait.rs +++ b/src/test/ui/run-pass/issues/issue-8171-default-method-self-inherit-builtin-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 /* diff --git a/src/test/run-pass/issue-8248.rs b/src/test/ui/run-pass/issues/issue-8248.rs similarity index 98% rename from src/test/run-pass/issue-8248.rs rename to src/test/ui/run-pass/issues/issue-8248.rs index b58be361f15d..21060576f2ec 100644 --- a/src/test/run-pass/issue-8248.rs +++ b/src/test/ui/run-pass/issues/issue-8248.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait A { diff --git a/src/test/run-pass/issue-8249.rs b/src/test/ui/run-pass/issues/issue-8249.rs similarity index 98% rename from src/test/run-pass/issue-8249.rs rename to src/test/ui/run-pass/issues/issue-8249.rs index 3e65bc000ff8..9afa6f937b5e 100644 --- a/src/test/run-pass/issue-8249.rs +++ b/src/test/ui/run-pass/issues/issue-8249.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait A { diff --git a/src/test/run-pass/issue-8259.rs b/src/test/ui/run-pass/issues/issue-8259.rs similarity index 93% rename from src/test/run-pass/issue-8259.rs rename to src/test/ui/run-pass/issues/issue-8259.rs index e7f09789c5ba..a0e2caee40a6 100644 --- a/src/test/run-pass/issue-8259.rs +++ b/src/test/ui/run-pass/issues/issue-8259.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // aux-build:issue-8259.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-8351-1.rs b/src/test/ui/run-pass/issues/issue-8351-1.rs similarity index 98% rename from src/test/run-pass/issue-8351-1.rs rename to src/test/ui/run-pass/issues/issue-8351-1.rs index ed78b37604e8..3caecf9fb939 100644 --- a/src/test/run-pass/issue-8351-1.rs +++ b/src/test/ui/run-pass/issues/issue-8351-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { Foo{f: isize}, diff --git a/src/test/run-pass/issue-8351-2.rs b/src/test/ui/run-pass/issues/issue-8351-2.rs similarity index 98% rename from src/test/run-pass/issue-8351-2.rs rename to src/test/ui/run-pass/issues/issue-8351-2.rs index 1ed93915b8a0..da70fc415c02 100644 --- a/src/test/run-pass/issue-8351-2.rs +++ b/src/test/ui/run-pass/issues/issue-8351-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum E { Foo{f: isize, b: bool}, diff --git a/src/test/run-pass/issue-8391.rs b/src/test/ui/run-pass/issues/issue-8391.rs similarity index 98% rename from src/test/run-pass/issue-8391.rs rename to src/test/ui/run-pass/issues/issue-8391.rs index b832c410443c..d6c85370b8e0 100644 --- a/src/test/run-pass/issue-8391.rs +++ b/src/test/ui/run-pass/issues/issue-8391.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { let x = match Some(1) { diff --git a/src/test/run-pass/issue-8398.rs b/src/test/ui/run-pass/issues/issue-8398.rs similarity index 98% rename from src/test/run-pass/issue-8398.rs rename to src/test/ui/run-pass/issues/issue-8398.rs index 5c2c03f9857f..e4f5a457f418 100644 --- a/src/test/run-pass/issue-8398.rs +++ b/src/test/ui/run-pass/issues/issue-8398.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub trait Writer { diff --git a/src/test/run-pass/issue-8401.rs b/src/test/ui/run-pass/issues/issue-8401.rs similarity index 97% rename from src/test/run-pass/issue-8401.rs rename to src/test/ui/run-pass/issues/issue-8401.rs index afdd572b129a..966f89486b70 100644 --- a/src/test/run-pass/issue-8401.rs +++ b/src/test/ui/run-pass/issues/issue-8401.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_8401.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-8460.rs b/src/test/ui/run-pass/issues/issue-8460.rs similarity index 99% rename from src/test/run-pass/issue-8460.rs rename to src/test/ui/run-pass/issues/issue-8460.rs index 17ea5b9a7948..9f0f7e2fa421 100644 --- a/src/test/run-pass/issue-8460.rs +++ b/src/test/ui/run-pass/issues/issue-8460.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support #![feature(rustc_attrs)] diff --git a/src/test/run-pass/issue-8498.rs b/src/test/ui/run-pass/issues/issue-8498.rs similarity index 98% rename from src/test/run-pass/issue-8498.rs rename to src/test/ui/run-pass/issues/issue-8498.rs index d57b2a323689..334c331dba7c 100644 --- a/src/test/run-pass/issue-8498.rs +++ b/src/test/ui/run-pass/issues/issue-8498.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { match &[(Box::new(5),Box::new(7))] { diff --git a/src/test/run-pass/issue-8506.rs b/src/test/ui/run-pass/issues/issue-8506.rs similarity index 93% rename from src/test/run-pass/issue-8506.rs rename to src/test/ui/run-pass/issues/issue-8506.rs index 24632a0d13a1..1cf054a46dfd 100644 --- a/src/test/run-pass/issue-8506.rs +++ b/src/test/ui/run-pass/issues/issue-8506.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_upper_case_globals)] #![allow(dead_code)] diff --git a/src/test/run-pass/issue-8521.rs b/src/test/ui/run-pass/issues/issue-8521.rs similarity index 98% rename from src/test/run-pass/issue-8521.rs rename to src/test/ui/run-pass/issues/issue-8521.rs index ce362c4bcd1e..b70a79bed3ca 100644 --- a/src/test/run-pass/issue-8521.rs +++ b/src/test/ui/run-pass/issues/issue-8521.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo1 {} trait A {} diff --git a/src/test/run-pass/issue-8578.rs b/src/test/ui/run-pass/issues/issue-8578.rs similarity index 91% rename from src/test/run-pass/issue-8578.rs rename to src/test/ui/run-pass/issues/issue-8578.rs index ce392f8d881d..8753ee8370b0 100644 --- a/src/test/run-pass/issue-8578.rs +++ b/src/test/ui/run-pass/issues/issue-8578.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_upper_case_globals)] // pretty-expanded FIXME #23616 pub struct UninterpretedOption_NamePart { diff --git a/src/test/run-pass/issue-868.rs b/src/test/ui/run-pass/issues/issue-868.rs similarity index 98% rename from src/test/run-pass/issue-868.rs rename to src/test/ui/run-pass/issues/issue-868.rs index 64b463ddf5c6..a545abefb7a3 100644 --- a/src/test/run-pass/issue-868.rs +++ b/src/test/ui/run-pass/issues/issue-868.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn f(g: F) -> T where F: FnOnce() -> T { g() } diff --git a/src/test/run-pass/issue-8709.rs b/src/test/ui/run-pass/issues/issue-8709.rs similarity index 98% rename from src/test/run-pass/issue-8709.rs rename to src/test/ui/run-pass/issues/issue-8709.rs index 44759cef2864..3d0739caf1af 100644 --- a/src/test/run-pass/issue-8709.rs +++ b/src/test/ui/run-pass/issues/issue-8709.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! sty { ($t:ty) => (stringify!($t)) diff --git a/src/test/run-pass/issue-8783.rs b/src/test/ui/run-pass/issues/issue-8783.rs similarity index 98% rename from src/test/run-pass/issue-8783.rs rename to src/test/ui/run-pass/issues/issue-8783.rs index 485a76ff7ece..741411aeffb1 100644 --- a/src/test/run-pass/issue-8783.rs +++ b/src/test/ui/run-pass/issues/issue-8783.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::default::Default; diff --git a/src/test/run-pass/issue-8827.rs b/src/test/ui/run-pass/issues/issue-8827.rs similarity index 99% rename from src/test/run-pass/issue-8827.rs rename to src/test/ui/run-pass/issues/issue-8827.rs index 6b573698a360..d854793c22ac 100644 --- a/src/test/run-pass/issue-8827.rs +++ b/src/test/ui/run-pass/issues/issue-8827.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/issue-8851.rs b/src/test/ui/run-pass/issues/issue-8851.rs similarity index 98% rename from src/test/run-pass/issue-8851.rs rename to src/test/ui/run-pass/issues/issue-8851.rs index 2a0c02b23e8e..19fd51b476d4 100644 --- a/src/test/run-pass/issue-8851.rs +++ b/src/test/ui/run-pass/issues/issue-8851.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // after fixing #9384 and implementing hygiene for match bindings, // this now fails because the insertion of the 'y' into the match // doesn't cause capture. Making this macro hygienic (as I've done) diff --git a/src/test/run-pass/issue-8860.rs b/src/test/ui/run-pass/issues/issue-8860.rs similarity index 99% rename from src/test/run-pass/issue-8860.rs rename to src/test/ui/run-pass/issues/issue-8860.rs index 127f9e355c7a..c4d9cab9ff36 100644 --- a/src/test/run-pass/issue-8860.rs +++ b/src/test/ui/run-pass/issues/issue-8860.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -Z borrowck=compare static mut DROP: isize = 0; diff --git a/src/test/run-pass/issue-8898.rs b/src/test/ui/run-pass/issues/issue-8898.rs similarity index 98% rename from src/test/run-pass/issue-8898.rs rename to src/test/ui/run-pass/issues/issue-8898.rs index 065cef2c60d7..d405a0949e8d 100644 --- a/src/test/run-pass/issue-8898.rs +++ b/src/test/ui/run-pass/issues/issue-8898.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn assert_repr_eq(obj : T, expected : String) { assert_eq!(expected, format!("{:?}", obj)); diff --git a/src/test/run-pass/issue-9047.rs b/src/test/ui/run-pass/issues/issue-9047.rs similarity index 98% rename from src/test/run-pass/issue-9047.rs rename to src/test/ui/run-pass/issues/issue-9047.rs index aa3e601c3a20..30f886f6784c 100644 --- a/src/test/run-pass/issue-9047.rs +++ b/src/test/ui/run-pass/issues/issue-9047.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn decode() -> String { 'outer: loop { let mut ch_start: usize; diff --git a/src/test/run-pass/issue-9110.rs b/src/test/ui/run-pass/issues/issue-9110.rs similarity index 94% rename from src/test/run-pass/issue-9110.rs rename to src/test/ui/run-pass/issues/issue-9110.rs index 298ae5e6aaca..906c7a422e77 100644 --- a/src/test/run-pass/issue-9110.rs +++ b/src/test/ui/run-pass/issues/issue-9110.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 +#![allow(non_snake_case)] macro_rules! silly_macro { () => ( diff --git a/src/test/run-pass/issue-9123.rs b/src/test/ui/run-pass/issues/issue-9123.rs similarity index 97% rename from src/test/run-pass/issue-9123.rs rename to src/test/ui/run-pass/issues/issue-9123.rs index 4da0c22a0b1b..0f41acecaaac 100644 --- a/src/test/run-pass/issue-9123.rs +++ b/src/test/ui/run-pass/issues/issue-9123.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_9123.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-9129.rs b/src/test/ui/run-pass/issues/issue-9129.rs similarity index 93% rename from src/test/run-pass/issue-9129.rs rename to src/test/ui/run-pass/issues/issue-9129.rs index 485f10357b3f..21e192b23f5a 100644 --- a/src/test/run-pass/issue-9129.rs +++ b/src/test/ui/run-pass/issues/issue-9129.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_snake_case)] // ignore-pretty unreported #![feature(box_syntax)] diff --git a/src/test/run-pass/issue-9188.rs b/src/test/ui/run-pass/issues/issue-9188.rs similarity index 98% rename from src/test/run-pass/issue-9188.rs rename to src/test/ui/run-pass/issues/issue-9188.rs index e2272837efb7..44fe06eed493 100644 --- a/src/test/run-pass/issue-9188.rs +++ b/src/test/ui/run-pass/issues/issue-9188.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_9188.rs diff --git a/src/test/run-pass/issue-9243.rs b/src/test/ui/run-pass/issues/issue-9243.rs similarity index 93% rename from src/test/run-pass/issue-9243.rs rename to src/test/ui/run-pass/issues/issue-9243.rs index b857465aabc1..957330a1925b 100644 --- a/src/test/run-pass/issue-9243.rs +++ b/src/test/ui/run-pass/issues/issue-9243.rs @@ -8,7 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue 9243 +#![allow(non_upper_case_globals)] pub struct Test { mem: isize, diff --git a/src/test/run-pass/issue-9249.rs b/src/test/ui/run-pass/issues/issue-9249.rs similarity index 97% rename from src/test/run-pass/issue-9249.rs rename to src/test/ui/run-pass/issues/issue-9249.rs index e4d848dbd754..d11665c531e9 100644 --- a/src/test/run-pass/issue-9249.rs +++ b/src/test/ui/run-pass/issues/issue-9249.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 static DATA:&'static [&'static str] = &["my string"]; diff --git a/src/test/run-pass/issue-9259.rs b/src/test/ui/run-pass/issues/issue-9259.rs similarity index 98% rename from src/test/run-pass/issue-9259.rs rename to src/test/ui/run-pass/issues/issue-9259.rs index 996548de8173..481014fe3f35 100644 --- a/src/test/run-pass/issue-9259.rs +++ b/src/test/ui/run-pass/issues/issue-9259.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct A<'a> { a: &'a [String], diff --git a/src/test/run-pass/issue-9382.rs b/src/test/ui/run-pass/issues/issue-9382.rs similarity index 97% rename from src/test/run-pass/issue-9382.rs rename to src/test/ui/run-pass/issues/issue-9382.rs index 7538e55fd95d..6a4f868cdf12 100644 --- a/src/test/run-pass/issue-9382.rs +++ b/src/test/ui/run-pass/issues/issue-9382.rs @@ -10,7 +10,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![allow(unnecessary_allocation)] +// run-pass #![feature(box_syntax)] // Tests for a previous bug that occurred due to an interaction diff --git a/src/test/run-pass/issue-9394-inherited-trait-calls.rs b/src/test/ui/run-pass/issues/issue-9394-inherited-trait-calls.rs similarity index 99% rename from src/test/run-pass/issue-9394-inherited-trait-calls.rs rename to src/test/ui/run-pass/issues/issue-9394-inherited-trait-calls.rs index 7d2c435b3842..ca94a7b2fbd0 100644 --- a/src/test/run-pass/issue-9394-inherited-trait-calls.rs +++ b/src/test/ui/run-pass/issues/issue-9394-inherited-trait-calls.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Base: Base2 + Base3{ fn foo(&self) -> String; diff --git a/src/test/run-pass/issue-9396.rs b/src/test/ui/run-pass/issues/issue-9396.rs similarity index 96% rename from src/test/run-pass/issue-9396.rs rename to src/test/ui/run-pass/issues/issue-9396.rs index 5af2006f0814..62a38767ddd0 100644 --- a/src/test/run-pass/issue-9396.rs +++ b/src/test/ui/run-pass/issues/issue-9396.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] // ignore-emscripten no threads support use std::sync::mpsc::{TryRecvError, channel}; diff --git a/src/test/run-pass/issue-9446.rs b/src/test/ui/run-pass/issues/issue-9446.rs similarity index 98% rename from src/test/run-pass/issue-9446.rs rename to src/test/ui/run-pass/issues/issue-9446.rs index a6adb1d369e4..efd04a1c5ac5 100644 --- a/src/test/run-pass/issue-9446.rs +++ b/src/test/ui/run-pass/issues/issue-9446.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Wrapper(String); impl Wrapper { diff --git a/src/test/run-pass/issue-9719.rs b/src/test/ui/run-pass/issues/issue-9719.rs similarity index 99% rename from src/test/run-pass/issue-9719.rs rename to src/test/ui/run-pass/issues/issue-9719.rs index 108f1a0d73da..1e52f326c1f6 100644 --- a/src/test/run-pass/issue-9719.rs +++ b/src/test/ui/run-pass/issues/issue-9719.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 mod a { diff --git a/src/test/run-pass/issue-9737.rs b/src/test/ui/run-pass/issues/issue-9737.rs similarity index 97% rename from src/test/run-pass/issue-9737.rs rename to src/test/ui/run-pass/issues/issue-9737.rs index 5e1fd87b57a1..304eb7808a74 100644 --- a/src/test/run-pass/issue-9737.rs +++ b/src/test/ui/run-pass/issues/issue-9737.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! f { (v: $x:expr) => ( println!("{}", $x) ) } diff --git a/src/test/run-pass/issue-979.rs b/src/test/ui/run-pass/issues/issue-979.rs similarity index 94% rename from src/test/run-pass/issue-979.rs rename to src/test/ui/run-pass/issues/issue-979.rs index 43fa98124262..a00909ffb675 100644 --- a/src/test/run-pass/issue-979.rs +++ b/src/test/ui/run-pass/issues/issue-979.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + use std::cell::Cell; struct r<'a> { diff --git a/src/test/run-pass/issue-9837.rs b/src/test/ui/run-pass/issues/issue-9837.rs similarity index 98% rename from src/test/run-pass/issue-9837.rs rename to src/test/ui/run-pass/issues/issue-9837.rs index f887459836c6..0a4c53ae1c51 100644 --- a/src/test/run-pass/issue-9837.rs +++ b/src/test/ui/run-pass/issues/issue-9837.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const C1: i32 = 0x12345678; const C2: isize = C1 as i16 as isize; diff --git a/src/test/run-pass/issue-9906.rs b/src/test/ui/run-pass/issues/issue-9906.rs similarity index 98% rename from src/test/run-pass/issue-9906.rs rename to src/test/ui/run-pass/issues/issue-9906.rs index 84f848fc9cdb..546de0f64296 100644 --- a/src/test/run-pass/issue-9906.rs +++ b/src/test/ui/run-pass/issues/issue-9906.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-9906.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue-9918.rs b/src/test/ui/run-pass/issues/issue-9918.rs similarity index 97% rename from src/test/run-pass/issue-9918.rs rename to src/test/ui/run-pass/issues/issue-9918.rs index a766e6b707e3..bfad636876ce 100644 --- a/src/test/run-pass/issue-9918.rs +++ b/src/test/ui/run-pass/issues/issue-9918.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { assert_eq!((0 + 0u8) as char, '\0'); diff --git a/src/test/run-pass/issue-9942.rs b/src/test/ui/run-pass/issues/issue-9942.rs similarity index 97% rename from src/test/run-pass/issue-9942.rs rename to src/test/ui/run-pass/issues/issue-9942.rs index 222eb0c65181..7c50c96e9a88 100644 --- a/src/test/run-pass/issue-9942.rs +++ b/src/test/ui/run-pass/issues/issue-9942.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/issue-9951.rs b/src/test/ui/run-pass/issues/issue-9951.rs similarity index 98% rename from src/test/run-pass/issue-9951.rs rename to src/test/ui/run-pass/issues/issue-9951.rs index 63807395fb0c..35cdafc87d0c 100644 --- a/src/test/run-pass/issue-9951.rs +++ b/src/test/ui/run-pass/issues/issue-9951.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(unused_variables)] diff --git a/src/test/run-pass/issue-9968.rs b/src/test/ui/run-pass/issues/issue-9968.rs similarity index 98% rename from src/test/run-pass/issue-9968.rs rename to src/test/ui/run-pass/issues/issue-9968.rs index c8af811d13d8..8fe54ff0c635 100644 --- a/src/test/run-pass/issue-9968.rs +++ b/src/test/ui/run-pass/issues/issue-9968.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue-9968.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue2170exe.rs b/src/test/ui/run-pass/issues/issue2170exe.rs similarity index 98% rename from src/test/run-pass/issue2170exe.rs rename to src/test/ui/run-pass/issues/issue2170exe.rs index d126d1f6ce1d..84b8d421da6c 100644 --- a/src/test/run-pass/issue2170exe.rs +++ b/src/test/ui/run-pass/issues/issue2170exe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue2170lib.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs b/src/test/ui/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs similarity index 100% rename from src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs rename to src/test/ui/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_lib.rs diff --git a/src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs b/src/test/ui/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs similarity index 100% rename from src/test/run-pass/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs rename to src/test/ui/run-pass/issues/issue24687-embed-debuginfo/auxiliary/issue24687_mbcs_in_comments.rs diff --git a/src/test/run-pass/issue24687-embed-debuginfo/main.rs b/src/test/ui/run-pass/issues/issue24687-embed-debuginfo/main.rs similarity index 98% rename from src/test/run-pass/issue24687-embed-debuginfo/main.rs rename to src/test/ui/run-pass/issues/issue24687-embed-debuginfo/main.rs index abec252c74e5..af93c9bff0fe 100644 --- a/src/test/run-pass/issue24687-embed-debuginfo/main.rs +++ b/src/test/ui/run-pass/issues/issue24687-embed-debuginfo/main.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue24687_lib.rs // compile-flags:-g diff --git a/src/test/run-pass/issue28498-must-work-ex1.rs b/src/test/ui/run-pass/issues/issue28498-must-work-ex1.rs similarity index 98% rename from src/test/run-pass/issue28498-must-work-ex1.rs rename to src/test/ui/run-pass/issues/issue28498-must-work-ex1.rs index 83a978d57b95..54c53465acb2 100644 --- a/src/test/run-pass/issue28498-must-work-ex1.rs +++ b/src/test/ui/run-pass/issues/issue28498-must-work-ex1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Example taken from RFC 1238 text // https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md diff --git a/src/test/run-pass/issue28498-must-work-ex2.rs b/src/test/ui/run-pass/issues/issue28498-must-work-ex2.rs similarity index 98% rename from src/test/run-pass/issue28498-must-work-ex2.rs rename to src/test/ui/run-pass/issues/issue28498-must-work-ex2.rs index 93652a1b612c..b86677109259 100644 --- a/src/test/run-pass/issue28498-must-work-ex2.rs +++ b/src/test/ui/run-pass/issues/issue28498-must-work-ex2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Example taken from RFC 1238 text // https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md diff --git a/src/test/run-pass/issue28498-ugeh-ex1.rs b/src/test/ui/run-pass/issues/issue28498-ugeh-ex1.rs similarity index 93% rename from src/test/run-pass/issue28498-ugeh-ex1.rs rename to src/test/ui/run-pass/issues/issue28498-ugeh-ex1.rs index b07831f552c6..50baa2975dd9 100644 --- a/src/test/run-pass/issue28498-ugeh-ex1.rs +++ b/src/test/ui/run-pass/issues/issue28498-ugeh-ex1.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] // FIXME: switch to `#[may_dangle]` below. + // Example taken from RFC 1238 text // https://github.com/rust-lang/rfcs/blob/master/text/1238-nonparametric-dropck.md diff --git a/src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs b/src/test/ui/run-pass/issues/issue28498-ugeh-with-lifetime-param.rs similarity index 94% rename from src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs rename to src/test/ui/run-pass/issues/issue28498-ugeh-with-lifetime-param.rs index 19be2568e4ff..0fff6507833f 100644 --- a/src/test/run-pass/issue28498-ugeh-with-lifetime-param.rs +++ b/src/test/ui/run-pass/issues/issue28498-ugeh-with-lifetime-param.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] // FIXME: switch to `#[may_dangle]` below. + // Demonstrate the use of the unguarded escape hatch with a lifetime param // to assert that destructor will not access any dead data. // diff --git a/src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs b/src/test/ui/run-pass/issues/issue28498-ugeh-with-passed-to-fn.rs similarity index 96% rename from src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs rename to src/test/ui/run-pass/issues/issue28498-ugeh-with-passed-to-fn.rs index bb430ea3e33a..28645801db29 100644 --- a/src/test/run-pass/issue28498-ugeh-with-passed-to-fn.rs +++ b/src/test/ui/run-pass/issues/issue28498-ugeh-with-passed-to-fn.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] // FIXME: switch to `#[may_dangle]` below. + // Demonstrate the use of the unguarded escape hatch with a type param in negative position // to assert that destructor will not access any dead data. // diff --git a/src/test/run-pass/issue28498-ugeh-with-trait-bound.rs b/src/test/ui/run-pass/issues/issue28498-ugeh-with-trait-bound.rs similarity index 95% rename from src/test/run-pass/issue28498-ugeh-with-trait-bound.rs rename to src/test/ui/run-pass/issues/issue28498-ugeh-with-trait-bound.rs index 2e9633b3a214..7df3ceb7614d 100644 --- a/src/test/run-pass/issue28498-ugeh-with-trait-bound.rs +++ b/src/test/ui/run-pass/issues/issue28498-ugeh-with-trait-bound.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] // FIXME: switch to `#[may_dangle]` below. + // Demonstrate the use of the unguarded escape hatch with a trait bound // to assert that destructor will not access any dead data. // diff --git a/src/test/run-pass/issue29927-1.rs b/src/test/ui/run-pass/issues/issue29927-1.rs similarity index 98% rename from src/test/run-pass/issue29927-1.rs rename to src/test/ui/run-pass/issues/issue29927-1.rs index 488bc6e6927a..c613560aff12 100644 --- a/src/test/run-pass/issue29927-1.rs +++ b/src/test/ui/run-pass/issues/issue29927-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(min_const_fn)] const fn f() -> usize { 5 diff --git a/src/test/run-pass/issue_26873_multifile/A/B.rs b/src/test/ui/run-pass/issues/issue_26873_multifile/A/B.rs similarity index 97% rename from src/test/run-pass/issue_26873_multifile/A/B.rs rename to src/test/ui/run-pass/issues/issue_26873_multifile/A/B.rs index 8917a98b8cf3..cd4d9bc64ed3 100644 --- a/src/test/run-pass/issue_26873_multifile/A/B.rs +++ b/src/test/ui/run-pass/issues/issue_26873_multifile/A/B.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use super::*; pub struct S; diff --git a/src/test/run-pass/issue_26873_multifile/A/C.rs b/src/test/ui/run-pass/issues/issue_26873_multifile/A/C.rs similarity index 97% rename from src/test/run-pass/issue_26873_multifile/A/C.rs rename to src/test/ui/run-pass/issues/issue_26873_multifile/A/C.rs index 64aaf9c27986..fb2567584c8c 100644 --- a/src/test/run-pass/issue_26873_multifile/A/C.rs +++ b/src/test/ui/run-pass/issues/issue_26873_multifile/A/C.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use super::*; use super::B::S; diff --git a/src/test/run-pass/issue_26873_multifile/A/mod.rs b/src/test/ui/run-pass/issues/issue_26873_multifile/A/mod.rs similarity index 97% rename from src/test/run-pass/issue_26873_multifile/A/mod.rs rename to src/test/ui/run-pass/issues/issue_26873_multifile/A/mod.rs index a2aeb1cc43f9..c36c5b8c4c0f 100644 --- a/src/test/run-pass/issue_26873_multifile/A/mod.rs +++ b/src/test/ui/run-pass/issues/issue_26873_multifile/A/mod.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub mod B; pub mod C; diff --git a/src/test/run-pass/issue_26873_multifile/compiletest-ignore-dir b/src/test/ui/run-pass/issues/issue_26873_multifile/compiletest-ignore-dir similarity index 100% rename from src/test/run-pass/issue_26873_multifile/compiletest-ignore-dir rename to src/test/ui/run-pass/issues/issue_26873_multifile/compiletest-ignore-dir diff --git a/src/test/run-pass/issue_26873_multifile/mod.rs b/src/test/ui/run-pass/issues/issue_26873_multifile/mod.rs similarity index 97% rename from src/test/run-pass/issue_26873_multifile/mod.rs rename to src/test/ui/run-pass/issues/issue_26873_multifile/mod.rs index 3643b94e31a8..95ed215d04f6 100644 --- a/src/test/run-pass/issue_26873_multifile/mod.rs +++ b/src/test/ui/run-pass/issues/issue_26873_multifile/mod.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod A; use self::A::*; diff --git a/src/test/run-pass/issue_3136_b.rs b/src/test/ui/run-pass/issues/issue_3136_b.rs similarity index 97% rename from src/test/run-pass/issue_3136_b.rs rename to src/test/ui/run-pass/issues/issue_3136_b.rs index cffe3f9572b2..bf513c8391ea 100644 --- a/src/test/run-pass/issue_3136_b.rs +++ b/src/test/ui/run-pass/issues/issue_3136_b.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_3136_a.rc // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/issue_9155.rs b/src/test/ui/run-pass/issues/issue_9155.rs similarity index 98% rename from src/test/run-pass/issue_9155.rs rename to src/test/ui/run-pass/issues/issue_9155.rs index 9db556bf9a22..cb73b6a201d4 100644 --- a/src/test/run-pass/issue_9155.rs +++ b/src/test/ui/run-pass/issues/issue_9155.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:issue_9155.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/into-iterator-type-inference-shift.rs b/src/test/ui/run-pass/iterators/into-iterator-type-inference-shift.rs similarity index 98% rename from src/test/run-pass/into-iterator-type-inference-shift.rs rename to src/test/ui/run-pass/iterators/into-iterator-type-inference-shift.rs index 7ec18ef12769..0043c1bc829c 100644 --- a/src/test/run-pass/into-iterator-type-inference-shift.rs +++ b/src/test/ui/run-pass/iterators/into-iterator-type-inference-shift.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for type inference failure around shifting. In this // case, the iteration yields an isize, but we hadn't run the full type // propagation yet, and so we just saw a type variable, yielding an diff --git a/src/test/run-pass/iter-cloned-type-inference.rs b/src/test/ui/run-pass/iterators/iter-cloned-type-inference.rs similarity index 95% rename from src/test/run-pass/iter-cloned-type-inference.rs rename to src/test/ui/run-pass/iterators/iter-cloned-type-inference.rs index e3351bda3354..7e4bd4fb31b7 100644 --- a/src/test/run-pass/iter-cloned-type-inference.rs +++ b/src/test/ui/run-pass/iterators/iter-cloned-type-inference.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // Test to see that the element type of .cloned() can be inferred // properly. Previously this would fail to deduce the type of `sum`. diff --git a/src/test/run-pass/iter-range.rs b/src/test/ui/run-pass/iterators/iter-range.rs similarity index 98% rename from src/test/run-pass/iter-range.rs rename to src/test/ui/run-pass/iterators/iter-range.rs index a6130841b5c5..017ffb3f9be3 100644 --- a/src/test/run-pass/iter-range.rs +++ b/src/test/ui/run-pass/iterators/iter-range.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn range_(a: isize, b: isize, mut it: F) where F: FnMut(isize) { diff --git a/src/test/run-pass/iter-step-overflow-debug.rs b/src/test/ui/run-pass/iterators/iter-step-overflow-debug.rs similarity index 98% rename from src/test/run-pass/iter-step-overflow-debug.rs rename to src/test/ui/run-pass/iterators/iter-step-overflow-debug.rs index c45a10eac52b..35f4d7b0c006 100644 --- a/src/test/run-pass/iter-step-overflow-debug.rs +++ b/src/test/ui/run-pass/iterators/iter-step-overflow-debug.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare compiled with panic=abort by default // compile-flags: -C debug_assertions=yes diff --git a/src/test/run-pass/iter-step-overflow-ndebug.rs b/src/test/ui/run-pass/iterators/iter-step-overflow-ndebug.rs similarity index 98% rename from src/test/run-pass/iter-step-overflow-ndebug.rs rename to src/test/ui/run-pass/iterators/iter-step-overflow-ndebug.rs index 8642f1643c11..9f12d08254db 100644 --- a/src/test/run-pass/iter-step-overflow-ndebug.rs +++ b/src/test/ui/run-pass/iterators/iter-step-overflow-ndebug.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -C debug_assertions=no fn main() { diff --git a/src/test/run-pass/iter-sum-overflow-debug.rs b/src/test/ui/run-pass/iterators/iter-sum-overflow-debug.rs similarity index 98% rename from src/test/run-pass/iter-sum-overflow-debug.rs rename to src/test/ui/run-pass/iterators/iter-sum-overflow-debug.rs index c640f7cd2804..acd70657f44d 100644 --- a/src/test/run-pass/iter-sum-overflow-debug.rs +++ b/src/test/ui/run-pass/iterators/iter-sum-overflow-debug.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare compiled with panic=abort by default // compile-flags: -C debug_assertions=yes diff --git a/src/test/run-pass/iter-sum-overflow-ndebug.rs b/src/test/ui/run-pass/iterators/iter-sum-overflow-ndebug.rs similarity index 98% rename from src/test/run-pass/iter-sum-overflow-ndebug.rs rename to src/test/ui/run-pass/iterators/iter-sum-overflow-ndebug.rs index 65ac1ef29ed6..1cd8026e456f 100644 --- a/src/test/run-pass/iter-sum-overflow-ndebug.rs +++ b/src/test/ui/run-pass/iterators/iter-sum-overflow-ndebug.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -C debug_assertions=no fn main() { diff --git a/src/test/run-pass/iter-sum-overflow-overflow-checks.rs b/src/test/ui/run-pass/iterators/iter-sum-overflow-overflow-checks.rs similarity index 98% rename from src/test/run-pass/iter-sum-overflow-overflow-checks.rs rename to src/test/ui/run-pass/iterators/iter-sum-overflow-overflow-checks.rs index 517cd139cf35..a4a237c57a5f 100644 --- a/src/test/run-pass/iter-sum-overflow-overflow-checks.rs +++ b/src/test/ui/run-pass/iterators/iter-sum-overflow-overflow-checks.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare compiled with panic=abort by default // compile-flags: -C overflow-checks diff --git a/src/test/run-pass/iter-zip.rs b/src/test/ui/run-pass/iterators/iter-zip.rs similarity index 99% rename from src/test/run-pass/iter-zip.rs rename to src/test/ui/run-pass/iterators/iter-zip.rs index b0503bc2048e..f2402fe185ac 100644 --- a/src/test/run-pass/iter-zip.rs +++ b/src/test/ui/run-pass/iterators/iter-zip.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that .zip() specialization preserves side effects // in sideeffectful iterator adaptors. diff --git a/src/test/run-pass/assert-eq-macro-success.rs b/src/test/ui/run-pass/macros/assert-eq-macro-success.rs similarity index 98% rename from src/test/run-pass/assert-eq-macro-success.rs rename to src/test/ui/run-pass/macros/assert-eq-macro-success.rs index 3110e22d5da1..a96147db4e1c 100644 --- a/src/test/run-pass/assert-eq-macro-success.rs +++ b/src/test/ui/run-pass/macros/assert-eq-macro-success.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] struct Point { x : isize } diff --git a/src/test/run-pass/assert-eq-macro-unsized.rs b/src/test/ui/run-pass/macros/assert-eq-macro-unsized.rs similarity index 97% rename from src/test/run-pass/assert-eq-macro-unsized.rs rename to src/test/ui/run-pass/macros/assert-eq-macro-unsized.rs index e21d3ef0ed06..b9e93b175a4f 100644 --- a/src/test/run-pass/assert-eq-macro-unsized.rs +++ b/src/test/ui/run-pass/macros/assert-eq-macro-unsized.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { assert_eq!([1, 2, 3][..], vec![1, 2, 3][..]); } diff --git a/src/test/run-pass/assert-ne-macro-success.rs b/src/test/ui/run-pass/macros/assert-ne-macro-success.rs similarity index 98% rename from src/test/run-pass/assert-ne-macro-success.rs rename to src/test/ui/run-pass/macros/assert-ne-macro-success.rs index ce671d2f1b5a..e554607233fc 100644 --- a/src/test/run-pass/assert-ne-macro-success.rs +++ b/src/test/ui/run-pass/macros/assert-ne-macro-success.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] struct Point { x : isize } diff --git a/src/test/run-pass/assert-ne-macro-unsized.rs b/src/test/ui/run-pass/macros/assert-ne-macro-unsized.rs similarity index 97% rename from src/test/run-pass/assert-ne-macro-unsized.rs rename to src/test/ui/run-pass/macros/assert-ne-macro-unsized.rs index eeac0b6f9f68..8833eb34918d 100644 --- a/src/test/run-pass/assert-ne-macro-unsized.rs +++ b/src/test/ui/run-pass/macros/assert-ne-macro-unsized.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { assert_ne!([6, 6, 6][..], vec![1, 2, 3][..]); } diff --git a/src/test/run-pass/auxiliary/macro-comma-support.rs b/src/test/ui/run-pass/macros/auxiliary/macro-comma-support.rs similarity index 100% rename from src/test/run-pass/auxiliary/macro-comma-support.rs rename to src/test/ui/run-pass/macros/auxiliary/macro-comma-support.rs diff --git a/src/test/run-pass/auxiliary/macro-include-items-expr.rs b/src/test/ui/run-pass/macros/auxiliary/macro-include-items-expr.rs similarity index 100% rename from src/test/run-pass/auxiliary/macro-include-items-expr.rs rename to src/test/ui/run-pass/macros/auxiliary/macro-include-items-expr.rs diff --git a/src/test/run-pass/auxiliary/macro-include-items-item.rs b/src/test/ui/run-pass/macros/auxiliary/macro-include-items-item.rs similarity index 100% rename from src/test/run-pass/auxiliary/macro-include-items-item.rs rename to src/test/ui/run-pass/macros/auxiliary/macro-include-items-item.rs diff --git a/src/test/run-pass/auxiliary/macro_crate_def_only.rs b/src/test/ui/run-pass/macros/auxiliary/macro_crate_def_only.rs similarity index 100% rename from src/test/run-pass/auxiliary/macro_crate_def_only.rs rename to src/test/ui/run-pass/macros/auxiliary/macro_crate_def_only.rs diff --git a/src/test/run-pass/auxiliary/macro_crate_nonterminal.rs b/src/test/ui/run-pass/macros/auxiliary/macro_crate_nonterminal.rs similarity index 100% rename from src/test/run-pass/auxiliary/macro_crate_nonterminal.rs rename to src/test/ui/run-pass/macros/auxiliary/macro_crate_nonterminal.rs diff --git a/src/test/run-pass/auxiliary/macro_export_inner_module.rs b/src/test/ui/run-pass/macros/auxiliary/macro_export_inner_module.rs similarity index 100% rename from src/test/run-pass/auxiliary/macro_export_inner_module.rs rename to src/test/ui/run-pass/macros/auxiliary/macro_export_inner_module.rs diff --git a/src/test/run-pass/auxiliary/macro_with_super_1.rs b/src/test/ui/run-pass/macros/auxiliary/macro_with_super_1.rs similarity index 100% rename from src/test/run-pass/auxiliary/macro_with_super_1.rs rename to src/test/ui/run-pass/macros/auxiliary/macro_with_super_1.rs diff --git a/src/test/run-pass/auxiliary/two_macros.rs b/src/test/ui/run-pass/macros/auxiliary/two_macros.rs similarity index 100% rename from src/test/run-pass/auxiliary/two_macros.rs rename to src/test/ui/run-pass/macros/auxiliary/two_macros.rs diff --git a/src/test/run-pass/auxiliary/unstable-macros.rs b/src/test/ui/run-pass/macros/auxiliary/unstable-macros.rs similarity index 100% rename from src/test/run-pass/auxiliary/unstable-macros.rs rename to src/test/ui/run-pass/macros/auxiliary/unstable-macros.rs diff --git a/src/test/run-pass/auxiliary/use-macro-self.rs b/src/test/ui/run-pass/macros/auxiliary/use-macro-self.rs similarity index 100% rename from src/test/run-pass/auxiliary/use-macro-self.rs rename to src/test/ui/run-pass/macros/auxiliary/use-macro-self.rs diff --git a/src/test/run-pass/colorful-write-macros.rs b/src/test/ui/run-pass/macros/colorful-write-macros.rs similarity index 98% rename from src/test/run-pass/colorful-write-macros.rs rename to src/test/ui/run-pass/macros/colorful-write-macros.rs index 21ff6d6938a3..37eaf2e8cde6 100644 --- a/src/test/run-pass/colorful-write-macros.rs +++ b/src/test/ui/run-pass/macros/colorful-write-macros.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::io::Write; use std::fmt; diff --git a/src/test/run-pass/conditional-debug-macro-on.rs b/src/test/ui/run-pass/macros/conditional-debug-macro-on.rs similarity index 98% rename from src/test/run-pass/conditional-debug-macro-on.rs rename to src/test/ui/run-pass/macros/conditional-debug-macro-on.rs index 7da33be7a57d..14e911f61fcc 100644 --- a/src/test/run-pass/conditional-debug-macro-on.rs +++ b/src/test/ui/run-pass/macros/conditional-debug-macro-on.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { // exits early if println! evaluates its arguments, otherwise it // will hit the panic. diff --git a/src/test/run-pass/die-macro.rs b/src/test/ui/run-pass/macros/die-macro.rs similarity index 98% rename from src/test/run-pass/die-macro.rs rename to src/test/ui/run-pass/macros/die-macro.rs index 0816e258e84a..65ba591404bd 100644 --- a/src/test/run-pass/die-macro.rs +++ b/src/test/ui/run-pass/macros/die-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Just testing that panic!() type checks in statement or expr diff --git a/src/test/run-pass/log_syntax-trace_macros-macro-locations.rs b/src/test/ui/run-pass/macros/log_syntax-trace_macros-macro-locations.rs similarity index 98% rename from src/test/run-pass/log_syntax-trace_macros-macro-locations.rs rename to src/test/ui/run-pass/macros/log_syntax-trace_macros-macro-locations.rs index 493283118676..8356eb3ecd6c 100644 --- a/src/test/run-pass/log_syntax-trace_macros-macro-locations.rs +++ b/src/test/ui/run-pass/macros/log_syntax-trace_macros-macro-locations.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(trace_macros, log_syntax)] diff --git a/src/test/ui/run-pass/macros/log_syntax-trace_macros-macro-locations.stdout b/src/test/ui/run-pass/macros/log_syntax-trace_macros-macro-locations.stdout new file mode 100644 index 000000000000..b28b04f64312 --- /dev/null +++ b/src/test/ui/run-pass/macros/log_syntax-trace_macros-macro-locations.stdout @@ -0,0 +1,3 @@ + + + diff --git a/src/test/run-pass/macro-2.rs b/src/test/ui/run-pass/macros/macro-2.rs similarity index 98% rename from src/test/run-pass/macro-2.rs rename to src/test/ui/run-pass/macros/macro-2.rs index 801d92b6dcb1..cfce7f9c8c1b 100644 --- a/src/test/run-pass/macro-2.rs +++ b/src/test/ui/run-pass/macros/macro-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { macro_rules! mylambda_tt { diff --git a/src/test/run-pass/macro-at-most-once-rep.rs b/src/test/ui/run-pass/macros/macro-at-most-once-rep.rs similarity index 99% rename from src/test/run-pass/macro-at-most-once-rep.rs rename to src/test/ui/run-pass/macros/macro-at-most-once-rep.rs index 61c3e781c086..3625e0e7efa2 100644 --- a/src/test/run-pass/macro-at-most-once-rep.rs +++ b/src/test/ui/run-pass/macros/macro-at-most-once-rep.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // The logic for parsing Kleene operators in macros has a special case to disambiguate `?`. // Specifically, `$(pat)?` is the ZeroOrOne operator whereas `$(pat)?+` or `$(pat)?*` are the // ZeroOrMore and OneOrMore operators using `?` as a separator. These tests are intended to diff --git a/src/test/run-pass/macro-attribute-expansion.rs b/src/test/ui/run-pass/macros/macro-attribute-expansion.rs similarity index 98% rename from src/test/run-pass/macro-attribute-expansion.rs rename to src/test/ui/run-pass/macros/macro-attribute-expansion.rs index c3de9f736fbe..2f4e62e0faa3 100644 --- a/src/test/run-pass/macro-attribute-expansion.rs +++ b/src/test/ui/run-pass/macros/macro-attribute-expansion.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! descriptions { ($name:ident is $desc:expr) => { // Check that we will correctly expand attributes diff --git a/src/test/run-pass/macro-attributes.rs b/src/test/ui/run-pass/macros/macro-attributes.rs similarity index 98% rename from src/test/run-pass/macro-attributes.rs rename to src/test/ui/run-pass/macros/macro-attributes.rs index 839fee3a2d21..70190d495a53 100644 --- a/src/test/run-pass/macro-attributes.rs +++ b/src/test/ui/run-pass/macros/macro-attributes.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(custom_attribute)] macro_rules! compiles_fine { diff --git a/src/test/run-pass/macro-block-nonterminal.rs b/src/test/ui/run-pass/macros/macro-block-nonterminal.rs similarity index 98% rename from src/test/run-pass/macro-block-nonterminal.rs rename to src/test/ui/run-pass/macros/macro-block-nonterminal.rs index 21b284f420f2..02ad360880f2 100644 --- a/src/test/run-pass/macro-block-nonterminal.rs +++ b/src/test/ui/run-pass/macros/macro-block-nonterminal.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! do_block{ ($val:block) => {$val} diff --git a/src/test/run-pass/macro-comma-behavior.rs b/src/test/ui/run-pass/macros/macro-comma-behavior.rs similarity index 99% rename from src/test/run-pass/macro-comma-behavior.rs rename to src/test/ui/run-pass/macros/macro-comma-behavior.rs index 2a434009e134..bfa32817b100 100644 --- a/src/test/run-pass/macro-comma-behavior.rs +++ b/src/test/ui/run-pass/macros/macro-comma-behavior.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Ideally, any macro call with a trailing comma should behave // identically to a call without the comma. // diff --git a/src/test/run-pass/macro-comma-support.rs b/src/test/ui/run-pass/macros/macro-comma-support.rs similarity index 99% rename from src/test/run-pass/macro-comma-support.rs rename to src/test/ui/run-pass/macros/macro-comma-support.rs index f645849cd511..9186974f0a37 100644 --- a/src/test/run-pass/macro-comma-support.rs +++ b/src/test/ui/run-pass/macros/macro-comma-support.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This is meant to be a comprehensive test of invocations with/without // trailing commas (or other, similar optionally-trailing separators). // Every macro is accounted for, even those not tested in this file. diff --git a/src/test/run-pass/macro-crate-def-only.rs b/src/test/ui/run-pass/macros/macro-crate-def-only.rs similarity index 98% rename from src/test/run-pass/macro-crate-def-only.rs rename to src/test/ui/run-pass/macros/macro-crate-def-only.rs index 28be058b9a37..3a48d0489cec 100644 --- a/src/test/run-pass/macro-crate-def-only.rs +++ b/src/test/ui/run-pass/macros/macro-crate-def-only.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:macro_crate_def_only.rs diff --git a/src/test/run-pass/macro-crate-nonterminal-renamed.rs b/src/test/ui/run-pass/macros/macro-crate-nonterminal-renamed.rs similarity index 98% rename from src/test/run-pass/macro-crate-nonterminal-renamed.rs rename to src/test/ui/run-pass/macros/macro-crate-nonterminal-renamed.rs index 93f5899e3ac9..c2a9729ec1c4 100644 --- a/src/test/run-pass/macro-crate-nonterminal-renamed.rs +++ b/src/test/ui/run-pass/macros/macro-crate-nonterminal-renamed.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:macro_crate_nonterminal.rs #[macro_use] diff --git a/src/test/run-pass/macro-crate-nonterminal.rs b/src/test/ui/run-pass/macros/macro-crate-nonterminal.rs similarity index 98% rename from src/test/run-pass/macro-crate-nonterminal.rs rename to src/test/ui/run-pass/macros/macro-crate-nonterminal.rs index 28f9393ab7a1..114d8961817f 100644 --- a/src/test/run-pass/macro-crate-nonterminal.rs +++ b/src/test/ui/run-pass/macros/macro-crate-nonterminal.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:macro_crate_nonterminal.rs #[macro_use] diff --git a/src/test/run-pass/macro-crate-use.rs b/src/test/ui/run-pass/macros/macro-crate-use.rs similarity index 98% rename from src/test/run-pass/macro-crate-use.rs rename to src/test/ui/run-pass/macros/macro-crate-use.rs index c7255f67fa68..b74d5ec91b51 100644 --- a/src/test/run-pass/macro-crate-use.rs +++ b/src/test/ui/run-pass/macros/macro-crate-use.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn increment(x: usize) -> usize { x + 1 diff --git a/src/test/run-pass/macro-deep_expansion.rs b/src/test/ui/run-pass/macros/macro-deep_expansion.rs similarity index 98% rename from src/test/run-pass/macro-deep_expansion.rs rename to src/test/ui/run-pass/macros/macro-deep_expansion.rs index 3e8548ff49d2..d6def354673e 100644 --- a/src/test/run-pass/macro-deep_expansion.rs +++ b/src/test/ui/run-pass/macros/macro-deep_expansion.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! foo2 { () => { diff --git a/src/test/run-pass/macro-delimiter-significance.rs b/src/test/ui/run-pass/macros/macro-delimiter-significance.rs similarity index 97% rename from src/test/run-pass/macro-delimiter-significance.rs rename to src/test/ui/run-pass/macros/macro-delimiter-significance.rs index a2ae3fbf83b0..0b6b183e6e87 100644 --- a/src/test/run-pass/macro-delimiter-significance.rs +++ b/src/test/ui/run-pass/macros/macro-delimiter-significance.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { vec![1_usize, 2, 3].len(); } diff --git a/src/test/run-pass/macro-doc-comments.rs b/src/test/ui/run-pass/macros/macro-doc-comments.rs similarity index 95% rename from src/test/run-pass/macro-doc-comments.rs rename to src/test/ui/run-pass/macros/macro-doc-comments.rs index 506813df5b37..2115022f17fd 100644 --- a/src/test/run-pass/macro-doc-comments.rs +++ b/src/test/ui/run-pass/macros/macro-doc-comments.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + macro_rules! doc { ( $(#[$outer:meta])* diff --git a/src/test/run-pass/macro-doc-escapes.rs b/src/test/ui/run-pass/macros/macro-doc-escapes.rs similarity index 98% rename from src/test/run-pass/macro-doc-escapes.rs rename to src/test/ui/run-pass/macros/macro-doc-escapes.rs index ea92f0ffebe6..5253d960c8d9 100644 --- a/src/test/run-pass/macro-doc-escapes.rs +++ b/src/test/ui/run-pass/macros/macro-doc-escapes.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // When expanding a macro, documentation attributes (including documentation comments) must be // passed "as is" without being parsed. Otherwise, some text will be incorrectly interpreted as // escape sequences, leading to an ICE. diff --git a/src/test/run-pass/macro-doc-raw-str-hashes.rs b/src/test/ui/run-pass/macros/macro-doc-raw-str-hashes.rs similarity index 98% rename from src/test/run-pass/macro-doc-raw-str-hashes.rs rename to src/test/ui/run-pass/macros/macro-doc-raw-str-hashes.rs index ffbe237b74e6..b12e00eccc9f 100644 --- a/src/test/run-pass/macro-doc-raw-str-hashes.rs +++ b/src/test/ui/run-pass/macros/macro-doc-raw-str-hashes.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // The number of `#`s used to wrap the documentation comment should differ regarding the content. // // Related issue: #27489 diff --git a/src/test/run-pass/macro-export-inner-module.rs b/src/test/ui/run-pass/macros/macro-export-inner-module.rs similarity index 98% rename from src/test/run-pass/macro-export-inner-module.rs rename to src/test/ui/run-pass/macros/macro-export-inner-module.rs index e39f81e49d7c..e114790f71a9 100644 --- a/src/test/run-pass/macro-export-inner-module.rs +++ b/src/test/ui/run-pass/macros/macro-export-inner-module.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass //aux-build:macro_export_inner_module.rs #[macro_use] #[no_link] diff --git a/src/test/run-pass/macro-first-set.rs b/src/test/ui/run-pass/macros/macro-first-set.rs similarity index 99% rename from src/test/run-pass/macro-first-set.rs rename to src/test/ui/run-pass/macros/macro-first-set.rs index 9216040ab6ec..984a31d4d520 100644 --- a/src/test/run-pass/macro-first-set.rs +++ b/src/test/ui/run-pass/macros/macro-first-set.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![cfg_attr(stage0, feature(macro_vis_matcher))] //{{{ issue 40569 ============================================================== diff --git a/src/test/run-pass/macro-follow.rs b/src/test/ui/run-pass/macros/macro-follow.rs similarity index 99% rename from src/test/run-pass/macro-follow.rs rename to src/test/ui/run-pass/macros/macro-follow.rs index dca676f8cf95..2cb2e43fd658 100644 --- a/src/test/run-pass/macro-follow.rs +++ b/src/test/ui/run-pass/macros/macro-follow.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check the macro follow sets (see corresponding cfail test). // FOLLOW(pat) = {FatArrow, Comma, Eq, Or, Ident(if), Ident(in)} diff --git a/src/test/run-pass/macro-followed-by-seq.rs b/src/test/ui/run-pass/macros/macro-followed-by-seq.rs similarity index 98% rename from src/test/run-pass/macro-followed-by-seq.rs rename to src/test/ui/run-pass/macros/macro-followed-by-seq.rs index 15224930b846..8b7961876646 100644 --- a/src/test/run-pass/macro-followed-by-seq.rs +++ b/src/test/ui/run-pass/macros/macro-followed-by-seq.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #25436: check that things which can be // followed by any token also permit X* to come afterwards. diff --git a/src/test/run-pass/macro-include-items.rs b/src/test/ui/run-pass/macros/macro-include-items.rs similarity index 93% rename from src/test/run-pass/macro-include-items.rs rename to src/test/ui/run-pass/macros/macro-include-items.rs index f8728ebb9151..d5d459bf28d3 100644 --- a/src/test/run-pass/macro-include-items.rs +++ b/src/test/ui/run-pass/macros/macro-include-items.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // ignore-pretty issue #37195 fn bar() {} diff --git a/src/test/run-pass/macro-interpolation.rs b/src/test/ui/run-pass/macros/macro-interpolation.rs similarity index 98% rename from src/test/run-pass/macro-interpolation.rs rename to src/test/ui/run-pass/macros/macro-interpolation.rs index 6dcd1538ebce..bc0c15bd4037 100644 --- a/src/test/run-pass/macro-interpolation.rs +++ b/src/test/ui/run-pass/macros/macro-interpolation.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! overly_complicated { ($fnname:ident, $arg:ident, $ty:ty, $body:block, $val:expr, $pat:pat, $res:path) => diff --git a/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs b/src/test/ui/run-pass/macros/macro-invocation-in-count-expr-fixed-array-type.rs similarity index 97% rename from src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs rename to src/test/ui/run-pass/macros/macro-invocation-in-count-expr-fixed-array-type.rs index 9fafeb6531dc..457b7232f0a5 100644 --- a/src/test/run-pass/macro-invocation-in-count-expr-fixed-array-type.rs +++ b/src/test/ui/run-pass/macros/macro-invocation-in-count-expr-fixed-array-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 macro_rules! four { diff --git a/src/test/run-pass/macro-lifetime-used-with-bound.rs b/src/test/ui/run-pass/macros/macro-lifetime-used-with-bound.rs similarity index 98% rename from src/test/run-pass/macro-lifetime-used-with-bound.rs rename to src/test/ui/run-pass/macros/macro-lifetime-used-with-bound.rs index b9e1fde6b1f3..eadef9803772 100644 --- a/src/test/run-pass/macro-lifetime-used-with-bound.rs +++ b/src/test/ui/run-pass/macros/macro-lifetime-used-with-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! foo { ($l:lifetime, $l2:lifetime) => { fn f<$l: $l2, $l2>(arg: &$l str, arg2: &$l2 str) -> &$l str { diff --git a/src/test/run-pass/macro-lifetime-used-with-labels.rs b/src/test/ui/run-pass/macros/macro-lifetime-used-with-labels.rs similarity index 96% rename from src/test/run-pass/macro-lifetime-used-with-labels.rs rename to src/test/ui/run-pass/macros/macro-lifetime-used-with-labels.rs index d003d7dcfb62..e7c590077026 100644 --- a/src/test/run-pass/macro-lifetime-used-with-labels.rs +++ b/src/test/ui/run-pass/macros/macro-lifetime-used-with-labels.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + #![allow(unreachable_code)] macro_rules! x { diff --git a/src/test/ui/run-pass/macros/macro-lifetime-used-with-labels.stderr b/src/test/ui/run-pass/macros/macro-lifetime-used-with-labels.stderr new file mode 100644 index 000000000000..729178fb8f14 --- /dev/null +++ b/src/test/ui/run-pass/macros/macro-lifetime-used-with-labels.stderr @@ -0,0 +1,11 @@ +warning: label name `'b` shadows a label name that is already in scope + --> $DIR/macro-lifetime-used-with-labels.rs:31:9 + | +LL | 'b: loop { + | ^^ lifetime 'b already in scope +... +LL | 'b: loop { + | -- first declared here +LL | br2!('b); + | --------- in this macro invocation + diff --git a/src/test/run-pass/macro-lifetime-used-with-static.rs b/src/test/ui/run-pass/macros/macro-lifetime-used-with-static.rs similarity index 98% rename from src/test/run-pass/macro-lifetime-used-with-static.rs rename to src/test/ui/run-pass/macros/macro-lifetime-used-with-static.rs index 5c1f8683e00f..2b37ce461cb5 100644 --- a/src/test/run-pass/macro-lifetime-used-with-static.rs +++ b/src/test/ui/run-pass/macros/macro-lifetime-used-with-static.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! foo { ($l:lifetime) => { fn f(arg: &$l str) -> &$l str { diff --git a/src/test/run-pass/macro-lifetime.rs b/src/test/ui/run-pass/macros/macro-lifetime.rs similarity index 98% rename from src/test/run-pass/macro-lifetime.rs rename to src/test/ui/run-pass/macros/macro-lifetime.rs index ff5798ff78d6..f385d73e5bb1 100644 --- a/src/test/run-pass/macro-lifetime.rs +++ b/src/test/ui/run-pass/macros/macro-lifetime.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! foo { ($l:lifetime) => { fn f<$l>(arg: &$l str) -> &$l str { diff --git a/src/test/run-pass/macro-literal.rs b/src/test/ui/run-pass/macros/macro-literal.rs similarity index 99% rename from src/test/run-pass/macro-literal.rs rename to src/test/ui/run-pass/macros/macro-literal.rs index 6d5e8bc97c0e..ecbb47757d11 100644 --- a/src/test/run-pass/macro-literal.rs +++ b/src/test/ui/run-pass/macros/macro-literal.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(macro_literal_matcher)] macro_rules! mtester { diff --git a/src/test/run-pass/macro-meta-items.rs b/src/test/ui/run-pass/macros/macro-meta-items.rs similarity index 98% rename from src/test/run-pass/macro-meta-items.rs rename to src/test/ui/run-pass/macros/macro-meta-items.rs index 9c1e1fca3413..d19c33b2e3a2 100644 --- a/src/test/run-pass/macro-meta-items.rs +++ b/src/test/ui/run-pass/macros/macro-meta-items.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: --cfg foo macro_rules! compiles_fine { diff --git a/src/test/run-pass/macro-method-issue-4621.rs b/src/test/ui/run-pass/macros/macro-method-issue-4621.rs similarity index 98% rename from src/test/run-pass/macro-method-issue-4621.rs rename to src/test/ui/run-pass/macros/macro-method-issue-4621.rs index 64648cae5e6c..17f6b84d1087 100644 --- a/src/test/run-pass/macro-method-issue-4621.rs +++ b/src/test/ui/run-pass/macros/macro-method-issue-4621.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct A; diff --git a/src/test/run-pass/macro-multiple-items.rs b/src/test/ui/run-pass/macros/macro-multiple-items.rs similarity index 98% rename from src/test/run-pass/macro-multiple-items.rs rename to src/test/ui/run-pass/macros/macro-multiple-items.rs index 190bfc53a9ed..6ebfead97617 100644 --- a/src/test/run-pass/macro-multiple-items.rs +++ b/src/test/ui/run-pass/macros/macro-multiple-items.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! make_foo { () => ( struct Foo; diff --git a/src/test/run-pass/macro-named-default.rs b/src/test/ui/run-pass/macros/macro-named-default.rs similarity index 98% rename from src/test/run-pass/macro-named-default.rs rename to src/test/ui/run-pass/macros/macro-named-default.rs index 028d59a19dd6..1a7674ad4e6c 100644 --- a/src/test/run-pass/macro-named-default.rs +++ b/src/test/ui/run-pass/macros/macro-named-default.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! default { ($($x:tt)*) => { $($x)* } } diff --git a/src/test/run-pass/macro-nested_definition_issue-31946.rs b/src/test/ui/run-pass/macros/macro-nested_definition_issue-31946.rs similarity index 98% rename from src/test/run-pass/macro-nested_definition_issue-31946.rs rename to src/test/ui/run-pass/macros/macro-nested_definition_issue-31946.rs index 84ff2dc4d0d6..276aef879e04 100644 --- a/src/test/run-pass/macro-nested_definition_issue-31946.rs +++ b/src/test/ui/run-pass/macros/macro-nested_definition_issue-31946.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { println!("{}", { macro_rules! foo { diff --git a/src/test/run-pass/macro-nested_expr.rs b/src/test/ui/run-pass/macros/macro-nested_expr.rs similarity index 98% rename from src/test/run-pass/macro-nested_expr.rs rename to src/test/ui/run-pass/macros/macro-nested_expr.rs index 993ded60c367..5af4649f58b9 100644 --- a/src/test/run-pass/macro-nested_expr.rs +++ b/src/test/ui/run-pass/macros/macro-nested_expr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // #42164 #![feature(decl_macro)] diff --git a/src/test/run-pass/macro-nested_stmt_macros.rs b/src/test/ui/run-pass/macros/macro-nested_stmt_macros.rs similarity index 98% rename from src/test/run-pass/macro-nested_stmt_macros.rs rename to src/test/ui/run-pass/macros/macro-nested_stmt_macros.rs index 5997a4f18e76..81400927d882 100644 --- a/src/test/run-pass/macro-nested_stmt_macros.rs +++ b/src/test/ui/run-pass/macros/macro-nested_stmt_macros.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! foo { () => { struct Bar; diff --git a/src/test/run-pass/macro-nt-list.rs b/src/test/ui/run-pass/macros/macro-nt-list.rs similarity index 98% rename from src/test/run-pass/macro-nt-list.rs rename to src/test/ui/run-pass/macros/macro-nt-list.rs index f3367ff2b410..55388ed278ff 100644 --- a/src/test/run-pass/macro-nt-list.rs +++ b/src/test/ui/run-pass/macros/macro-nt-list.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 macro_rules! list { diff --git a/src/test/run-pass/macro-of-higher-order.rs b/src/test/ui/run-pass/macros/macro-of-higher-order.rs similarity index 98% rename from src/test/run-pass/macro-of-higher-order.rs rename to src/test/ui/run-pass/macros/macro-of-higher-order.rs index c982e8ac6f83..9a535881197a 100644 --- a/src/test/run-pass/macro-of-higher-order.rs +++ b/src/test/ui/run-pass/macros/macro-of-higher-order.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! higher_order { (subst $lhs:tt => $rhs:tt) => ({ diff --git a/src/test/run-pass/macro-pat-follow.rs b/src/test/ui/run-pass/macros/macro-pat-follow.rs similarity index 98% rename from src/test/run-pass/macro-pat-follow.rs rename to src/test/ui/run-pass/macros/macro-pat-follow.rs index c1abebd5f904..12cbfa845054 100644 --- a/src/test/run-pass/macro-pat-follow.rs +++ b/src/test/ui/run-pass/macros/macro-pat-follow.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! pat_in { ($p:pat in $e:expr) => {{ let mut iter = $e.into_iter(); diff --git a/src/test/run-pass/macro-pat-neg-lit.rs b/src/test/ui/run-pass/macros/macro-pat-neg-lit.rs similarity index 98% rename from src/test/run-pass/macro-pat-neg-lit.rs rename to src/test/ui/run-pass/macros/macro-pat-neg-lit.rs index 43ac697edced..ddde5d32e399 100644 --- a/src/test/run-pass/macro-pat-neg-lit.rs +++ b/src/test/ui/run-pass/macros/macro-pat-neg-lit.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! enum_number { ($name:ident { $($variant:ident = $value:expr, )* }) => { enum $name { diff --git a/src/test/run-pass/macro-pat.rs b/src/test/ui/run-pass/macros/macro-pat.rs similarity index 99% rename from src/test/run-pass/macro-pat.rs rename to src/test/ui/run-pass/macros/macro-pat.rs index 48e521de57e9..1ed0663fc5a9 100644 --- a/src/test/run-pass/macro-pat.rs +++ b/src/test/ui/run-pass/macros/macro-pat.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! mypat { () => ( diff --git a/src/test/run-pass/macro-path.rs b/src/test/ui/run-pass/macros/macro-path.rs similarity index 93% rename from src/test/run-pass/macro-path.rs rename to src/test/ui/run-pass/macros/macro-path.rs index 7aecc1dc2034..fc874f0d0cad 100644 --- a/src/test/run-pass/macro-path.rs +++ b/src/test/ui/run-pass/macros/macro-path.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + mod m { pub type t = isize; diff --git a/src/test/run-pass/macro-pub-matcher.rs b/src/test/ui/run-pass/macros/macro-pub-matcher.rs similarity index 99% rename from src/test/run-pass/macro-pub-matcher.rs rename to src/test/ui/run-pass/macros/macro-pub-matcher.rs index db8331358b96..7d8bb430232f 100644 --- a/src/test/run-pass/macro-pub-matcher.rs +++ b/src/test/ui/run-pass/macros/macro-pub-matcher.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code, unused_imports)] #![cfg_attr(stage0, feature(macro_vis_matcher))] #![feature(crate_visibility_modifier)] diff --git a/src/test/run-pass/macro-seq-followed-by-seq.rs b/src/test/ui/run-pass/macros/macro-seq-followed-by-seq.rs similarity index 98% rename from src/test/run-pass/macro-seq-followed-by-seq.rs rename to src/test/ui/run-pass/macros/macro-seq-followed-by-seq.rs index 23c7d2516a27..594717ffcdb2 100644 --- a/src/test/run-pass/macro-seq-followed-by-seq.rs +++ b/src/test/ui/run-pass/macros/macro-seq-followed-by-seq.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test of allowing two sequences repetitions in a row, // functionality added as byproduct of RFC amendment #1384 // https://github.com/rust-lang/rfcs/pull/1384 diff --git a/src/test/run-pass/macro-stability.rs b/src/test/ui/run-pass/macros/macro-stability.rs similarity index 98% rename from src/test/run-pass/macro-stability.rs rename to src/test/ui/run-pass/macros/macro-stability.rs index 9afcd51aa85a..a5c0cbbcde44 100644 --- a/src/test/run-pass/macro-stability.rs +++ b/src/test/ui/run-pass/macros/macro-stability.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:unstable-macros.rs #![feature(unstable_macros)] diff --git a/src/test/run-pass/macro-stmt.rs b/src/test/ui/run-pass/macros/macro-stmt.rs similarity index 98% rename from src/test/run-pass/macro-stmt.rs rename to src/test/ui/run-pass/macros/macro-stmt.rs index 027df9f93a88..98b0dcb83365 100644 --- a/src/test/run-pass/macro-stmt.rs +++ b/src/test/ui/run-pass/macros/macro-stmt.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! myfn { ( $f:ident, ( $( $x:ident ),* ), $body:block ) => ( fn $f( $( $x : isize),* ) -> isize $body diff --git a/src/test/run-pass/macro-stmt_macro_in_expr_macro.rs b/src/test/ui/run-pass/macros/macro-stmt_macro_in_expr_macro.rs similarity index 98% rename from src/test/run-pass/macro-stmt_macro_in_expr_macro.rs rename to src/test/ui/run-pass/macros/macro-stmt_macro_in_expr_macro.rs index c5badd78a637..22e983dd9cef 100644 --- a/src/test/run-pass/macro-stmt_macro_in_expr_macro.rs +++ b/src/test/ui/run-pass/macros/macro-stmt_macro_in_expr_macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! foo { () => { struct Bar; diff --git a/src/test/run-pass/macro-tt-followed-by-seq.rs b/src/test/ui/run-pass/macros/macro-tt-followed-by-seq.rs similarity index 98% rename from src/test/run-pass/macro-tt-followed-by-seq.rs rename to src/test/ui/run-pass/macros/macro-tt-followed-by-seq.rs index cdb1f86aea50..204fdcf7049e 100644 --- a/src/test/run-pass/macro-tt-followed-by-seq.rs +++ b/src/test/ui/run-pass/macros/macro-tt-followed-by-seq.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #25436: permit token-trees to be followed // by sequences, enabling more general parsing. diff --git a/src/test/run-pass/macro-use-all-and-none.rs b/src/test/ui/run-pass/macros/macro-use-all-and-none.rs similarity index 98% rename from src/test/run-pass/macro-use-all-and-none.rs rename to src/test/ui/run-pass/macros/macro-use-all-and-none.rs index 60e1d6287f18..6e035ff7f39c 100644 --- a/src/test/run-pass/macro-use-all-and-none.rs +++ b/src/test/ui/run-pass/macros/macro-use-all-and-none.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:two_macros.rs #[macro_use] diff --git a/src/test/run-pass/macro-use-all.rs b/src/test/ui/run-pass/macros/macro-use-all.rs similarity index 98% rename from src/test/run-pass/macro-use-all.rs rename to src/test/ui/run-pass/macros/macro-use-all.rs index ca9c0e23e7c3..8bbec89ace22 100644 --- a/src/test/run-pass/macro-use-all.rs +++ b/src/test/ui/run-pass/macros/macro-use-all.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:two_macros.rs #[macro_use] diff --git a/src/test/run-pass/macro-use-both.rs b/src/test/ui/run-pass/macros/macro-use-both.rs similarity index 98% rename from src/test/run-pass/macro-use-both.rs rename to src/test/ui/run-pass/macros/macro-use-both.rs index 7e0a374ef152..5e5b4b778a27 100644 --- a/src/test/run-pass/macro-use-both.rs +++ b/src/test/ui/run-pass/macros/macro-use-both.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:two_macros.rs #[macro_use(macro_one, macro_two)] diff --git a/src/test/run-pass/macro-use-one.rs b/src/test/ui/run-pass/macros/macro-use-one.rs similarity index 97% rename from src/test/run-pass/macro-use-one.rs rename to src/test/ui/run-pass/macros/macro-use-one.rs index 6a30b3e55ba9..bdd9cc25b63b 100644 --- a/src/test/run-pass/macro-use-one.rs +++ b/src/test/ui/run-pass/macros/macro-use-one.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:two_macros.rs #[macro_use(macro_two)] diff --git a/src/test/run-pass/macro-with-attrs1.rs b/src/test/ui/run-pass/macros/macro-with-attrs1.rs similarity index 98% rename from src/test/run-pass/macro-with-attrs1.rs rename to src/test/ui/run-pass/macros/macro-with-attrs1.rs index 99bf71b1f012..4b2413d2debc 100644 --- a/src/test/run-pass/macro-with-attrs1.rs +++ b/src/test/ui/run-pass/macros/macro-with-attrs1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: --cfg foo diff --git a/src/test/run-pass/macro-with-attrs2.rs b/src/test/ui/run-pass/macros/macro-with-attrs2.rs similarity index 98% rename from src/test/run-pass/macro-with-attrs2.rs rename to src/test/ui/run-pass/macros/macro-with-attrs2.rs index 062c8d55d529..37fc4ba6f2b3 100644 --- a/src/test/run-pass/macro-with-attrs2.rs +++ b/src/test/ui/run-pass/macros/macro-with-attrs2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[cfg(foo)] macro_rules! foo { () => (1) } diff --git a/src/test/run-pass/macro-with-braces-in-expr-position.rs b/src/test/ui/run-pass/macros/macro-with-braces-in-expr-position.rs similarity index 98% rename from src/test/run-pass/macro-with-braces-in-expr-position.rs rename to src/test/ui/run-pass/macros/macro-with-braces-in-expr-position.rs index c3fad3a19f92..830ec620fcae 100644 --- a/src/test/run-pass/macro-with-braces-in-expr-position.rs +++ b/src/test/ui/run-pass/macros/macro-with-braces-in-expr-position.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/macro_with_super_2.rs b/src/test/ui/run-pass/macros/macro_with_super_2.rs similarity index 98% rename from src/test/run-pass/macro_with_super_2.rs rename to src/test/ui/run-pass/macros/macro_with_super_2.rs index 9ecf186d5b11..2c984f86f0bf 100644 --- a/src/test/run-pass/macro_with_super_2.rs +++ b/src/test/ui/run-pass/macros/macro_with_super_2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:macro_with_super_1.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/macros-in-extern.rs b/src/test/ui/run-pass/macros/macros-in-extern.rs similarity index 98% rename from src/test/run-pass/macros-in-extern.rs rename to src/test/ui/run-pass/macros/macros-in-extern.rs index d9094934356f..2d3d2a9589c9 100644 --- a/src/test/run-pass/macros-in-extern.rs +++ b/src/test/ui/run-pass/macros/macros-in-extern.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32 #![feature(decl_macro, macros_in_extern)] diff --git a/src/test/run-pass/parse-complex-macro-invoc-op.rs b/src/test/ui/run-pass/macros/parse-complex-macro-invoc-op.rs similarity index 95% rename from src/test/run-pass/parse-complex-macro-invoc-op.rs rename to src/test/ui/run-pass/macros/parse-complex-macro-invoc-op.rs index e4c9fd9d8ef8..f0431b925702 100644 --- a/src/test/run-pass/parse-complex-macro-invoc-op.rs +++ b/src/test/ui/run-pass/macros/parse-complex-macro-invoc-op.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // Test parsing binary operators after macro invocations. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/paths-in-macro-invocations.rs b/src/test/ui/run-pass/macros/paths-in-macro-invocations.rs similarity index 98% rename from src/test/run-pass/paths-in-macro-invocations.rs rename to src/test/ui/run-pass/macros/paths-in-macro-invocations.rs index e860f7021e53..358c97d468b9 100644 --- a/src/test/run-pass/paths-in-macro-invocations.rs +++ b/src/test/ui/run-pass/macros/paths-in-macro-invocations.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:two_macros.rs extern crate two_macros; diff --git a/src/test/run-pass/pub-item-inside-macro.rs b/src/test/ui/run-pass/macros/pub-item-inside-macro.rs similarity index 98% rename from src/test/run-pass/pub-item-inside-macro.rs rename to src/test/ui/run-pass/macros/pub-item-inside-macro.rs index d082ca624e09..f17d0ac47b61 100644 --- a/src/test/run-pass/pub-item-inside-macro.rs +++ b/src/test/ui/run-pass/macros/pub-item-inside-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #14660 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/pub-method-inside-macro.rs b/src/test/ui/run-pass/macros/pub-method-inside-macro.rs similarity index 98% rename from src/test/run-pass/pub-method-inside-macro.rs rename to src/test/ui/run-pass/macros/pub-method-inside-macro.rs index 2e2e261b6d02..3bd48c11def5 100644 --- a/src/test/run-pass/pub-method-inside-macro.rs +++ b/src/test/ui/run-pass/macros/pub-method-inside-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #17436 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/semi-after-macro-ty.rs b/src/test/ui/run-pass/macros/semi-after-macro-ty.rs similarity index 97% rename from src/test/run-pass/semi-after-macro-ty.rs rename to src/test/ui/run-pass/macros/semi-after-macro-ty.rs index 2b4304252a12..1eaa8c492227 100644 --- a/src/test/run-pass/semi-after-macro-ty.rs +++ b/src/test/ui/run-pass/macros/semi-after-macro-ty.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! foo { ($t:ty; $p:path;) => {} } diff --git a/src/test/run-pass/stmt_expr_attr_macro_parse.rs b/src/test/ui/run-pass/macros/stmt_expr_attr_macro_parse.rs similarity index 98% rename from src/test/run-pass/stmt_expr_attr_macro_parse.rs rename to src/test/ui/run-pass/macros/stmt_expr_attr_macro_parse.rs index 23559e8789bf..faf02af53879 100644 --- a/src/test/run-pass/stmt_expr_attr_macro_parse.rs +++ b/src/test/ui/run-pass/macros/stmt_expr_attr_macro_parse.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! m { ($e:expr) => { "expr includes attr" diff --git a/src/test/run-pass/syntax-extension-cfg.rs b/src/test/ui/run-pass/macros/syntax-extension-cfg.rs similarity index 98% rename from src/test/run-pass/syntax-extension-cfg.rs rename to src/test/ui/run-pass/macros/syntax-extension-cfg.rs index c1d8713b20e6..f3b2f1df219d 100644 --- a/src/test/run-pass/syntax-extension-cfg.rs +++ b/src/test/ui/run-pass/macros/syntax-extension-cfg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: --cfg foo --cfg qux="foo" diff --git a/src/test/run-pass/syntax-extension-source-utils-files/includeme.fragment b/src/test/ui/run-pass/macros/syntax-extension-source-utils-files/includeme.fragment similarity index 100% rename from src/test/run-pass/syntax-extension-source-utils-files/includeme.fragment rename to src/test/ui/run-pass/macros/syntax-extension-source-utils-files/includeme.fragment diff --git a/src/test/run-pass/syntax-extension-source-utils.rs b/src/test/ui/run-pass/macros/syntax-extension-source-utils.rs similarity index 89% rename from src/test/run-pass/syntax-extension-source-utils.rs rename to src/test/ui/run-pass/macros/syntax-extension-source-utils.rs index 1b2741f14b63..ffa4adb01365 100644 --- a/src/test/run-pass/syntax-extension-source-utils.rs +++ b/src/test/ui/run-pass/macros/syntax-extension-source-utils.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // ignore-pretty issue #37195 pub mod m1 { @@ -21,9 +24,9 @@ pub mod m1 { macro_rules! indirect_line { () => ( line!() ) } pub fn main() { - assert_eq!(line!(), 24); + assert_eq!(line!(), 27); assert_eq!(column!(), 16); - assert_eq!(indirect_line!(), 26); + assert_eq!(indirect_line!(), 29); assert!((file!().ends_with("syntax-extension-source-utils.rs"))); assert_eq!(stringify!((2*3) + 5).to_string(), "( 2 * 3 ) + 5".to_string()); assert!(include!("syntax-extension-source-utils-files/includeme.\ @@ -40,5 +43,5 @@ pub fn main() { // The Windows tests are wrapped in an extra module for some reason assert!((m1::m2::where_am_i().ends_with("m1::m2"))); - assert_eq!((43, "( 2 * 3 ) + 5"), (line!(), stringify!((2*3) + 5))); + assert_eq!((46, "( 2 * 3 ) + 5"), (line!(), stringify!((2*3) + 5))); } diff --git a/src/test/run-pass/try-macro.rs b/src/test/ui/run-pass/macros/try-macro.rs similarity index 99% rename from src/test/run-pass/try-macro.rs rename to src/test/ui/run-pass/macros/try-macro.rs index a12e20702d29..4a8f55ac83c4 100644 --- a/src/test/run-pass/try-macro.rs +++ b/src/test/ui/run-pass/macros/try-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::num::{ParseFloatError, ParseIntError}; fn main() { diff --git a/src/test/run-pass/two-macro-use.rs b/src/test/ui/run-pass/macros/two-macro-use.rs similarity index 98% rename from src/test/run-pass/two-macro-use.rs rename to src/test/ui/run-pass/macros/two-macro-use.rs index 5df9d0222b4b..28c18d719910 100644 --- a/src/test/run-pass/two-macro-use.rs +++ b/src/test/ui/run-pass/macros/two-macro-use.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:two_macros.rs #[macro_use(macro_one)] diff --git a/src/test/run-pass/type-macros-hlist.rs b/src/test/ui/run-pass/macros/type-macros-hlist.rs similarity index 99% rename from src/test/run-pass/type-macros-hlist.rs rename to src/test/ui/run-pass/macros/type-macros-hlist.rs index 84c0983de80c..41d4cef07f2a 100644 --- a/src/test/run-pass/type-macros-hlist.rs +++ b/src/test/ui/run-pass/macros/type-macros-hlist.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::*; #[derive(Copy, Clone, Debug, Eq, Ord, PartialEq, PartialOrd)] diff --git a/src/test/run-pass/type-macros-simple.rs b/src/test/ui/run-pass/macros/type-macros-simple.rs similarity index 98% rename from src/test/run-pass/type-macros-simple.rs rename to src/test/ui/run-pass/macros/type-macros-simple.rs index 67b1d2c06e31..8f091ec192b6 100644 --- a/src/test/run-pass/type-macros-simple.rs +++ b/src/test/ui/run-pass/macros/type-macros-simple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass macro_rules! Tuple { { $A:ty,$B:ty } => { ($A, $B) } } diff --git a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs b/src/test/ui/run-pass/macros/typeck-macro-interaction-issue-8852.rs similarity index 98% rename from src/test/run-pass/typeck-macro-interaction-issue-8852.rs rename to src/test/ui/run-pass/macros/typeck-macro-interaction-issue-8852.rs index 696e151a80e8..31bf37ec0a9a 100644 --- a/src/test/run-pass/typeck-macro-interaction-issue-8852.rs +++ b/src/test/ui/run-pass/macros/typeck-macro-interaction-issue-8852.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum T { A(isize), diff --git a/src/test/run-pass/use-macro-self.rs b/src/test/ui/run-pass/macros/use-macro-self.rs similarity index 98% rename from src/test/run-pass/use-macro-self.rs rename to src/test/ui/run-pass/macros/use-macro-self.rs index 66ab00da7f4a..fb816f9e78f7 100644 --- a/src/test/run-pass/use-macro-self.rs +++ b/src/test/ui/run-pass/macros/use-macro-self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:use-macro-self.rs #[macro_use] diff --git a/src/test/run-pass/auxiliary/method_self_arg1.rs b/src/test/ui/run-pass/methods/auxiliary/method_self_arg1.rs similarity index 100% rename from src/test/run-pass/auxiliary/method_self_arg1.rs rename to src/test/ui/run-pass/methods/auxiliary/method_self_arg1.rs diff --git a/src/test/run-pass/auxiliary/method_self_arg2.rs b/src/test/ui/run-pass/methods/auxiliary/method_self_arg2.rs similarity index 100% rename from src/test/run-pass/auxiliary/method_self_arg2.rs rename to src/test/ui/run-pass/methods/auxiliary/method_self_arg2.rs diff --git a/src/test/run-pass/method-argument-inference-associated-type.rs b/src/test/ui/run-pass/methods/method-argument-inference-associated-type.rs similarity index 98% rename from src/test/run-pass/method-argument-inference-associated-type.rs rename to src/test/ui/run-pass/methods/method-argument-inference-associated-type.rs index 76b8cf92329d..0db38516cb9a 100644 --- a/src/test/run-pass/method-argument-inference-associated-type.rs +++ b/src/test/ui/run-pass/methods/method-argument-inference-associated-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub struct ClientMap; pub struct ClientMap2; diff --git a/src/test/run-pass/method-attributes.rs b/src/test/ui/run-pass/methods/method-attributes.rs similarity index 95% rename from src/test/run-pass/method-attributes.rs rename to src/test/ui/run-pass/methods/method-attributes.rs index 400ecda411e1..b1afbd8d11c8 100644 --- a/src/test/run-pass/method-attributes.rs +++ b/src/test/ui/run-pass/methods/method-attributes.rs @@ -8,10 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pp-exact - Make sure we print all the attributes // pretty-expanded FIXME #23616 -#![allow(unused_attribute)] #![feature(custom_attribute)] #[frobable] diff --git a/src/test/run-pass/method-early-bound-lifetimes-on-self.rs b/src/test/ui/run-pass/methods/method-early-bound-lifetimes-on-self.rs similarity index 98% rename from src/test/run-pass/method-early-bound-lifetimes-on-self.rs rename to src/test/ui/run-pass/methods/method-early-bound-lifetimes-on-self.rs index 3babb543bf2a..f98a35bb9e31 100644 --- a/src/test/run-pass/method-early-bound-lifetimes-on-self.rs +++ b/src/test/ui/run-pass/methods/method-early-bound-lifetimes-on-self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that we successfully handle methods where the `self` type has // an early-bound lifetime. Issue #18208. diff --git a/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs b/src/test/ui/run-pass/methods/method-mut-self-modifies-mut-slice-lvalue.rs similarity index 99% rename from src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs rename to src/test/ui/run-pass/methods/method-mut-self-modifies-mut-slice-lvalue.rs index 220482f57eb0..7e6f0d9e27bd 100644 --- a/src/test/run-pass/method-mut-self-modifies-mut-slice-lvalue.rs +++ b/src/test/ui/run-pass/methods/method-mut-self-modifies-mut-slice-lvalue.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that an `&mut self` method, when invoked on a place whose // type is `&mut [u8]`, passes in a pointer to the place and not a // temporary. Issue #19147. diff --git a/src/test/run-pass/method-normalize-bounds-issue-20604.rs b/src/test/ui/run-pass/methods/method-normalize-bounds-issue-20604.rs similarity index 97% rename from src/test/run-pass/method-normalize-bounds-issue-20604.rs rename to src/test/ui/run-pass/methods/method-normalize-bounds-issue-20604.rs index 3a1ce74a64c0..a56e5b5170d9 100644 --- a/src/test/run-pass/method-normalize-bounds-issue-20604.rs +++ b/src/test/ui/run-pass/methods/method-normalize-bounds-issue-20604.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // Test that we handle projection types which wind up important for // resolving methods. This test was reduced from a larger example; the // call to `foo()` at the end was failing to resolve because the diff --git a/src/test/run-pass/method-projection.rs b/src/test/ui/run-pass/methods/method-projection.rs similarity index 99% rename from src/test/run-pass/method-projection.rs rename to src/test/ui/run-pass/methods/method-projection.rs index 41d92cc75937..a997c8ffbfb0 100644 --- a/src/test/run-pass/method-projection.rs +++ b/src/test/ui/run-pass/methods/method-projection.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can use method notation to call methods based on a // projection bound from a trait. Issue #20469. diff --git a/src/test/run-pass/method-recursive-blanket-impl.rs b/src/test/ui/run-pass/methods/method-recursive-blanket-impl.rs similarity index 98% rename from src/test/run-pass/method-recursive-blanket-impl.rs rename to src/test/ui/run-pass/methods/method-recursive-blanket-impl.rs index 6877bf376a65..d1cd974070fb 100644 --- a/src/test/run-pass/method-recursive-blanket-impl.rs +++ b/src/test/ui/run-pass/methods/method-recursive-blanket-impl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we don't trigger on the blanket impl for all `&'a T` but // rather keep autoderefing and trigger on the underlying impl. To // know not to stop at the blanket, we have to recursively evaluate diff --git a/src/test/run-pass/method-self-arg-aux1.rs b/src/test/ui/run-pass/methods/method-self-arg-aux1.rs similarity index 98% rename from src/test/run-pass/method-self-arg-aux1.rs rename to src/test/ui/run-pass/methods/method-self-arg-aux1.rs index 2572baf68fd1..c56a69ae4cda 100644 --- a/src/test/run-pass/method-self-arg-aux1.rs +++ b/src/test/ui/run-pass/methods/method-self-arg-aux1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test method calls with self as an argument (cross-crate) #![feature(box_syntax)] diff --git a/src/test/run-pass/method-self-arg-aux2.rs b/src/test/ui/run-pass/methods/method-self-arg-aux2.rs similarity index 98% rename from src/test/run-pass/method-self-arg-aux2.rs rename to src/test/ui/run-pass/methods/method-self-arg-aux2.rs index 51de69ff01f0..1dffa813ceb0 100644 --- a/src/test/run-pass/method-self-arg-aux2.rs +++ b/src/test/ui/run-pass/methods/method-self-arg-aux2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test method calls with self as an argument (cross-crate) #![feature(box_syntax)] diff --git a/src/test/run-pass/method-self-arg-trait.rs b/src/test/ui/run-pass/methods/method-self-arg-trait.rs similarity index 99% rename from src/test/run-pass/method-self-arg-trait.rs rename to src/test/ui/run-pass/methods/method-self-arg-trait.rs index 34e849bd0d2d..9429d69a156a 100644 --- a/src/test/run-pass/method-self-arg-trait.rs +++ b/src/test/ui/run-pass/methods/method-self-arg-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test method calls with self as an argument #![feature(box_syntax)] diff --git a/src/test/run-pass/method-self-arg.rs b/src/test/ui/run-pass/methods/method-self-arg.rs similarity index 99% rename from src/test/run-pass/method-self-arg.rs rename to src/test/ui/run-pass/methods/method-self-arg.rs index b7fb2fa138da..38e8dfe3e4b2 100644 --- a/src/test/run-pass/method-self-arg.rs +++ b/src/test/ui/run-pass/methods/method-self-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test method calls with self as an argument #![feature(box_syntax)] diff --git a/src/test/run-pass/method-two-trait-defer-resolution-1.rs b/src/test/ui/run-pass/methods/method-two-trait-defer-resolution-1.rs similarity index 95% rename from src/test/run-pass/method-two-trait-defer-resolution-1.rs rename to src/test/ui/run-pass/methods/method-two-trait-defer-resolution-1.rs index ff80ee198681..bb1b90ebfdf8 100644 --- a/src/test/run-pass/method-two-trait-defer-resolution-1.rs +++ b/src/test/ui/run-pass/methods/method-two-trait-defer-resolution-1.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // Test that we pick which version of `foo` to run based on the // type that is (ultimately) inferred for `x`. diff --git a/src/test/run-pass/method-two-trait-defer-resolution-2.rs b/src/test/ui/run-pass/methods/method-two-trait-defer-resolution-2.rs similarity index 99% rename from src/test/run-pass/method-two-trait-defer-resolution-2.rs rename to src/test/ui/run-pass/methods/method-two-trait-defer-resolution-2.rs index f403f5260395..3550326327dd 100644 --- a/src/test/run-pass/method-two-trait-defer-resolution-2.rs +++ b/src/test/ui/run-pass/methods/method-two-trait-defer-resolution-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that when we write `x.foo()`, we do not have to know the // complete type of `x` in order to type-check the method call. In // this case, we know that `x: Vec<_1>`, but we don't know what type diff --git a/src/test/run-pass/method-two-traits-distinguished-via-where-clause.rs b/src/test/ui/run-pass/methods/method-two-traits-distinguished-via-where-clause.rs similarity index 98% rename from src/test/run-pass/method-two-traits-distinguished-via-where-clause.rs rename to src/test/ui/run-pass/methods/method-two-traits-distinguished-via-where-clause.rs index 3f0f4f357453..89ac0fc890c4 100644 --- a/src/test/run-pass/method-two-traits-distinguished-via-where-clause.rs +++ b/src/test/ui/run-pass/methods/method-two-traits-distinguished-via-where-clause.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we select between traits A and B. To do that, we must // consider the `Sized` bound. diff --git a/src/test/run-pass/method-where-clause.rs b/src/test/ui/run-pass/methods/method-where-clause.rs similarity index 98% rename from src/test/run-pass/method-where-clause.rs rename to src/test/ui/run-pass/methods/method-where-clause.rs index 078dbe0e79e7..721de2bf8e16 100644 --- a/src/test/run-pass/method-where-clause.rs +++ b/src/test/ui/run-pass/methods/method-where-clause.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can use method notation to call methods based on a // where clause type, and not only type parameters. diff --git a/src/test/run-pass/auxiliary/mir_external_refs.rs b/src/test/ui/run-pass/mir/auxiliary/mir_external_refs.rs similarity index 100% rename from src/test/run-pass/auxiliary/mir_external_refs.rs rename to src/test/ui/run-pass/mir/auxiliary/mir_external_refs.rs diff --git a/src/test/run-pass/mir-inlining/ice-issue-45493.rs b/src/test/ui/run-pass/mir/mir-inlining/ice-issue-45493.rs similarity index 98% rename from src/test/run-pass/mir-inlining/ice-issue-45493.rs rename to src/test/ui/run-pass/mir/mir-inlining/ice-issue-45493.rs index bd178f0e5bda..85323d56616d 100644 --- a/src/test/run-pass/mir-inlining/ice-issue-45493.rs +++ b/src/test/ui/run-pass/mir/mir-inlining/ice-issue-45493.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:-Zmir-opt-level=2 trait Array { diff --git a/src/test/run-pass/mir-inlining/ice-issue-45885.rs b/src/test/ui/run-pass/mir/mir-inlining/ice-issue-45885.rs similarity index 98% rename from src/test/run-pass/mir-inlining/ice-issue-45885.rs rename to src/test/ui/run-pass/mir/mir-inlining/ice-issue-45885.rs index 702cb6a9bc16..f5401279c897 100644 --- a/src/test/run-pass/mir-inlining/ice-issue-45885.rs +++ b/src/test/ui/run-pass/mir/mir-inlining/ice-issue-45885.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:-Zmir-opt-level=2 pub enum Enum { diff --git a/src/test/run-pass/mir-inlining/no-trait-method-issue-40473.rs b/src/test/ui/run-pass/mir/mir-inlining/no-trait-method-issue-40473.rs similarity index 98% rename from src/test/run-pass/mir-inlining/no-trait-method-issue-40473.rs rename to src/test/ui/run-pass/mir/mir-inlining/no-trait-method-issue-40473.rs index 11a29d974175..ff5bf4e75a34 100644 --- a/src/test/run-pass/mir-inlining/no-trait-method-issue-40473.rs +++ b/src/test/ui/run-pass/mir/mir-inlining/no-trait-method-issue-40473.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags:-Zmir-opt-level=2 pub trait Foo { fn bar(&self) -> usize { 2 } diff --git a/src/test/run-pass/mir-typeck-normalize-fn-sig.rs b/src/test/ui/run-pass/mir/mir-typeck-normalize-fn-sig.rs similarity index 98% rename from src/test/run-pass/mir-typeck-normalize-fn-sig.rs rename to src/test/ui/run-pass/mir/mir-typeck-normalize-fn-sig.rs index 11918d3739d4..3fc2ce44eaaf 100644 --- a/src/test/run-pass/mir-typeck-normalize-fn-sig.rs +++ b/src/test/ui/run-pass/mir/mir-typeck-normalize-fn-sig.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This code was creating an ICE in the MIR type checker. The reason // is that we are reifying a reference to a function (`foo::<'x>`), // which involves extracting its signature, but we were not diff --git a/src/test/run-pass/mir_adt_construction.rs b/src/test/ui/run-pass/mir/mir_adt_construction.rs similarity index 99% rename from src/test/run-pass/mir_adt_construction.rs rename to src/test/ui/run-pass/mir/mir_adt_construction.rs index eb96d94efec9..066edfef0ad6 100644 --- a/src/test/run-pass/mir_adt_construction.rs +++ b/src/test/ui/run-pass/mir/mir_adt_construction.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::fmt; #[repr(C)] diff --git a/src/test/run-pass/mir_ascription_coercion.rs b/src/test/ui/run-pass/mir/mir_ascription_coercion.rs similarity index 98% rename from src/test/run-pass/mir_ascription_coercion.rs rename to src/test/ui/run-pass/mir/mir_ascription_coercion.rs index bc1013429aa5..f52467e5ae80 100644 --- a/src/test/run-pass/mir_ascription_coercion.rs +++ b/src/test/ui/run-pass/mir/mir_ascription_coercion.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that the result of type ascription has adjustments applied #![feature(type_ascription)] diff --git a/src/test/run-pass/mir_augmented_assignments.rs b/src/test/ui/run-pass/mir/mir_augmented_assignments.rs similarity index 99% rename from src/test/run-pass/mir_augmented_assignments.rs rename to src/test/ui/run-pass/mir/mir_augmented_assignments.rs index bb90f25fce5f..dfc6a0161855 100644 --- a/src/test/run-pass/mir_augmented_assignments.rs +++ b/src/test/ui/run-pass/mir/mir_augmented_assignments.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; use std::ops::{ AddAssign, BitAndAssign, BitOrAssign, BitXorAssign, DivAssign, MulAssign, RemAssign, diff --git a/src/test/run-pass/mir_autoderef.rs b/src/test/ui/run-pass/mir/mir_autoderef.rs similarity index 98% rename from src/test/run-pass/mir_autoderef.rs rename to src/test/ui/run-pass/mir/mir_autoderef.rs index f0032fee2835..c2d7e6d99ee8 100644 --- a/src/test/run-pass/mir_autoderef.rs +++ b/src/test/ui/run-pass/mir/mir_autoderef.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::{Deref, DerefMut}; pub struct MyRef(u32); diff --git a/src/test/run-pass/mir_boxing.rs b/src/test/ui/run-pass/mir/mir_boxing.rs similarity index 97% rename from src/test/run-pass/mir_boxing.rs rename to src/test/ui/run-pass/mir/mir_boxing.rs index 1c5134755d7a..31b10975a4a9 100644 --- a/src/test/run-pass/mir_boxing.rs +++ b/src/test/ui/run-pass/mir/mir_boxing.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn test() -> Box { diff --git a/src/test/run-pass/mir_build_match_comparisons.rs b/src/test/ui/run-pass/mir/mir_build_match_comparisons.rs similarity index 99% rename from src/test/run-pass/mir_build_match_comparisons.rs rename to src/test/ui/run-pass/mir/mir_build_match_comparisons.rs index b195ff63412a..45ac6566637a 100644 --- a/src/test/run-pass/mir_build_match_comparisons.rs +++ b/src/test/ui/run-pass/mir/mir_build_match_comparisons.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn test1(x: i8) -> i32 { match x { 1...10 => 0, diff --git a/src/test/run-pass/mir_call_with_associated_type.rs b/src/test/ui/run-pass/mir/mir_call_with_associated_type.rs similarity index 98% rename from src/test/run-pass/mir_call_with_associated_type.rs rename to src/test/ui/run-pass/mir/mir_call_with_associated_type.rs index 935d0e58985d..1d960d1b716d 100644 --- a/src/test/run-pass/mir_call_with_associated_type.rs +++ b/src/test/ui/run-pass/mir/mir_call_with_associated_type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Trait { type Type; } diff --git a/src/test/run-pass/mir_calls_to_shims.rs b/src/test/ui/run-pass/mir/mir_calls_to_shims.rs similarity index 99% rename from src/test/run-pass/mir_calls_to_shims.rs rename to src/test/ui/run-pass/mir/mir_calls_to_shims.rs index 9641ed282936..d9cdec406945 100644 --- a/src/test/run-pass/mir_calls_to_shims.rs +++ b/src/test/ui/run-pass/mir/mir_calls_to_shims.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare compiled with panic=abort by default #![feature(fn_traits)] diff --git a/src/test/run-pass/mir_cast_fn_ret.rs b/src/test/ui/run-pass/mir/mir_cast_fn_ret.rs similarity index 98% rename from src/test/run-pass/mir_cast_fn_ret.rs rename to src/test/ui/run-pass/mir/mir_cast_fn_ret.rs index 311d5451eb6d..d2d291208555 100644 --- a/src/test/run-pass/mir_cast_fn_ret.rs +++ b/src/test/ui/run-pass/mir/mir_cast_fn_ret.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub extern "C" fn tuple2() -> (u16, u8) { (1, 2) } diff --git a/src/test/run-pass/mir_codegen_array.rs b/src/test/ui/run-pass/mir/mir_codegen_array.rs similarity index 98% rename from src/test/run-pass/mir_codegen_array.rs rename to src/test/ui/run-pass/mir/mir_codegen_array.rs index b7f247012ce1..a0cd3c8dd125 100644 --- a/src/test/run-pass/mir_codegen_array.rs +++ b/src/test/ui/run-pass/mir/mir_codegen_array.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn into_inner() -> [u64; 1024] { let mut x = 10 + 20; [x; 1024] diff --git a/src/test/run-pass/mir_codegen_array_2.rs b/src/test/ui/run-pass/mir/mir_codegen_array_2.rs similarity index 98% rename from src/test/run-pass/mir_codegen_array_2.rs rename to src/test/ui/run-pass/mir/mir_codegen_array_2.rs index c7133fb0c0e4..2734bc71b588 100644 --- a/src/test/run-pass/mir_codegen_array_2.rs +++ b/src/test/ui/run-pass/mir/mir_codegen_array_2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn into_inner(x: u64) -> [u64; 1024] { [x; 2*4*8*16] } diff --git a/src/test/run-pass/mir_codegen_call_converging.rs b/src/test/ui/run-pass/mir/mir_codegen_call_converging.rs similarity index 98% rename from src/test/run-pass/mir_codegen_call_converging.rs rename to src/test/ui/run-pass/mir/mir_codegen_call_converging.rs index 7d420bb86c60..d7bce4d5be3c 100644 --- a/src/test/run-pass/mir_codegen_call_converging.rs +++ b/src/test/ui/run-pass/mir/mir_codegen_call_converging.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn converging_fn() -> u64 { 43 } diff --git a/src/test/run-pass/mir_codegen_calls.rs b/src/test/ui/run-pass/mir/mir_codegen_calls.rs similarity index 99% rename from src/test/run-pass/mir_codegen_calls.rs rename to src/test/ui/run-pass/mir/mir_codegen_calls.rs index d02e3287bc38..33ffab404280 100644 --- a/src/test/run-pass/mir_codegen_calls.rs +++ b/src/test/ui/run-pass/mir/mir_codegen_calls.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(fn_traits, test)] extern crate test; diff --git a/src/test/run-pass/mir_codegen_calls_variadic.rs b/src/test/ui/run-pass/mir/mir_codegen_calls_variadic.rs similarity index 98% rename from src/test/run-pass/mir_codegen_calls_variadic.rs rename to src/test/ui/run-pass/mir/mir_codegen_calls_variadic.rs index 7845c9426e23..ee32f2d0e0f9 100644 --- a/src/test/run-pass/mir_codegen_calls_variadic.rs +++ b/src/test/ui/run-pass/mir/mir_codegen_calls_variadic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc to test ffi with #[link(name = "rust_test_helpers", kind = "static")] diff --git a/src/test/run-pass/mir_codegen_critical_edge.rs b/src/test/ui/run-pass/mir/mir_codegen_critical_edge.rs similarity index 99% rename from src/test/run-pass/mir_codegen_critical_edge.rs rename to src/test/ui/run-pass/mir/mir_codegen_critical_edge.rs index c742e71633fc..48a5d6ab0f02 100644 --- a/src/test/run-pass/mir_codegen_critical_edge.rs +++ b/src/test/ui/run-pass/mir/mir_codegen_critical_edge.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This code produces a CFG with critical edges that, if we don't // handle properly, will cause invalid codegen. diff --git a/src/test/run-pass/mir_codegen_spike1.rs b/src/test/ui/run-pass/mir/mir_codegen_spike1.rs similarity index 98% rename from src/test/run-pass/mir_codegen_spike1.rs rename to src/test/ui/run-pass/mir/mir_codegen_spike1.rs index 27e1583af34a..0317aa0b5099 100644 --- a/src/test/run-pass/mir_codegen_spike1.rs +++ b/src/test/ui/run-pass/mir/mir_codegen_spike1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A simple spike test for MIR version of codegen. fn sum(x: i32, y: i32) -> i32 { diff --git a/src/test/run-pass/mir_codegen_switch.rs b/src/test/ui/run-pass/mir/mir_codegen_switch.rs similarity index 98% rename from src/test/run-pass/mir_codegen_switch.rs rename to src/test/ui/run-pass/mir/mir_codegen_switch.rs index b097bf46ad37..d793337925df 100644 --- a/src/test/run-pass/mir_codegen_switch.rs +++ b/src/test/ui/run-pass/mir/mir_codegen_switch.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Abc { A(u8), B(i8), diff --git a/src/test/run-pass/mir_codegen_switchint.rs b/src/test/ui/run-pass/mir/mir_codegen_switchint.rs similarity index 98% rename from src/test/run-pass/mir_codegen_switchint.rs rename to src/test/ui/run-pass/mir/mir_codegen_switchint.rs index 537734596a52..ef0a98a6e707 100644 --- a/src/test/run-pass/mir_codegen_switchint.rs +++ b/src/test/ui/run-pass/mir/mir_codegen_switchint.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn foo(x: i8) -> i32 { match x { 1 => 0, diff --git a/src/test/run-pass/mir_coercion_casts.rs b/src/test/ui/run-pass/mir/mir_coercion_casts.rs similarity index 98% rename from src/test/run-pass/mir_coercion_casts.rs rename to src/test/ui/run-pass/mir/mir_coercion_casts.rs index 2be2854fac95..3de87029e0fc 100644 --- a/src/test/run-pass/mir_coercion_casts.rs +++ b/src/test/ui/run-pass/mir/mir_coercion_casts.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests the coercion casts are handled properly fn main() { diff --git a/src/test/run-pass/mir_coercions.rs b/src/test/ui/run-pass/mir/mir_coercions.rs similarity index 99% rename from src/test/run-pass/mir_coercions.rs rename to src/test/ui/run-pass/mir/mir_coercions.rs index 79d1cfde7cd5..79a8030e9b5f 100644 --- a/src/test/run-pass/mir_coercions.rs +++ b/src/test/ui/run-pass/mir/mir_coercions.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(coerce_unsized, unsize)] use std::ops::CoerceUnsized; diff --git a/src/test/run-pass/mir_constval_adts.rs b/src/test/ui/run-pass/mir/mir_constval_adts.rs similarity index 99% rename from src/test/run-pass/mir_constval_adts.rs rename to src/test/ui/run-pass/mir/mir_constval_adts.rs index 696ff8a7e600..d35dd9c441b0 100644 --- a/src/test/run-pass/mir_constval_adts.rs +++ b/src/test/ui/run-pass/mir/mir_constval_adts.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] struct Point { _x: i32, diff --git a/src/test/run-pass/mir_drop_order.rs b/src/test/ui/run-pass/mir/mir_drop_order.rs similarity index 99% rename from src/test/run-pass/mir_drop_order.rs rename to src/test/ui/run-pass/mir/mir_drop_order.rs index 7ab133bbab4e..abc21eee636f 100644 --- a/src/test/run-pass/mir_drop_order.rs +++ b/src/test/ui/run-pass/mir/mir_drop_order.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare compiled with panic=abort by default use std::cell::RefCell; diff --git a/src/test/run-pass/mir_early_return_scope.rs b/src/test/ui/run-pass/mir/mir_early_return_scope.rs similarity index 98% rename from src/test/run-pass/mir_early_return_scope.rs rename to src/test/ui/run-pass/mir/mir_early_return_scope.rs index c27e57358b09..27b907223286 100644 --- a/src/test/run-pass/mir_early_return_scope.rs +++ b/src/test/ui/run-pass/mir/mir_early_return_scope.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass static mut DROP: bool = false; struct ConnWrap(Conn); diff --git a/src/test/run-pass/mir_fat_ptr.rs b/src/test/ui/run-pass/mir/mir_fat_ptr.rs similarity index 99% rename from src/test/run-pass/mir_fat_ptr.rs rename to src/test/ui/run-pass/mir/mir_fat_ptr.rs index e5c9e3577d1c..b3facb3b4c46 100644 --- a/src/test/run-pass/mir_fat_ptr.rs +++ b/src/test/ui/run-pass/mir/mir_fat_ptr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // test that ordinary fat pointer operations work. struct Wrapper(u32, T); diff --git a/src/test/run-pass/mir_fat_ptr_drop.rs b/src/test/ui/run-pass/mir/mir_fat_ptr_drop.rs similarity index 96% rename from src/test/run-pass/mir_fat_ptr_drop.rs rename to src/test/ui/run-pass/mir/mir_fat_ptr_drop.rs index 64e68c78c3ca..84528b3296aa 100644 --- a/src/test/run-pass/mir_fat_ptr_drop.rs +++ b/src/test/ui/run-pass/mir/mir_fat_ptr_drop.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // test that ordinary fat pointer operations work. #![feature(braced_empty_structs)] diff --git a/src/test/run-pass/mir_heavy_promoted.rs b/src/test/ui/run-pass/mir/mir_heavy_promoted.rs similarity index 98% rename from src/test/run-pass/mir_heavy_promoted.rs rename to src/test/ui/run-pass/mir/mir_heavy_promoted.rs index b50852175776..2f788f1408d9 100644 --- a/src/test/run-pass/mir_heavy_promoted.rs +++ b/src/test/ui/run-pass/mir/mir_heavy_promoted.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten apparently only works in optimized mode const TEST_DATA: [u8; 32 * 1024 * 1024] = [42; 32 * 1024 * 1024]; diff --git a/src/test/run-pass/mir_match_arm_guard.rs b/src/test/ui/run-pass/mir/mir_match_arm_guard.rs similarity index 98% rename from src/test/run-pass/mir_match_arm_guard.rs rename to src/test/ui/run-pass/mir/mir_match_arm_guard.rs index 487999e6ed62..b53f85350794 100644 --- a/src/test/run-pass/mir_match_arm_guard.rs +++ b/src/test/ui/run-pass/mir/mir_match_arm_guard.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // #30527 - We were not generating arms with guards in certain cases. fn match_with_guard(x: Option) -> i8 { diff --git a/src/test/run-pass/mir_misc_casts.rs b/src/test/ui/run-pass/mir/mir_misc_casts.rs similarity index 99% rename from src/test/run-pass/mir_misc_casts.rs rename to src/test/ui/run-pass/mir/mir_misc_casts.rs index 81c8b75fb9b6..081814edcd1b 100644 --- a/src/test/run-pass/mir_misc_casts.rs +++ b/src/test/ui/run-pass/mir/mir_misc_casts.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn func(){} const STR: &'static str = "hello"; diff --git a/src/test/run-pass/mir_overflow_off.rs b/src/test/ui/run-pass/mir/mir_overflow_off.rs similarity index 98% rename from src/test/run-pass/mir_overflow_off.rs rename to src/test/ui/run-pass/mir/mir_overflow_off.rs index a2cfca01dacb..9d6624b53d09 100644 --- a/src/test/run-pass/mir_overflow_off.rs +++ b/src/test/ui/run-pass/mir/mir_overflow_off.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -Z force-overflow-checks=off // Test that with MIR codegen, overflow checks can be diff --git a/src/test/run-pass/mir_raw_fat_ptr.rs b/src/test/ui/run-pass/mir/mir_raw_fat_ptr.rs similarity index 99% rename from src/test/run-pass/mir_raw_fat_ptr.rs rename to src/test/ui/run-pass/mir/mir_raw_fat_ptr.rs index 846318ec4fd3..b5ae15b2ce11 100644 --- a/src/test/run-pass/mir_raw_fat_ptr.rs +++ b/src/test/ui/run-pass/mir/mir_raw_fat_ptr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // check raw fat pointer ops in mir // FIXME: please improve this when we get monomorphization support diff --git a/src/test/run-pass/mir_refs_correct.rs b/src/test/ui/run-pass/mir/mir_refs_correct.rs similarity index 99% rename from src/test/run-pass/mir_refs_correct.rs rename to src/test/ui/run-pass/mir/mir_refs_correct.rs index df90fe2b7918..1166b6188c24 100644 --- a/src/test/run-pass/mir_refs_correct.rs +++ b/src/test/ui/run-pass/mir/mir_refs_correct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:mir_external_refs.rs extern crate mir_external_refs as ext; diff --git a/src/test/run-pass/mir_small_agg_arg.rs b/src/test/ui/run-pass/mir/mir_small_agg_arg.rs similarity index 97% rename from src/test/run-pass/mir_small_agg_arg.rs rename to src/test/ui/run-pass/mir/mir_small_agg_arg.rs index 639a585ae001..48eae959b4e2 100644 --- a/src/test/run-pass/mir_small_agg_arg.rs +++ b/src/test/ui/run-pass/mir/mir_small_agg_arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo((x, y): (i8, i8)) { } diff --git a/src/test/run-pass/mir_struct_with_assoc_ty.rs b/src/test/ui/run-pass/mir/mir_struct_with_assoc_ty.rs similarity index 98% rename from src/test/run-pass/mir_struct_with_assoc_ty.rs rename to src/test/ui/run-pass/mir/mir_struct_with_assoc_ty.rs index 7b2514c27c8c..f94b44a1eea6 100644 --- a/src/test/run-pass/mir_struct_with_assoc_ty.rs +++ b/src/test/ui/run-pass/mir/mir_struct_with_assoc_ty.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::marker::PhantomData; pub trait DataBind { diff --git a/src/test/run-pass/mir_temp_promotions.rs b/src/test/ui/run-pass/mir/mir_temp_promotions.rs similarity index 98% rename from src/test/run-pass/mir_temp_promotions.rs rename to src/test/ui/run-pass/mir/mir_temp_promotions.rs index 4865e955091f..ba3e85a0dcfb 100644 --- a/src/test/run-pass/mir_temp_promotions.rs +++ b/src/test/ui/run-pass/mir/mir_temp_promotions.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn test1(f: f32) -> bool { // test that we properly promote temporaries to allocas when a temporary is assigned to // multiple times (assignment is still happening once ∀ possible dataflows). diff --git a/src/test/run-pass/mir_void_return.rs b/src/test/ui/run-pass/mir/mir_void_return.rs similarity index 98% rename from src/test/run-pass/mir_void_return.rs rename to src/test/ui/run-pass/mir/mir_void_return.rs index 78cb9fb39d6a..c984bfd8cb1b 100644 --- a/src/test/run-pass/mir_void_return.rs +++ b/src/test/ui/run-pass/mir/mir_void_return.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn mir() -> (){ let x = 1; let mut y = 0; diff --git a/src/test/run-pass/mir_void_return_2.rs b/src/test/ui/run-pass/mir/mir_void_return_2.rs similarity index 97% rename from src/test/run-pass/mir_void_return_2.rs rename to src/test/ui/run-pass/mir/mir_void_return_2.rs index fc9e3d5e3b53..fbe457fdd837 100644 --- a/src/test/run-pass/mir_void_return_2.rs +++ b/src/test/ui/run-pass/mir/mir_void_return_2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn nil() {} fn mir(){ diff --git a/src/test/run-pass/auxiliary/two_macros_2.rs b/src/test/ui/run-pass/modules/auxiliary/two_macros_2.rs similarity index 100% rename from src/test/run-pass/auxiliary/two_macros_2.rs rename to src/test/ui/run-pass/modules/auxiliary/two_macros_2.rs diff --git a/src/test/run-pass/mod-inside-fn.rs b/src/test/ui/run-pass/modules/mod-inside-fn.rs similarity index 98% rename from src/test/run-pass/mod-inside-fn.rs rename to src/test/ui/run-pass/modules/mod-inside-fn.rs index 6b922634aade..da7a3d97c10b 100644 --- a/src/test/run-pass/mod-inside-fn.rs +++ b/src/test/ui/run-pass/modules/mod-inside-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn f() -> isize { mod m { diff --git a/src/test/run-pass/mod-view-items.rs b/src/test/ui/run-pass/modules/mod-view-items.rs similarity index 98% rename from src/test/run-pass/mod-view-items.rs rename to src/test/ui/run-pass/modules/mod-view-items.rs index ba23197b83c7..ecca9c7ce95d 100644 --- a/src/test/run-pass/mod-view-items.rs +++ b/src/test/ui/run-pass/modules/mod-view-items.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test view items inside non-file-level mods // This is a regression test for an issue where we were failing to diff --git a/src/test/run-pass/mod_dir_implicit.rs b/src/test/ui/run-pass/modules/mod_dir_implicit.rs similarity index 98% rename from src/test/run-pass/mod_dir_implicit.rs rename to src/test/ui/run-pass/modules/mod_dir_implicit.rs index f8034f9e0738..e9a1d6cfa29c 100644 --- a/src/test/run-pass/mod_dir_implicit.rs +++ b/src/test/ui/run-pass/modules/mod_dir_implicit.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37195 mod mod_dir_implicit_aux; diff --git a/src/test/run-pass/mod_dir_implicit_aux/compiletest-ignore-dir b/src/test/ui/run-pass/modules/mod_dir_implicit_aux/compiletest-ignore-dir similarity index 100% rename from src/test/run-pass/mod_dir_implicit_aux/compiletest-ignore-dir rename to src/test/ui/run-pass/modules/mod_dir_implicit_aux/compiletest-ignore-dir diff --git a/src/test/run-pass/mod_dir_implicit_aux/mod.rs b/src/test/ui/run-pass/modules/mod_dir_implicit_aux/mod.rs similarity index 97% rename from src/test/run-pass/mod_dir_implicit_aux/mod.rs rename to src/test/ui/run-pass/modules/mod_dir_implicit_aux/mod.rs index 58c1beee3be7..8687b33cac3e 100644 --- a/src/test/run-pass/mod_dir_implicit_aux/mod.rs +++ b/src/test/ui/run-pass/modules/mod_dir_implicit_aux/mod.rs @@ -8,4 +8,5 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn foo() -> isize { 10 } diff --git a/src/test/run-pass/mod_dir_path.rs b/src/test/ui/run-pass/modules/mod_dir_path.rs similarity index 98% rename from src/test/run-pass/mod_dir_path.rs rename to src/test/ui/run-pass/modules/mod_dir_path.rs index fc91ea870d51..d614b2fb8605 100644 --- a/src/test/run-pass/mod_dir_path.rs +++ b/src/test/ui/run-pass/modules/mod_dir_path.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37195 mod mod_dir_simple { diff --git a/src/test/run-pass/mod_dir_path2.rs b/src/test/ui/run-pass/modules/mod_dir_path2.rs similarity index 98% rename from src/test/run-pass/mod_dir_path2.rs rename to src/test/ui/run-pass/modules/mod_dir_path2.rs index b96c1ae07224..9b116d534d97 100644 --- a/src/test/run-pass/mod_dir_path2.rs +++ b/src/test/ui/run-pass/modules/mod_dir_path2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37195 #[path = "mod_dir_simple"] diff --git a/src/test/run-pass/mod_dir_path3.rs b/src/test/ui/run-pass/modules/mod_dir_path3.rs similarity index 98% rename from src/test/run-pass/mod_dir_path3.rs rename to src/test/ui/run-pass/modules/mod_dir_path3.rs index 3160064d7c24..5bdf2ca2e594 100644 --- a/src/test/run-pass/mod_dir_path3.rs +++ b/src/test/ui/run-pass/modules/mod_dir_path3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37195 #[path = "mod_dir_simple"] diff --git a/src/test/run-pass/mod_dir_path_multi.rs b/src/test/ui/run-pass/modules/mod_dir_path_multi.rs similarity index 98% rename from src/test/run-pass/mod_dir_path_multi.rs rename to src/test/ui/run-pass/modules/mod_dir_path_multi.rs index 12b28cf98af0..e6a22c21cbc8 100644 --- a/src/test/run-pass/mod_dir_path_multi.rs +++ b/src/test/ui/run-pass/modules/mod_dir_path_multi.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37195 #[path = "mod_dir_simple"] diff --git a/src/test/run-pass/mod_dir_recursive.rs b/src/test/ui/run-pass/modules/mod_dir_recursive.rs similarity index 98% rename from src/test/run-pass/mod_dir_recursive.rs rename to src/test/ui/run-pass/modules/mod_dir_recursive.rs index 8964d9ccd252..88dc845bcb53 100644 --- a/src/test/run-pass/mod_dir_recursive.rs +++ b/src/test/ui/run-pass/modules/mod_dir_recursive.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37195 // Testing that the parser for each file tracks its modules diff --git a/src/test/run-pass/mod_dir_simple.rs b/src/test/ui/run-pass/modules/mod_dir_simple.rs similarity index 98% rename from src/test/run-pass/mod_dir_simple.rs rename to src/test/ui/run-pass/modules/mod_dir_simple.rs index 429b4ebe6397..cb45b3cadafe 100644 --- a/src/test/run-pass/mod_dir_simple.rs +++ b/src/test/ui/run-pass/modules/mod_dir_simple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37195 mod mod_dir_simple { diff --git a/src/test/run-pass/mod_dir_simple/compiletest-ignore-dir b/src/test/ui/run-pass/modules/mod_dir_simple/compiletest-ignore-dir similarity index 100% rename from src/test/run-pass/mod_dir_simple/compiletest-ignore-dir rename to src/test/ui/run-pass/modules/mod_dir_simple/compiletest-ignore-dir diff --git a/src/test/run-pass/mod_dir_simple/load_another_mod.rs b/src/test/ui/run-pass/modules/mod_dir_simple/load_another_mod.rs similarity index 97% rename from src/test/run-pass/mod_dir_simple/load_another_mod.rs rename to src/test/ui/run-pass/modules/mod_dir_simple/load_another_mod.rs index ca45864a5a15..40717782b924 100644 --- a/src/test/run-pass/mod_dir_simple/load_another_mod.rs +++ b/src/test/ui/run-pass/modules/mod_dir_simple/load_another_mod.rs @@ -8,5 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[path = "test.rs"] pub mod test; diff --git a/src/test/run-pass/mod_dir_simple/test.rs b/src/test/ui/run-pass/modules/mod_dir_simple/test.rs similarity index 97% rename from src/test/run-pass/mod_dir_simple/test.rs rename to src/test/ui/run-pass/modules/mod_dir_simple/test.rs index 58c1beee3be7..8687b33cac3e 100644 --- a/src/test/run-pass/mod_dir_simple/test.rs +++ b/src/test/ui/run-pass/modules/mod_dir_simple/test.rs @@ -8,4 +8,5 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn foo() -> isize { 10 } diff --git a/src/test/run-pass/mod_file.rs b/src/test/ui/run-pass/modules/mod_file.rs similarity index 98% rename from src/test/run-pass/mod_file.rs rename to src/test/ui/run-pass/modules/mod_file.rs index c18fecd7c569..26bf83ca5a46 100644 --- a/src/test/run-pass/mod_file.rs +++ b/src/test/ui/run-pass/modules/mod_file.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37195 // Testing that a plain .rs file can load modules from other source files diff --git a/src/test/run-pass/mod_file_aux.rs b/src/test/ui/run-pass/modules/mod_file_aux.rs similarity index 97% rename from src/test/run-pass/mod_file_aux.rs rename to src/test/ui/run-pass/modules/mod_file_aux.rs index b7470811f603..a7810a3cae13 100644 --- a/src/test/run-pass/mod_file_aux.rs +++ b/src/test/ui/run-pass/modules/mod_file_aux.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-test Not a test. Used by other tests pub fn foo() -> isize { 10 } diff --git a/src/test/run-pass/mod_file_with_path_attr.rs b/src/test/ui/run-pass/modules/mod_file_with_path_attr.rs similarity index 98% rename from src/test/run-pass/mod_file_with_path_attr.rs rename to src/test/ui/run-pass/modules/mod_file_with_path_attr.rs index d9f28ceb0eca..ede610bcfad6 100644 --- a/src/test/run-pass/mod_file_with_path_attr.rs +++ b/src/test/ui/run-pass/modules/mod_file_with_path_attr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty issue #37195 // Testing that a plain .rs file can load modules from other source files diff --git a/src/test/run-pass/module-polymorphism3-files/compiletest-ignore-dir b/src/test/ui/run-pass/modules/module-polymorphism3-files/compiletest-ignore-dir similarity index 100% rename from src/test/run-pass/module-polymorphism3-files/compiletest-ignore-dir rename to src/test/ui/run-pass/modules/module-polymorphism3-files/compiletest-ignore-dir diff --git a/src/test/run-pass/module-polymorphism3-files/float-template/inst_f32.rs b/src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_f32.rs similarity index 100% rename from src/test/run-pass/module-polymorphism3-files/float-template/inst_f32.rs rename to src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_f32.rs diff --git a/src/test/run-pass/module-polymorphism3-files/float-template/inst_f64.rs b/src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_f64.rs similarity index 100% rename from src/test/run-pass/module-polymorphism3-files/float-template/inst_f64.rs rename to src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_f64.rs diff --git a/src/test/run-pass/module-polymorphism3-files/float-template/inst_float.rs b/src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_float.rs similarity index 100% rename from src/test/run-pass/module-polymorphism3-files/float-template/inst_float.rs rename to src/test/ui/run-pass/modules/module-polymorphism3-files/float-template/inst_float.rs diff --git a/src/test/run-pass/move-1-unique.rs b/src/test/ui/run-pass/moves/move-1-unique.rs similarity index 98% rename from src/test/run-pass/move-1-unique.rs rename to src/test/ui/run-pass/moves/move-1-unique.rs index 5c8dd41c6466..1557f13b10d3 100644 --- a/src/test/run-pass/move-1-unique.rs +++ b/src/test/ui/run-pass/moves/move-1-unique.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] #[derive(Clone)] diff --git a/src/test/run-pass/move-2-unique.rs b/src/test/ui/run-pass/moves/move-2-unique.rs similarity index 98% rename from src/test/run-pass/move-2-unique.rs rename to src/test/ui/run-pass/moves/move-2-unique.rs index 0b67e54e2345..270a59904968 100644 --- a/src/test/run-pass/move-2-unique.rs +++ b/src/test/ui/run-pass/moves/move-2-unique.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct X { x: isize, y: isize, z: isize } diff --git a/src/test/run-pass/move-2.rs b/src/test/ui/run-pass/moves/move-2.rs similarity index 98% rename from src/test/run-pass/move-2.rs rename to src/test/ui/run-pass/moves/move-2.rs index 0fbc2de91e6c..9207c71e0835 100644 --- a/src/test/run-pass/move-2.rs +++ b/src/test/ui/run-pass/moves/move-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct X { x: isize, y: isize, z: isize } diff --git a/src/test/run-pass/move-3-unique.rs b/src/test/ui/run-pass/moves/move-3-unique.rs similarity index 98% rename from src/test/run-pass/move-3-unique.rs rename to src/test/ui/run-pass/moves/move-3-unique.rs index 36ad3a40b3f5..6f86674104c1 100644 --- a/src/test/run-pass/move-3-unique.rs +++ b/src/test/ui/run-pass/moves/move-3-unique.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] #[derive(Clone)] diff --git a/src/test/run-pass/move-4-unique.rs b/src/test/ui/run-pass/moves/move-4-unique.rs similarity index 98% rename from src/test/run-pass/move-4-unique.rs rename to src/test/ui/run-pass/moves/move-4-unique.rs index 266e34c98a40..0876f37fd2d4 100644 --- a/src/test/run-pass/move-4-unique.rs +++ b/src/test/ui/run-pass/moves/move-4-unique.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct Triple {a: isize, b: isize, c: isize} diff --git a/src/test/run-pass/move-4.rs b/src/test/ui/run-pass/moves/move-4.rs similarity index 98% rename from src/test/run-pass/move-4.rs rename to src/test/ui/run-pass/moves/move-4.rs index 481068869e34..61dcc08805b1 100644 --- a/src/test/run-pass/move-4.rs +++ b/src/test/ui/run-pass/moves/move-4.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct Triple { a: isize, b: isize, c: isize } diff --git a/src/test/run-pass/move-arg-2-unique.rs b/src/test/ui/run-pass/moves/move-arg-2-unique.rs similarity index 98% rename from src/test/run-pass/move-arg-2-unique.rs rename to src/test/ui/run-pass/moves/move-arg-2-unique.rs index b6e225cc8b73..279b6d493580 100644 --- a/src/test/run-pass/move-arg-2-unique.rs +++ b/src/test/ui/run-pass/moves/move-arg-2-unique.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn test(foo: Box> ) { assert_eq!((*foo)[0], 10); } diff --git a/src/test/run-pass/move-arg-2.rs b/src/test/ui/run-pass/moves/move-arg-2.rs similarity index 98% rename from src/test/run-pass/move-arg-2.rs rename to src/test/ui/run-pass/moves/move-arg-2.rs index 78774854c9f1..a813d7ec9226 100644 --- a/src/test/run-pass/move-arg-2.rs +++ b/src/test/ui/run-pass/moves/move-arg-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn test(foo: Box>) { assert_eq!((*foo)[0], 10); } diff --git a/src/test/run-pass/move-arg.rs b/src/test/ui/run-pass/moves/move-arg.rs similarity index 97% rename from src/test/run-pass/move-arg.rs rename to src/test/ui/run-pass/moves/move-arg.rs index 1883c66987e0..1fa10fe48b45 100644 --- a/src/test/run-pass/move-arg.rs +++ b/src/test/ui/run-pass/moves/move-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn test(foo: isize) { assert_eq!(foo, 10); } diff --git a/src/test/run-pass/move-nullary-fn.rs b/src/test/ui/run-pass/moves/move-nullary-fn.rs similarity index 98% rename from src/test/run-pass/move-nullary-fn.rs rename to src/test/ui/run-pass/moves/move-nullary-fn.rs index cec1e4399720..b737c8c066c7 100644 --- a/src/test/run-pass/move-nullary-fn.rs +++ b/src/test/ui/run-pass/moves/move-nullary-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #922 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/move-out-of-field.rs b/src/test/ui/run-pass/moves/move-out-of-field.rs similarity index 98% rename from src/test/run-pass/move-out-of-field.rs rename to src/test/ui/run-pass/moves/move-out-of-field.rs index 262add090bde..8c91c524f26d 100644 --- a/src/test/run-pass/move-out-of-field.rs +++ b/src/test/ui/run-pass/moves/move-out-of-field.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::string::String; diff --git a/src/test/run-pass/move-scalar.rs b/src/test/ui/run-pass/moves/move-scalar.rs similarity index 97% rename from src/test/run-pass/move-scalar.rs rename to src/test/ui/run-pass/moves/move-scalar.rs index 798424d107e2..c72be92654c5 100644 --- a/src/test/run-pass/move-scalar.rs +++ b/src/test/ui/run-pass/moves/move-scalar.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { diff --git a/src/test/run-pass/moves-based-on-type-capture-clause.rs b/src/test/ui/run-pass/moves/moves-based-on-type-capture-clause.rs similarity index 98% rename from src/test/run-pass/moves-based-on-type-capture-clause.rs rename to src/test/ui/run-pass/moves/moves-based-on-type-capture-clause.rs index 548a62f4603d..857bf7ff2607 100644 --- a/src/test/run-pass/moves-based-on-type-capture-clause.rs +++ b/src/test/ui/run-pass/moves/moves-based-on-type-capture-clause.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/nll/issue-47153-generic-const.rs b/src/test/ui/run-pass/nll/issue-47153-generic-const.rs similarity index 98% rename from src/test/run-pass/nll/issue-47153-generic-const.rs rename to src/test/ui/run-pass/nll/issue-47153-generic-const.rs index 9708ca1c1427..ac41179bcace 100644 --- a/src/test/run-pass/nll/issue-47153-generic-const.rs +++ b/src/test/ui/run-pass/nll/issue-47153-generic-const.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Regression test for #47153: constants in a generic context (such as // a trait) used to ICE. diff --git a/src/test/run-pass/nll/issue-47589.rs b/src/test/ui/run-pass/nll/issue-47589.rs similarity index 98% rename from src/test/run-pass/nll/issue-47589.rs rename to src/test/ui/run-pass/nll/issue-47589.rs index 393c18efad0a..f960cfd7fb37 100644 --- a/src/test/run-pass/nll/issue-47589.rs +++ b/src/test/ui/run-pass/nll/issue-47589.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(nll)] pub struct DescriptorSet<'a> { diff --git a/src/test/run-pass/nll/issue-48623-closure.rs b/src/test/ui/run-pass/nll/issue-48623-closure.rs similarity index 98% rename from src/test/run-pass/nll/issue-48623-closure.rs rename to src/test/ui/run-pass/nll/issue-48623-closure.rs index 08ff54a428e7..312aa6d577aa 100644 --- a/src/test/run-pass/nll/issue-48623-closure.rs +++ b/src/test/ui/run-pass/nll/issue-48623-closure.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(nll)] struct WithDrop; diff --git a/src/test/run-pass/nll/issue-48623-generator.rs b/src/test/ui/run-pass/nll/issue-48623-generator.rs similarity index 98% rename from src/test/run-pass/nll/issue-48623-generator.rs rename to src/test/ui/run-pass/nll/issue-48623-generator.rs index 524837c4ba91..24b25c4db16c 100644 --- a/src/test/run-pass/nll/issue-48623-generator.rs +++ b/src/test/ui/run-pass/nll/issue-48623-generator.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(nll)] #![feature(generators, generator_trait)] diff --git a/src/test/run-pass/nll/issue-50343.rs b/src/test/ui/run-pass/nll/issue-50343.rs similarity index 97% rename from src/test/run-pass/nll/issue-50343.rs rename to src/test/ui/run-pass/nll/issue-50343.rs index f01d99c68cc7..f33baa288fa8 100644 --- a/src/test/run-pass/nll/issue-50343.rs +++ b/src/test/ui/run-pass/nll/issue-50343.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(nll)] #![deny(unused_mut)] diff --git a/src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs b/src/test/ui/run-pass/nll/issue-50461-used-mut-from-moves.rs similarity index 98% rename from src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs rename to src/test/ui/run-pass/nll/issue-50461-used-mut-from-moves.rs index d5cf122bf3b3..3e40b527ef45 100644 --- a/src/test/run-pass/nll/issue-50461-used-mut-from-moves.rs +++ b/src/test/ui/run-pass/nll/issue-50461-used-mut-from-moves.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(nll)] #![deny(unused_mut)] diff --git a/src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs b/src/test/ui/run-pass/nll/issue-53123-raw-pointer-cast.rs similarity index 98% rename from src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs rename to src/test/ui/run-pass/nll/issue-53123-raw-pointer-cast.rs index 7959f1737b9f..781dded62727 100644 --- a/src/test/run-pass/nll/issue-53123-raw-pointer-cast.rs +++ b/src/test/ui/run-pass/nll/issue-53123-raw-pointer-cast.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(nll)] #![allow(unused_variables)] diff --git a/src/test/run-pass/nll/mutating_references.rs b/src/test/ui/run-pass/nll/mutating_references.rs similarity index 98% rename from src/test/run-pass/nll/mutating_references.rs rename to src/test/ui/run-pass/nll/mutating_references.rs index 96b7362e4d93..1cf9e3aae90a 100644 --- a/src/test/run-pass/nll/mutating_references.rs +++ b/src/test/ui/run-pass/nll/mutating_references.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(nll)] struct List { diff --git a/src/test/run-pass/nll/process_or_insert_default.rs b/src/test/ui/run-pass/nll/process_or_insert_default.rs similarity index 98% rename from src/test/run-pass/nll/process_or_insert_default.rs rename to src/test/ui/run-pass/nll/process_or_insert_default.rs index a3a484402cc1..57fbfb642ea5 100644 --- a/src/test/run-pass/nll/process_or_insert_default.rs +++ b/src/test/ui/run-pass/nll/process_or_insert_default.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(nll)] use std::collections::HashMap; diff --git a/src/test/run-pass/nll/rc-loop.rs b/src/test/ui/run-pass/nll/rc-loop.rs similarity index 98% rename from src/test/run-pass/nll/rc-loop.rs rename to src/test/ui/run-pass/nll/rc-loop.rs index 2114dbebe93f..420f09707f1e 100644 --- a/src/test/run-pass/nll/rc-loop.rs +++ b/src/test/ui/run-pass/nll/rc-loop.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // A test for something that NLL enables. It sometimes happens that // the `while let` pattern makes some borrows from a variable (in this // case, `x`) that you need in order to compute the next value for diff --git a/src/test/run-pass/non_modrs_mods/foors_mod.rs b/src/test/ui/run-pass/non_modrs_mods/foors_mod.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/foors_mod.rs rename to src/test/ui/run-pass/non_modrs_mods/foors_mod.rs diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/compiletest-ignore-dir b/src/test/ui/run-pass/non_modrs_mods/foors_mod/compiletest-ignore-dir similarity index 100% rename from src/test/run-pass/non_modrs_mods/foors_mod/compiletest-ignore-dir rename to src/test/ui/run-pass/non_modrs_mods/foors_mod/compiletest-ignore-dir diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs b/src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs rename to src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_foors_mod.rs diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs b/src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs rename to src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_foors_mod/innest.rs diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs b/src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs rename to src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/innest.rs diff --git a/src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs b/src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs rename to src/test/ui/run-pass/non_modrs_mods/foors_mod/inner_modrs_mod/mod.rs diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/compiletest-ignore-dir b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/compiletest-ignore-dir similarity index 100% rename from src/test/run-pass/non_modrs_mods/modrs_mod/compiletest-ignore-dir rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/compiletest-ignore-dir diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod.rs diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_foors_mod/innest.rs diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/innest.rs diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/inner_modrs_mod/mod.rs diff --git a/src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs b/src/test/ui/run-pass/non_modrs_mods/modrs_mod/mod.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/modrs_mod/mod.rs rename to src/test/ui/run-pass/non_modrs_mods/modrs_mod/mod.rs diff --git a/src/test/run-pass/non_modrs_mods/non_modrs_mods.rs b/src/test/ui/run-pass/non_modrs_mods/non_modrs_mods.rs similarity index 98% rename from src/test/run-pass/non_modrs_mods/non_modrs_mods.rs rename to src/test/ui/run-pass/non_modrs_mods/non_modrs_mods.rs index eab8112b8554..a9b240be804e 100644 --- a/src/test/run-pass/non_modrs_mods/non_modrs_mods.rs +++ b/src/test/ui/run-pass/non_modrs_mods/non_modrs_mods.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass // // ignore-pretty issue #37195 #![feature(non_modrs_mods)] diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs b/src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs rename to src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/arbitrary_name.rs diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir b/src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir similarity index 100% rename from src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir rename to src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/compiletest-ignore-dir diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs b/src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs rename to src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/innest.rs diff --git a/src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs b/src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs similarity index 100% rename from src/test/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs rename to src/test/ui/run-pass/non_modrs_mods/some_crazy_attr_mod_dir/inner_modrs_mod/mod.rs diff --git a/src/test/run-pass/arith-0.rs b/src/test/ui/run-pass/numbers-arithmetic/arith-0.rs similarity index 97% rename from src/test/run-pass/arith-0.rs rename to src/test/ui/run-pass/numbers-arithmetic/arith-0.rs index a4365efbbbd0..4d432cd5b4e6 100644 --- a/src/test/run-pass/arith-0.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/arith-0.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { diff --git a/src/test/run-pass/arith-1.rs b/src/test/ui/run-pass/numbers-arithmetic/arith-1.rs similarity index 99% rename from src/test/run-pass/arith-1.rs rename to src/test/ui/run-pass/numbers-arithmetic/arith-1.rs index fd281ea1173c..b78b359ced06 100644 --- a/src/test/run-pass/arith-1.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/arith-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { diff --git a/src/test/run-pass/arith-2.rs b/src/test/ui/run-pass/numbers-arithmetic/arith-2.rs similarity index 98% rename from src/test/run-pass/arith-2.rs rename to src/test/ui/run-pass/numbers-arithmetic/arith-2.rs index 48e834cf54dd..91e207c2b2ff 100644 --- a/src/test/run-pass/arith-2.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/arith-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/arith-unsigned.rs b/src/test/ui/run-pass/numbers-arithmetic/arith-unsigned.rs similarity index 96% rename from src/test/run-pass/arith-unsigned.rs rename to src/test/ui/run-pass/numbers-arithmetic/arith-unsigned.rs index e5ff97e3cdbd..dc672d50d7fd 100644 --- a/src/test/run-pass/arith-unsigned.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/arith-unsigned.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - -#![allow(type_limits)] +// run-pass +#![allow(unused_comparisons)] // Unsigned integer operations pub fn main() { diff --git a/src/test/run-pass/div-mod.rs b/src/test/ui/run-pass/numbers-arithmetic/div-mod.rs similarity index 98% rename from src/test/run-pass/div-mod.rs rename to src/test/ui/run-pass/numbers-arithmetic/div-mod.rs index b6cae71df865..d04638f790bc 100644 --- a/src/test/run-pass/div-mod.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/div-mod.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/float-int-invalid-const-cast.rs b/src/test/ui/run-pass/numbers-arithmetic/float-int-invalid-const-cast.rs similarity index 99% rename from src/test/run-pass/float-int-invalid-const-cast.rs rename to src/test/ui/run-pass/numbers-arithmetic/float-int-invalid-const-cast.rs index f84432abbfa0..97f5f39a9e51 100644 --- a/src/test/run-pass/float-int-invalid-const-cast.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/float-int-invalid-const-cast.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no i128 support #![deny(const_err)] diff --git a/src/test/run-pass/float-literal-inference.rs b/src/test/ui/run-pass/numbers-arithmetic/float-literal-inference.rs similarity index 98% rename from src/test/run-pass/float-literal-inference.rs rename to src/test/ui/run-pass/numbers-arithmetic/float-literal-inference.rs index b7c2c8d4953c..e3e724cbe775 100644 --- a/src/test/run-pass/float-literal-inference.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/float-literal-inference.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S { z: f64 } diff --git a/src/test/run-pass/float-nan.rs b/src/test/ui/run-pass/numbers-arithmetic/float-nan.rs similarity index 99% rename from src/test/run-pass/float-nan.rs rename to src/test/ui/run-pass/numbers-arithmetic/float-nan.rs index 856599431fd1..7725859eec61 100644 --- a/src/test/run-pass/float-nan.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/float-nan.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::f64; pub fn main() { diff --git a/src/test/run-pass/float-signature.rs b/src/test/ui/run-pass/numbers-arithmetic/float-signature.rs similarity index 98% rename from src/test/run-pass/float-signature.rs rename to src/test/ui/run-pass/numbers-arithmetic/float-signature.rs index 08daf1bd80e4..12a25aa6e8e1 100644 --- a/src/test/run-pass/float-signature.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/float-signature.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { diff --git a/src/test/run-pass/float.rs b/src/test/ui/run-pass/numbers-arithmetic/float.rs similarity index 98% rename from src/test/run-pass/float.rs rename to src/test/ui/run-pass/numbers-arithmetic/float.rs index 22d54162c430..597b4630683b 100644 --- a/src/test/run-pass/float.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/float.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let pi = 3.1415927f64; println!("{}", -pi * (pi + 2.0 / pi) - pi * 5.0); diff --git a/src/test/run-pass/float2.rs b/src/test/ui/run-pass/numbers-arithmetic/float2.rs similarity index 98% rename from src/test/run-pass/float2.rs rename to src/test/ui/run-pass/numbers-arithmetic/float2.rs index e9f6e0f51b4e..70c7c600f40b 100644 --- a/src/test/run-pass/float2.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/float2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/float_math.rs b/src/test/ui/run-pass/numbers-arithmetic/float_math.rs similarity index 98% rename from src/test/run-pass/float_math.rs rename to src/test/ui/run-pass/numbers-arithmetic/float_math.rs index c1b4b55bd372..d86ad34c9d89 100644 --- a/src/test/run-pass/float_math.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/float_math.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(core_intrinsics)] use std::intrinsics::{fadd_fast, fsub_fast, fmul_fast, fdiv_fast, frem_fast}; diff --git a/src/test/run-pass/floatlits.rs b/src/test/ui/run-pass/numbers-arithmetic/floatlits.rs similarity index 98% rename from src/test/run-pass/floatlits.rs rename to src/test/ui/run-pass/numbers-arithmetic/floatlits.rs index d133f3463a3f..34f52ccb33a5 100644 --- a/src/test/run-pass/floatlits.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/floatlits.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/i128-ffi.rs b/src/test/ui/run-pass/numbers-arithmetic/i128-ffi.rs similarity index 96% rename from src/test/run-pass/i128-ffi.rs rename to src/test/ui/run-pass/numbers-arithmetic/i128-ffi.rs index edf278cbf64a..747a05f60622 100644 --- a/src/test/run-pass/i128-ffi.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/i128-ffi.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(improper_ctypes)] + // MSVC doesn't support 128 bit integers, and other Windows // C compilers have very inconsistent views on how the ABI // should look like. diff --git a/src/test/run-pass/i128.rs b/src/test/ui/run-pass/numbers-arithmetic/i128.rs similarity index 99% rename from src/test/run-pass/i128.rs rename to src/test/ui/run-pass/numbers-arithmetic/i128.rs index baf3b3399849..c3d4a6382900 100644 --- a/src/test/run-pass/i128.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/i128.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(overflowing_literals)] + // ignore-emscripten i128 doesn't work // compile-flags: -Z borrowck=compare diff --git a/src/test/run-pass/i32-sub.rs b/src/test/ui/run-pass/numbers-arithmetic/i32-sub.rs similarity index 97% rename from src/test/run-pass/i32-sub.rs rename to src/test/ui/run-pass/numbers-arithmetic/i32-sub.rs index 143787a466b8..12a0004ca485 100644 --- a/src/test/run-pass/i32-sub.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/i32-sub.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/i8-incr.rs b/src/test/ui/run-pass/numbers-arithmetic/i8-incr.rs similarity index 97% rename from src/test/run-pass/i8-incr.rs rename to src/test/ui/run-pass/numbers-arithmetic/i8-incr.rs index 242cea264afb..e9779d202b0c 100644 --- a/src/test/run-pass/i8-incr.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/i8-incr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/int-abs-overflow.rs b/src/test/ui/run-pass/numbers-arithmetic/int-abs-overflow.rs similarity index 98% rename from src/test/run-pass/int-abs-overflow.rs rename to src/test/ui/run-pass/numbers-arithmetic/int-abs-overflow.rs index e17e3a16d683..92094f7b0580 100644 --- a/src/test/run-pass/int-abs-overflow.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/int-abs-overflow.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -Z force-overflow-checks=on // ignore-emscripten no threads support diff --git a/src/test/run-pass/int.rs b/src/test/ui/run-pass/numbers-arithmetic/int.rs similarity index 97% rename from src/test/run-pass/int.rs rename to src/test/ui/run-pass/numbers-arithmetic/int.rs index 9495552af409..7d8af653833a 100644 --- a/src/test/run-pass/int.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/int.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/integer-literal-radix.rs b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-radix.rs similarity index 98% rename from src/test/run-pass/integer-literal-radix.rs rename to src/test/ui/run-pass/numbers-arithmetic/integer-literal-radix.rs index ba9d22f06a97..814d7de01a4f 100644 --- a/src/test/run-pass/integer-literal-radix.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-radix.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let a = 0xBEEF_isize; diff --git a/src/test/run-pass/integer-literal-suffix-inference-2.rs b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference-2.rs similarity index 98% rename from src/test/run-pass/integer-literal-suffix-inference-2.rs rename to src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference-2.rs index e953cf2fda1a..240d235c712b 100644 --- a/src/test/run-pass/integer-literal-suffix-inference-2.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn foo(_: *const ()) {} diff --git a/src/test/run-pass/integer-literal-suffix-inference-3.rs b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference-3.rs similarity index 97% rename from src/test/run-pass/integer-literal-suffix-inference-3.rs rename to src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference-3.rs index 31aca964def1..7b10a049dc6f 100644 --- a/src/test/run-pass/integer-literal-suffix-inference-3.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() { println!("{}", std::mem::size_of_val(&1)); } diff --git a/src/test/run-pass/integer-literal-suffix-inference.rs b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference.rs similarity index 99% rename from src/test/run-pass/integer-literal-suffix-inference.rs rename to src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference.rs index 57f80bb14e2f..ecbadb94a823 100644 --- a/src/test/run-pass/integer-literal-suffix-inference.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/integer-literal-suffix-inference.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub fn main() { diff --git a/src/test/run-pass/next-power-of-two-overflow-debug.rs b/src/test/ui/run-pass/numbers-arithmetic/next-power-of-two-overflow-debug.rs similarity index 98% rename from src/test/run-pass/next-power-of-two-overflow-debug.rs rename to src/test/ui/run-pass/numbers-arithmetic/next-power-of-two-overflow-debug.rs index 2135b3f8764c..704aca193675 100644 --- a/src/test/run-pass/next-power-of-two-overflow-debug.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/next-power-of-two-overflow-debug.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -C debug_assertions=yes // ignore-wasm32-bare compiled with panic=abort by default // ignore-emscripten dies with an LLVM error diff --git a/src/test/run-pass/next-power-of-two-overflow-ndebug.rs b/src/test/ui/run-pass/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs similarity index 98% rename from src/test/run-pass/next-power-of-two-overflow-ndebug.rs rename to src/test/ui/run-pass/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs index b05c1863d902..e581f7c97ccb 100644 --- a/src/test/run-pass/next-power-of-two-overflow-ndebug.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/next-power-of-two-overflow-ndebug.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -C debug_assertions=no // ignore-emscripten dies with an LLVM error diff --git a/src/test/run-pass/num-wrapping.rs b/src/test/ui/run-pass/numbers-arithmetic/num-wrapping.rs similarity index 99% rename from src/test/run-pass/num-wrapping.rs rename to src/test/ui/run-pass/numbers-arithmetic/num-wrapping.rs index 20c7f27336e2..6d3653e79775 100644 --- a/src/test/run-pass/num-wrapping.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/num-wrapping.rs @@ -7,7 +7,9 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass + // compile-flags: -C debug-assertions // // Test std::num::Wrapping for {uN, iN, usize, isize} diff --git a/src/test/run-pass/numeric-method-autoexport.rs b/src/test/ui/run-pass/numbers-arithmetic/numeric-method-autoexport.rs similarity index 99% rename from src/test/run-pass/numeric-method-autoexport.rs rename to src/test/ui/run-pass/numbers-arithmetic/numeric-method-autoexport.rs index 15ece09abd80..22db67bf920f 100644 --- a/src/test/run-pass/numeric-method-autoexport.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/numeric-method-autoexport.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This file is intended to test only that methods are automatically // reachable for each numeric type, for each exported impl, with no imports // necessary. Testing the methods of the impls is done within the source diff --git a/src/test/run-pass/promoted_overflow_opt.rs b/src/test/ui/run-pass/numbers-arithmetic/promoted_overflow_opt.rs similarity index 97% rename from src/test/run-pass/promoted_overflow_opt.rs rename to src/test/ui/run-pass/numbers-arithmetic/promoted_overflow_opt.rs index 6b2f1c6d3c8a..16042128901a 100644 --- a/src/test/run-pass/promoted_overflow_opt.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/promoted_overflow_opt.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(const_err)] // compile-flags: -O diff --git a/src/test/run-pass/saturating-float-casts.rs b/src/test/ui/run-pass/numbers-arithmetic/saturating-float-casts.rs similarity index 99% rename from src/test/run-pass/saturating-float-casts.rs rename to src/test/ui/run-pass/numbers-arithmetic/saturating-float-casts.rs index ad3b4b172594..a822ac604fa5 100644 --- a/src/test/run-pass/saturating-float-casts.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/saturating-float-casts.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests saturating float->int casts. See u128-as-f32.rs for the opposite direction. // compile-flags: -Z saturating-float-casts diff --git a/src/test/run-pass/shift-near-oflo.rs b/src/test/ui/run-pass/numbers-arithmetic/shift-near-oflo.rs similarity index 99% rename from src/test/run-pass/shift-near-oflo.rs rename to src/test/ui/run-pass/numbers-arithmetic/shift-near-oflo.rs index 527ced54c429..3effc8de97fb 100644 --- a/src/test/run-pass/shift-near-oflo.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/shift-near-oflo.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // compile-flags: -C debug-assertions // Check that we do *not* overflow on a number of edge cases. diff --git a/src/test/run-pass/shift-various-types.rs b/src/test/ui/run-pass/numbers-arithmetic/shift-various-types.rs similarity index 99% rename from src/test/run-pass/shift-various-types.rs rename to src/test/ui/run-pass/numbers-arithmetic/shift-various-types.rs index 9238112a0818..1ae94255adfe 100644 --- a/src/test/run-pass/shift-various-types.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/shift-various-types.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can do shifts by any integral type. diff --git a/src/test/run-pass/shift.rs b/src/test/ui/run-pass/numbers-arithmetic/shift.rs similarity index 96% rename from src/test/run-pass/shift.rs rename to src/test/ui/run-pass/numbers-arithmetic/shift.rs index 2f417e0e2f4e..e9d48f1a1af6 100644 --- a/src/test/run-pass/shift.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/shift.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] +#![allow(overflowing_literals)] + // Testing shifts for various combinations of integers // Issue #1570 diff --git a/src/test/run-pass/signed-shift-const-eval.rs b/src/test/ui/run-pass/numbers-arithmetic/signed-shift-const-eval.rs similarity index 92% rename from src/test/run-pass/signed-shift-const-eval.rs rename to src/test/ui/run-pass/numbers-arithmetic/signed-shift-const-eval.rs index 9ea2dedcba17..b0ff7a255ab6 100644 --- a/src/test/run-pass/signed-shift-const-eval.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/signed-shift-const-eval.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + enum test { thing = -5 >> 1_usize } pub fn main() { diff --git a/src/test/run-pass/u128-as-f32.rs b/src/test/ui/run-pass/numbers-arithmetic/u128-as-f32.rs similarity index 99% rename from src/test/run-pass/u128-as-f32.rs rename to src/test/ui/run-pass/numbers-arithmetic/u128-as-f32.rs index 2848fb2d51a6..99dfd3ba1cfb 100644 --- a/src/test/run-pass/u128-as-f32.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/u128-as-f32.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten u128 not supported #![feature(test)] diff --git a/src/test/run-pass/u128.rs b/src/test/ui/run-pass/numbers-arithmetic/u128.rs similarity index 99% rename from src/test/run-pass/u128.rs rename to src/test/ui/run-pass/numbers-arithmetic/u128.rs index d649b3b74d39..c03d39e8416f 100644 --- a/src/test/run-pass/u128.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/u128.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten u128 not supported // compile-flags: -Z borrowck=compare diff --git a/src/test/run-pass/u32-decr.rs b/src/test/ui/run-pass/numbers-arithmetic/u32-decr.rs similarity index 97% rename from src/test/run-pass/u32-decr.rs rename to src/test/ui/run-pass/numbers-arithmetic/u32-decr.rs index b56b6f32c029..e86d3abefa7a 100644 --- a/src/test/run-pass/u32-decr.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/u32-decr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/u8-incr-decr.rs b/src/test/ui/run-pass/numbers-arithmetic/u8-incr-decr.rs similarity index 98% rename from src/test/run-pass/u8-incr-decr.rs rename to src/test/ui/run-pass/numbers-arithmetic/u8-incr-decr.rs index d35ef015e6f0..2567da479f13 100644 --- a/src/test/run-pass/u8-incr-decr.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/u8-incr-decr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/u8-incr.rs b/src/test/ui/run-pass/numbers-arithmetic/u8-incr.rs similarity index 98% rename from src/test/run-pass/u8-incr.rs rename to src/test/ui/run-pass/numbers-arithmetic/u8-incr.rs index 9554f9c2dfbc..ca49efaade65 100644 --- a/src/test/run-pass/u8-incr.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/u8-incr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/uint.rs b/src/test/ui/run-pass/numbers-arithmetic/uint.rs similarity index 97% rename from src/test/run-pass/uint.rs rename to src/test/ui/run-pass/numbers-arithmetic/uint.rs index a894d7629793..01ee2167c723 100644 --- a/src/test/run-pass/uint.rs +++ b/src/test/ui/run-pass/numbers-arithmetic/uint.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs b/src/test/ui/run-pass/overloaded/auxiliary/overloaded_autoderef_xc.rs similarity index 100% rename from src/test/run-pass/auxiliary/overloaded_autoderef_xc.rs rename to src/test/ui/run-pass/overloaded/auxiliary/overloaded_autoderef_xc.rs diff --git a/src/test/run-pass/overloaded-autoderef-count.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef-count.rs similarity index 99% rename from src/test/run-pass/overloaded-autoderef-count.rs rename to src/test/ui/run-pass/overloaded/overloaded-autoderef-count.rs index 14a9cc4c2489..0e07be538294 100644 --- a/src/test/run-pass/overloaded-autoderef-count.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef-count.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::cell::Cell; use std::ops::{Deref, DerefMut}; diff --git a/src/test/run-pass/overloaded-autoderef-indexing.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef-indexing.rs similarity index 98% rename from src/test/run-pass/overloaded-autoderef-indexing.rs rename to src/test/ui/run-pass/overloaded/overloaded-autoderef-indexing.rs index 67b8bc1d157c..f4f42add88f4 100644 --- a/src/test/run-pass/overloaded-autoderef-indexing.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef-indexing.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Deref; diff --git a/src/test/run-pass/overloaded-autoderef-order.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef-order.rs similarity index 99% rename from src/test/run-pass/overloaded-autoderef-order.rs rename to src/test/ui/run-pass/overloaded/overloaded-autoderef-order.rs index 8ea8b375b17b..1480b0365424 100644 --- a/src/test/run-pass/overloaded-autoderef-order.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef-order.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::rc::Rc; use std::ops::Deref; diff --git a/src/test/run-pass/overloaded-autoderef-vtable.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef-vtable.rs similarity index 98% rename from src/test/run-pass/overloaded-autoderef-vtable.rs rename to src/test/ui/run-pass/overloaded/overloaded-autoderef-vtable.rs index 38ed90a45471..2ed9032f86e1 100644 --- a/src/test/run-pass/overloaded-autoderef-vtable.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef-vtable.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Deref; diff --git a/src/test/run-pass/overloaded-autoderef-xcrate.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef-xcrate.rs similarity index 98% rename from src/test/run-pass/overloaded-autoderef-xcrate.rs rename to src/test/ui/run-pass/overloaded/overloaded-autoderef-xcrate.rs index 174e09cb14c7..9408d02ba330 100644 --- a/src/test/run-pass/overloaded-autoderef-xcrate.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef-xcrate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:overloaded_autoderef_xc.rs diff --git a/src/test/run-pass/overloaded-autoderef.rs b/src/test/ui/run-pass/overloaded/overloaded-autoderef.rs similarity index 97% rename from src/test/run-pass/overloaded-autoderef.rs rename to src/test/ui/run-pass/overloaded/overloaded-autoderef.rs index 759e2aace610..7be57400da0d 100644 --- a/src/test/run-pass/overloaded-autoderef.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-autoderef.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + #![feature(box_syntax, core)] use std::cell::RefCell; diff --git a/src/test/run-pass/overloaded-calls-object-one-arg.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-object-one-arg.rs similarity index 98% rename from src/test/run-pass/overloaded-calls-object-one-arg.rs rename to src/test/ui/run-pass/overloaded/overloaded-calls-object-one-arg.rs index ec64f627c946..d80ed4531fe9 100644 --- a/src/test/run-pass/overloaded-calls-object-one-arg.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-calls-object-one-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests calls to closure arguments where the closure takes 1 argument. // This is a bit tricky due to rust-call ABI. diff --git a/src/test/run-pass/overloaded-calls-object-two-args.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-object-two-args.rs similarity index 98% rename from src/test/run-pass/overloaded-calls-object-two-args.rs rename to src/test/ui/run-pass/overloaded/overloaded-calls-object-two-args.rs index c38a62147a01..bfc815baeaa0 100644 --- a/src/test/run-pass/overloaded-calls-object-two-args.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-calls-object-two-args.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests calls to closure arguments where the closure takes 2 arguments. // This is a bit tricky due to rust-call ABI. diff --git a/src/test/run-pass/overloaded-calls-object-zero-args.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-object-zero-args.rs similarity index 98% rename from src/test/run-pass/overloaded-calls-object-zero-args.rs rename to src/test/ui/run-pass/overloaded/overloaded-calls-object-zero-args.rs index 08ab465ebb04..ebabaf09f574 100644 --- a/src/test/run-pass/overloaded-calls-object-zero-args.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-calls-object-zero-args.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests calls to closure arguments where the closure takes 0 arguments. // This is a bit tricky due to rust-call ABI. diff --git a/src/test/run-pass/overloaded-calls-param-vtables.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-param-vtables.rs similarity index 99% rename from src/test/run-pass/overloaded-calls-param-vtables.rs rename to src/test/ui/run-pass/overloaded/overloaded-calls-param-vtables.rs index c15c6df5fac2..6db534d30818 100644 --- a/src/test/run-pass/overloaded-calls-param-vtables.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-calls-param-vtables.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that nested vtables work with overloaded calls. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/overloaded-calls-simple.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-simple.rs similarity index 99% rename from src/test/run-pass/overloaded-calls-simple.rs rename to src/test/ui/run-pass/overloaded/overloaded-calls-simple.rs index 24a79a26837a..825263c891d6 100644 --- a/src/test/run-pass/overloaded-calls-simple.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-calls-simple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(lang_items, unboxed_closures, fn_traits)] diff --git a/src/test/run-pass/overloaded-calls-zero-args.rs b/src/test/ui/run-pass/overloaded/overloaded-calls-zero-args.rs similarity index 98% rename from src/test/run-pass/overloaded-calls-zero-args.rs rename to src/test/ui/run-pass/overloaded/overloaded-calls-zero-args.rs index 5fd6d5cb10f3..de8915493da3 100644 --- a/src/test/run-pass/overloaded-calls-zero-args.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-calls-zero-args.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(unboxed_closures, fn_traits)] diff --git a/src/test/run-pass/overloaded-deref-count.rs b/src/test/ui/run-pass/overloaded/overloaded-deref-count.rs similarity index 99% rename from src/test/run-pass/overloaded-deref-count.rs rename to src/test/ui/run-pass/overloaded/overloaded-deref-count.rs index a8a3b3014e09..79040afbd0ed 100644 --- a/src/test/run-pass/overloaded-deref-count.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-deref-count.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::cell::Cell; use std::ops::{Deref, DerefMut}; diff --git a/src/test/run-pass/overloaded-deref.rs b/src/test/ui/run-pass/overloaded/overloaded-deref.rs similarity index 99% rename from src/test/run-pass/overloaded-deref.rs rename to src/test/ui/run-pass/overloaded/overloaded-deref.rs index 9cdf45b485c1..779d1b2391e2 100644 --- a/src/test/run-pass/overloaded-deref.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-deref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::cell::RefCell; use std::rc::Rc; use std::string::String; diff --git a/src/test/run-pass/overloaded-index-assoc-list.rs b/src/test/ui/run-pass/overloaded/overloaded-index-assoc-list.rs similarity index 99% rename from src/test/run-pass/overloaded-index-assoc-list.rs rename to src/test/ui/run-pass/overloaded/overloaded-index-assoc-list.rs index 50140d1aab9d..7c23e8e28f8e 100644 --- a/src/test/run-pass/overloaded-index-assoc-list.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-index-assoc-list.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test overloading of the `[]` operator. In particular test that it // takes its argument *by reference*. diff --git a/src/test/run-pass/overloaded-index-autoderef.rs b/src/test/ui/run-pass/overloaded/overloaded-index-autoderef.rs similarity index 97% rename from src/test/run-pass/overloaded-index-autoderef.rs rename to src/test/ui/run-pass/overloaded/overloaded-index-autoderef.rs index 9988599d59dc..024bd4e2bb79 100644 --- a/src/test/run-pass/overloaded-index-autoderef.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-index-autoderef.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // Test overloaded indexing combined with autoderef. #![feature(box_syntax, core)] diff --git a/src/test/run-pass/overloaded-index-in-field.rs b/src/test/ui/run-pass/overloaded/overloaded-index-in-field.rs similarity index 99% rename from src/test/run-pass/overloaded-index-in-field.rs rename to src/test/ui/run-pass/overloaded/overloaded-index-in-field.rs index 7e2b586631dc..3302a4e3a7d8 100644 --- a/src/test/run-pass/overloaded-index-in-field.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-index-in-field.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test using overloaded indexing when the "map" is stored in a // field. This caused problems at some point. diff --git a/src/test/run-pass/overloaded-index.rs b/src/test/ui/run-pass/overloaded/overloaded-index.rs similarity index 99% rename from src/test/run-pass/overloaded-index.rs rename to src/test/ui/run-pass/overloaded/overloaded-index.rs index b54a18f722a7..8ae612764a76 100644 --- a/src/test/run-pass/overloaded-index.rs +++ b/src/test/ui/run-pass/overloaded/overloaded-index.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::{Index, IndexMut}; struct Foo { diff --git a/src/test/run-pass/overloaded_deref_with_ref_pattern.rs b/src/test/ui/run-pass/overloaded/overloaded_deref_with_ref_pattern.rs similarity index 99% rename from src/test/run-pass/overloaded_deref_with_ref_pattern.rs rename to src/test/ui/run-pass/overloaded/overloaded_deref_with_ref_pattern.rs index f72d49642513..d092df329579 100644 --- a/src/test/run-pass/overloaded_deref_with_ref_pattern.rs +++ b/src/test/ui/run-pass/overloaded/overloaded_deref_with_ref_pattern.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we choose Deref or DerefMut appropriately based on mutability of ref bindings (#15609). use std::ops::{Deref, DerefMut}; diff --git a/src/test/run-pass/overloaded_deref_with_ref_pattern_issue15609.rs b/src/test/ui/run-pass/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs similarity index 98% rename from src/test/run-pass/overloaded_deref_with_ref_pattern_issue15609.rs rename to src/test/ui/run-pass/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs index e5eb6ab8f610..8f0b3356d079 100644 --- a/src/test/run-pass/overloaded_deref_with_ref_pattern_issue15609.rs +++ b/src/test/ui/run-pass/overloaded/overloaded_deref_with_ref_pattern_issue15609.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we choose Deref or DerefMut appropriately based on mutability of ref bindings (#15609). fn main() { diff --git a/src/test/run-pass/auxiliary/packed.rs b/src/test/ui/run-pass/packed/auxiliary/packed.rs similarity index 100% rename from src/test/run-pass/auxiliary/packed.rs rename to src/test/ui/run-pass/packed/auxiliary/packed.rs diff --git a/src/test/run-pass/packed-struct-borrow-element.rs b/src/test/ui/run-pass/packed/packed-struct-borrow-element.rs similarity index 98% rename from src/test/run-pass/packed-struct-borrow-element.rs rename to src/test/ui/run-pass/packed/packed-struct-borrow-element.rs index c8a8643ed6b9..5d5bcbd325d4 100644 --- a/src/test/run-pass/packed-struct-borrow-element.rs +++ b/src/test/ui/run-pass/packed/packed-struct-borrow-element.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten weird assertion? #![feature(repr_packed)] diff --git a/src/test/run-pass/packed-struct-drop-aligned.rs b/src/test/ui/run-pass/packed/packed-struct-drop-aligned.rs similarity index 98% rename from src/test/run-pass/packed-struct-drop-aligned.rs rename to src/test/ui/run-pass/packed/packed-struct-drop-aligned.rs index bbe31a65e86a..8cc29797772c 100644 --- a/src/test/run-pass/packed-struct-drop-aligned.rs +++ b/src/test/ui/run-pass/packed/packed-struct-drop-aligned.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::cell::Cell; use std::mem; diff --git a/src/test/run-pass/packed-struct-generic-layout.rs b/src/test/ui/run-pass/packed/packed-struct-generic-layout.rs similarity index 96% rename from src/test/run-pass/packed-struct-generic-layout.rs rename to src/test/ui/run-pass/packed/packed-struct-generic-layout.rs index b962a5c79338..30f7124f2437 100644 --- a/src/test/run-pass/packed-struct-generic-layout.rs +++ b/src/test/ui/run-pass/packed/packed-struct-generic-layout.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(overflowing_literals)] + use std::mem; diff --git a/src/test/run-pass/packed-struct-generic-size.rs b/src/test/ui/run-pass/packed/packed-struct-generic-size.rs similarity index 94% rename from src/test/run-pass/packed-struct-generic-size.rs rename to src/test/ui/run-pass/packed/packed-struct-generic-size.rs index 127d873b2d97..6df51f457299 100644 --- a/src/test/run-pass/packed-struct-generic-size.rs +++ b/src/test/ui/run-pass/packed/packed-struct-generic-size.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] +#![allow(unused_comparisons)] + #![feature(repr_packed)] use std::mem; diff --git a/src/test/ui/run-pass/packed/packed-struct-generic-size.stderr b/src/test/ui/run-pass/packed/packed-struct-generic-size.stderr new file mode 100644 index 000000000000..f9c343b60b06 --- /dev/null +++ b/src/test/ui/run-pass/packed/packed-struct-generic-size.stderr @@ -0,0 +1,36 @@ +warning: unnecessary path disambiguator + --> $DIR/packed-struct-generic-size.rs:48:14 + | +LL | check!(P1::, 1, 3); + | ^^ try removing `::` + +warning: unnecessary path disambiguator + --> $DIR/packed-struct-generic-size.rs:49:14 + | +LL | check!(P1::, 1, 11); + | ^^ try removing `::` + +warning: unnecessary path disambiguator + --> $DIR/packed-struct-generic-size.rs:51:14 + | +LL | check!(P2::, 1, 3); + | ^^ try removing `::` + +warning: unnecessary path disambiguator + --> $DIR/packed-struct-generic-size.rs:52:14 + | +LL | check!(P2::, 2, 12); + | ^^ try removing `::` + +warning: unnecessary path disambiguator + --> $DIR/packed-struct-generic-size.rs:54:15 + | +LL | check!(P4C::, 1, 3); + | ^^ try removing `::` + +warning: unnecessary path disambiguator + --> $DIR/packed-struct-generic-size.rs:55:15 + | +LL | check!(P4C::, 4, 12); + | ^^ try removing `::` + diff --git a/src/test/run-pass/packed-struct-layout.rs b/src/test/ui/run-pass/packed/packed-struct-layout.rs similarity index 98% rename from src/test/run-pass/packed-struct-layout.rs rename to src/test/ui/run-pass/packed/packed-struct-layout.rs index a4a0055785f0..2c9216a96c2c 100644 --- a/src/test/run-pass/packed-struct-layout.rs +++ b/src/test/ui/run-pass/packed/packed-struct-layout.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; #[repr(packed)] diff --git a/src/test/run-pass/packed-struct-match.rs b/src/test/ui/run-pass/packed/packed-struct-match.rs similarity index 99% rename from src/test/run-pass/packed-struct-match.rs rename to src/test/ui/run-pass/packed/packed-struct-match.rs index c02d524d763d..e349a4e7f541 100644 --- a/src/test/run-pass/packed-struct-match.rs +++ b/src/test/ui/run-pass/packed/packed-struct-match.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(repr_packed)] #[repr(packed)] diff --git a/src/test/run-pass/packed-struct-optimized-enum.rs b/src/test/ui/run-pass/packed/packed-struct-optimized-enum.rs similarity index 99% rename from src/test/run-pass/packed-struct-optimized-enum.rs rename to src/test/ui/run-pass/packed/packed-struct-optimized-enum.rs index 9d23a0c71489..e22e8c26fe5d 100644 --- a/src/test/run-pass/packed-struct-optimized-enum.rs +++ b/src/test/ui/run-pass/packed/packed-struct-optimized-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[repr(packed)] struct Packed(T); diff --git a/src/test/run-pass/packed-struct-size-xc.rs b/src/test/ui/run-pass/packed/packed-struct-size-xc.rs similarity index 98% rename from src/test/run-pass/packed-struct-size-xc.rs rename to src/test/ui/run-pass/packed/packed-struct-size-xc.rs index 48f34554ca14..5b1fb6b92c7e 100644 --- a/src/test/run-pass/packed-struct-size-xc.rs +++ b/src/test/ui/run-pass/packed/packed-struct-size-xc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:packed.rs diff --git a/src/test/run-pass/packed-struct-size.rs b/src/test/ui/run-pass/packed/packed-struct-size.rs similarity index 97% rename from src/test/run-pass/packed-struct-size.rs rename to src/test/ui/run-pass/packed/packed-struct-size.rs index f8e23610fe23..85e7f1544a02 100644 --- a/src/test/run-pass/packed-struct-size.rs +++ b/src/test/ui/run-pass/packed/packed-struct-size.rs @@ -7,6 +7,11 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_upper_case_globals)] + #![feature(repr_packed)] diff --git a/src/test/run-pass/packed-struct-vec.rs b/src/test/ui/run-pass/packed/packed-struct-vec.rs similarity index 99% rename from src/test/run-pass/packed-struct-vec.rs rename to src/test/ui/run-pass/packed/packed-struct-vec.rs index 9d8b3d0d0741..d64bfe0033b9 100644 --- a/src/test/run-pass/packed-struct-vec.rs +++ b/src/test/ui/run-pass/packed/packed-struct-vec.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(repr_packed)] use std::fmt; diff --git a/src/test/run-pass/packed-tuple-struct-layout.rs b/src/test/ui/run-pass/packed/packed-tuple-struct-layout.rs similarity index 98% rename from src/test/run-pass/packed-tuple-struct-layout.rs rename to src/test/ui/run-pass/packed/packed-tuple-struct-layout.rs index 18f7eff280a8..c709a40cabb9 100644 --- a/src/test/run-pass/packed-tuple-struct-layout.rs +++ b/src/test/ui/run-pass/packed/packed-tuple-struct-layout.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; #[repr(packed)] diff --git a/src/test/run-pass/packed-tuple-struct-size.rs b/src/test/ui/run-pass/packed/packed-tuple-struct-size.rs similarity index 97% rename from src/test/run-pass/packed-tuple-struct-size.rs rename to src/test/ui/run-pass/packed/packed-tuple-struct-size.rs index 9def6ac28e55..b4e24925f75e 100644 --- a/src/test/run-pass/packed-tuple-struct-size.rs +++ b/src/test/ui/run-pass/packed/packed-tuple-struct-size.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #![feature(repr_packed)] use std::mem; diff --git a/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs b/src/test/ui/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs similarity index 99% rename from src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs rename to src/test/ui/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs index 731603606e42..5bff65d0cfab 100644 --- a/src/test/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs +++ b/src/test/ui/run-pass/panic-runtime/abort-link-to-unwinding-crates.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // compile-flags:-C panic=abort // aux-build:exit-success-if-unwind.rs // no-prefer-dynamic diff --git a/src/test/run-pass/panic-runtime/abort.rs b/src/test/ui/run-pass/panic-runtime/abort.rs similarity index 99% rename from src/test/run-pass/panic-runtime/abort.rs rename to src/test/ui/run-pass/panic-runtime/abort.rs index 4692ad3ca2f1..2275efa188ed 100644 --- a/src/test/run-pass/panic-runtime/abort.rs +++ b/src/test/ui/run-pass/panic-runtime/abort.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // compile-flags:-C panic=abort // no-prefer-dynamic // ignore-cloudabi no processes diff --git a/src/test/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs b/src/test/ui/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs similarity index 100% rename from src/test/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs rename to src/test/ui/run-pass/panic-runtime/auxiliary/exit-success-if-unwind.rs diff --git a/src/test/run-pass/panic-runtime/link-to-abort.rs b/src/test/ui/run-pass/panic-runtime/link-to-abort.rs similarity index 97% rename from src/test/run-pass/panic-runtime/link-to-abort.rs rename to src/test/ui/run-pass/panic-runtime/link-to-abort.rs index 9f5407e4526a..5016c9591b06 100644 --- a/src/test/run-pass/panic-runtime/link-to-abort.rs +++ b/src/test/ui/run-pass/panic-runtime/link-to-abort.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // compile-flags:-C panic=abort // no-prefer-dynamic // ignore-macos diff --git a/src/test/run-pass/panic-runtime/link-to-unwind.rs b/src/test/ui/run-pass/panic-runtime/link-to-unwind.rs similarity index 97% rename from src/test/run-pass/panic-runtime/link-to-unwind.rs rename to src/test/ui/run-pass/panic-runtime/link-to-unwind.rs index dec8f738d329..47d7aeaef26e 100644 --- a/src/test/run-pass/panic-runtime/link-to-unwind.rs +++ b/src/test/ui/run-pass/panic-runtime/link-to-unwind.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // no-prefer-dynamic #![feature(panic_unwind)] diff --git a/src/test/run-pass/panic-runtime/lto-abort.rs b/src/test/ui/run-pass/panic-runtime/lto-abort.rs similarity index 98% rename from src/test/run-pass/panic-runtime/lto-abort.rs rename to src/test/ui/run-pass/panic-runtime/lto-abort.rs index 54e02fb69757..6e3dbe1d0f3c 100644 --- a/src/test/run-pass/panic-runtime/lto-abort.rs +++ b/src/test/ui/run-pass/panic-runtime/lto-abort.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // compile-flags:-C lto -C panic=abort // no-prefer-dynamic // ignore-cloudabi no processes diff --git a/src/test/run-pass/panic-runtime/lto-unwind.rs b/src/test/ui/run-pass/panic-runtime/lto-unwind.rs similarity index 98% rename from src/test/run-pass/panic-runtime/lto-unwind.rs rename to src/test/ui/run-pass/panic-runtime/lto-unwind.rs index 52f10688f14f..a0caa4e80c2f 100644 --- a/src/test/run-pass/panic-runtime/lto-unwind.rs +++ b/src/test/ui/run-pass/panic-runtime/lto-unwind.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // compile-flags:-C lto -C panic=unwind // no-prefer-dynamic // ignore-cloudabi no processes diff --git a/src/test/run-pass/panic-handler-chain.rs b/src/test/ui/run-pass/panics/panic-handler-chain.rs similarity index 96% rename from src/test/run-pass/panic-handler-chain.rs rename to src/test/ui/run-pass/panics/panic-handler-chain.rs index e2de795bdb72..c4c3dc1963e2 100644 --- a/src/test/run-pass/panic-handler-chain.rs +++ b/src/test/ui/run-pass/panics/panic-handler-chain.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // ignore-emscripten no threads support #![feature(std_panic)] diff --git a/src/test/run-pass/panic-handler-flail-wildly.rs b/src/test/ui/run-pass/panics/panic-handler-flail-wildly.rs similarity index 97% rename from src/test/run-pass/panic-handler-flail-wildly.rs rename to src/test/ui/run-pass/panics/panic-handler-flail-wildly.rs index f0c50f842ab3..5715202067e6 100644 --- a/src/test/run-pass/panic-handler-flail-wildly.rs +++ b/src/test/ui/run-pass/panics/panic-handler-flail-wildly.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // ignore-emscripten no threads support #![feature(std_panic)] diff --git a/src/test/run-pass/panic-handler-set-twice.rs b/src/test/ui/run-pass/panics/panic-handler-set-twice.rs similarity index 95% rename from src/test/run-pass/panic-handler-set-twice.rs rename to src/test/ui/run-pass/panics/panic-handler-set-twice.rs index 120483ab336f..340333b119e6 100644 --- a/src/test/run-pass/panic-handler-set-twice.rs +++ b/src/test/ui/run-pass/panics/panic-handler-set-twice.rs @@ -7,6 +7,10 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass +#![allow(stable_features)] + #![feature(std_panic)] // ignore-emscripten no threads support diff --git a/src/test/run-pass/panic-in-dtor-drops-fields.rs b/src/test/ui/run-pass/panics/panic-in-dtor-drops-fields.rs similarity index 95% rename from src/test/run-pass/panic-in-dtor-drops-fields.rs rename to src/test/ui/run-pass/panics/panic-in-dtor-drops-fields.rs index c5f92fbd55aa..f5dd2716d2cf 100644 --- a/src/test/run-pass/panic-in-dtor-drops-fields.rs +++ b/src/test/ui/run-pass/panics/panic-in-dtor-drops-fields.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/panic-recover-propagate.rs b/src/test/ui/run-pass/panics/panic-recover-propagate.rs similarity index 98% rename from src/test/run-pass/panic-recover-propagate.rs rename to src/test/ui/run-pass/panics/panic-recover-propagate.rs index cc2cfb6be969..425716151056 100644 --- a/src/test/run-pass/panic-recover-propagate.rs +++ b/src/test/ui/run-pass/panics/panic-recover-propagate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::sync::atomic::{AtomicUsize, Ordering, ATOMIC_USIZE_INIT}; diff --git a/src/test/run-pass/panic-safe.rs b/src/test/ui/run-pass/panics/panic-safe.rs similarity index 99% rename from src/test/run-pass/panic-safe.rs rename to src/test/ui/run-pass/panics/panic-safe.rs index 9bda07f077f0..0d1ce1106395 100644 --- a/src/test/run-pass/panic-safe.rs +++ b/src/test/ui/run-pass/panics/panic-safe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] use std::panic::{UnwindSafe, AssertUnwindSafe}; diff --git a/src/test/run-pass/auxiliary/priv-impl-prim-ty.rs b/src/test/ui/run-pass/privacy/auxiliary/priv-impl-prim-ty.rs similarity index 100% rename from src/test/run-pass/auxiliary/priv-impl-prim-ty.rs rename to src/test/ui/run-pass/privacy/auxiliary/priv-impl-prim-ty.rs diff --git a/src/test/run-pass/auxiliary/privacy_reexport.rs b/src/test/ui/run-pass/privacy/auxiliary/privacy_reexport.rs similarity index 100% rename from src/test/run-pass/auxiliary/privacy_reexport.rs rename to src/test/ui/run-pass/privacy/auxiliary/privacy_reexport.rs diff --git a/src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs b/src/test/ui/run-pass/privacy/auxiliary/pub_use_mods_xcrate.rs similarity index 100% rename from src/test/run-pass/auxiliary/pub_use_mods_xcrate.rs rename to src/test/ui/run-pass/privacy/auxiliary/pub_use_mods_xcrate.rs diff --git a/src/test/run-pass/auxiliary/pub_use_xcrate1.rs b/src/test/ui/run-pass/privacy/auxiliary/pub_use_xcrate1.rs similarity index 100% rename from src/test/run-pass/auxiliary/pub_use_xcrate1.rs rename to src/test/ui/run-pass/privacy/auxiliary/pub_use_xcrate1.rs diff --git a/src/test/run-pass/auxiliary/pub_use_xcrate2.rs b/src/test/ui/run-pass/privacy/auxiliary/pub_use_xcrate2.rs similarity index 100% rename from src/test/run-pass/auxiliary/pub_use_xcrate2.rs rename to src/test/ui/run-pass/privacy/auxiliary/pub_use_xcrate2.rs diff --git a/src/test/run-pass/priv-impl-prim-ty.rs b/src/test/ui/run-pass/privacy/priv-impl-prim-ty.rs similarity index 98% rename from src/test/run-pass/priv-impl-prim-ty.rs rename to src/test/ui/run-pass/privacy/priv-impl-prim-ty.rs index aa2db260dd4a..2cb4dee90afb 100644 --- a/src/test/run-pass/priv-impl-prim-ty.rs +++ b/src/test/ui/run-pass/privacy/priv-impl-prim-ty.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:priv-impl-prim-ty.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/privacy-ns.rs b/src/test/ui/run-pass/privacy/privacy-ns.rs similarity index 97% rename from src/test/run-pass/privacy-ns.rs rename to src/test/ui/run-pass/privacy/privacy-ns.rs index 8082816c4361..f11ff3f41a13 100644 --- a/src/test/run-pass/privacy-ns.rs +++ b/src/test/ui/run-pass/privacy/privacy-ns.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // Check we do the correct privacy checks when we import a name and there is an // item with that name in both the value and type namespaces. diff --git a/src/test/run-pass/privacy-reexport.rs b/src/test/ui/run-pass/privacy/privacy-reexport.rs similarity index 98% rename from src/test/run-pass/privacy-reexport.rs rename to src/test/ui/run-pass/privacy/privacy-reexport.rs index 15c977afe2a6..a12f7bb2611d 100644 --- a/src/test/run-pass/privacy-reexport.rs +++ b/src/test/ui/run-pass/privacy/privacy-reexport.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:privacy_reexport.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/privacy1.rs b/src/test/ui/run-pass/privacy/privacy1.rs similarity index 98% rename from src/test/run-pass/privacy1.rs rename to src/test/ui/run-pass/privacy/privacy1.rs index 329c4aaa873a..7c1dbb500d84 100644 --- a/src/test/run-pass/privacy1.rs +++ b/src/test/ui/run-pass/privacy/privacy1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub mod test2 { diff --git a/src/test/run-pass/private-class-field.rs b/src/test/ui/run-pass/privacy/private-class-field.rs similarity index 94% rename from src/test/run-pass/private-class-field.rs rename to src/test/ui/run-pass/privacy/private-class-field.rs index 8c92a05ba2a6..2910c462c2bc 100644 --- a/src/test/run-pass/private-class-field.rs +++ b/src/test/ui/run-pass/privacy/private-class-field.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + struct cat { meows : usize, diff --git a/src/test/run-pass/private-method.rs b/src/test/ui/run-pass/privacy/private-method.rs similarity index 95% rename from src/test/run-pass/private-method.rs rename to src/test/ui/run-pass/privacy/private-method.rs index 0d6e6010c56c..a0f012a6059b 100644 --- a/src/test/run-pass/private-method.rs +++ b/src/test/ui/run-pass/privacy/private-method.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 struct cat { diff --git a/src/test/run-pass/pub-extern-privacy.rs b/src/test/ui/run-pass/privacy/pub-extern-privacy.rs similarity index 98% rename from src/test/run-pass/pub-extern-privacy.rs rename to src/test/ui/run-pass/privacy/pub-extern-privacy.rs index 1ef804fe8fee..a86133fb283b 100644 --- a/src/test/run-pass/pub-extern-privacy.rs +++ b/src/test/ui/run-pass/privacy/pub-extern-privacy.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc to test ffi with // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/pub-use-xcrate.rs b/src/test/ui/run-pass/privacy/pub-use-xcrate.rs similarity index 98% rename from src/test/run-pass/pub-use-xcrate.rs rename to src/test/ui/run-pass/privacy/pub-use-xcrate.rs index 3318c0380be7..f9c2de224db1 100644 --- a/src/test/run-pass/pub-use-xcrate.rs +++ b/src/test/ui/run-pass/privacy/pub-use-xcrate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:pub_use_xcrate1.rs // aux-build:pub_use_xcrate2.rs diff --git a/src/test/run-pass/pub_use_mods_xcrate_exe.rs b/src/test/ui/run-pass/privacy/pub_use_mods_xcrate_exe.rs similarity index 98% rename from src/test/run-pass/pub_use_mods_xcrate_exe.rs rename to src/test/ui/run-pass/privacy/pub_use_mods_xcrate_exe.rs index 9373b7945d55..4ca7c735308d 100644 --- a/src/test/run-pass/pub_use_mods_xcrate_exe.rs +++ b/src/test/ui/run-pass/privacy/pub_use_mods_xcrate_exe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:pub_use_mods_xcrate.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/process-envs.rs b/src/test/ui/run-pass/process/process-envs.rs similarity index 99% rename from src/test/run-pass/process-envs.rs rename to src/test/ui/run-pass/process/process-envs.rs index e399bc20d52a..4fb21d4dc66d 100644 --- a/src/test/run-pass/process-envs.rs +++ b/src/test/ui/run-pass/process/process-envs.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/process-exit.rs b/src/test/ui/run-pass/process/process-exit.rs similarity index 98% rename from src/test/run-pass/process-exit.rs rename to src/test/ui/run-pass/process/process-exit.rs index 44ef4a9df71a..e43631e3189a 100644 --- a/src/test/run-pass/process-exit.rs +++ b/src/test/ui/run-pass/process/process-exit.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/process-remove-from-env.rs b/src/test/ui/run-pass/process/process-remove-from-env.rs similarity index 99% rename from src/test/run-pass/process-remove-from-env.rs rename to src/test/ui/run-pass/process/process-remove-from-env.rs index 9011ffcf45ad..d9c35f3e993b 100644 --- a/src/test/run-pass/process-remove-from-env.rs +++ b/src/test/ui/run-pass/process/process-remove-from-env.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/process-sigpipe.rs b/src/test/ui/run-pass/process/process-sigpipe.rs similarity index 97% rename from src/test/run-pass/process-sigpipe.rs rename to src/test/ui/run-pass/process/process-sigpipe.rs index a436e48ea530..d1e3fba14cf1 100644 --- a/src/test/run-pass/process-sigpipe.rs +++ b/src/test/ui/run-pass/process/process-sigpipe.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] + // ignore-android since the dynamic linker sets a SIGPIPE handler (to do // a crash report) so inheritance is moot on the entire platform diff --git a/src/test/run-pass/process-spawn-nonexistent.rs b/src/test/ui/run-pass/process/process-spawn-nonexistent.rs similarity index 98% rename from src/test/run-pass/process-spawn-nonexistent.rs rename to src/test/ui/run-pass/process/process-spawn-nonexistent.rs index 9219cd625f30..926e93104f39 100644 --- a/src/test/run-pass/process-spawn-nonexistent.rs +++ b/src/test/ui/run-pass/process/process-spawn-nonexistent.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/process-spawn-with-unicode-params.rs b/src/test/ui/run-pass/process/process-spawn-with-unicode-params.rs similarity index 99% rename from src/test/run-pass/process-spawn-with-unicode-params.rs rename to src/test/ui/run-pass/process/process-spawn-with-unicode-params.rs index 1e22f17986c3..70ed79825082 100644 --- a/src/test/run-pass/process-spawn-with-unicode-params.rs +++ b/src/test/ui/run-pass/process/process-spawn-with-unicode-params.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // no-prefer-dynamic // The test copies itself into a subdirectory with a non-ASCII name and then diff --git a/src/test/run-pass/process-status-inherits-stdin.rs b/src/test/ui/run-pass/process/process-status-inherits-stdin.rs similarity index 99% rename from src/test/run-pass/process-status-inherits-stdin.rs rename to src/test/ui/run-pass/process/process-status-inherits-stdin.rs index fdf5cf5ad928..1b09d5e52bcf 100644 --- a/src/test/run-pass/process-status-inherits-stdin.rs +++ b/src/test/ui/run-pass/process/process-status-inherits-stdin.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi no processes // ignore-emscripten no processes diff --git a/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs b/src/test/ui/run-pass/regions/regions-addr-of-interior-of-unique-box.rs similarity index 98% rename from src/test/run-pass/regions-addr-of-interior-of-unique-box.rs rename to src/test/ui/run-pass/regions/regions-addr-of-interior-of-unique-box.rs index 4839067e53d1..770733b89397 100644 --- a/src/test/run-pass/regions-addr-of-interior-of-unique-box.rs +++ b/src/test/ui/run-pass/regions/regions-addr-of-interior-of-unique-box.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/regions-addr-of-ret.rs b/src/test/ui/run-pass/regions/regions-addr-of-ret.rs similarity index 97% rename from src/test/run-pass/regions-addr-of-ret.rs rename to src/test/ui/run-pass/regions/regions-addr-of-ret.rs index 3baf2fa2de51..a9953edb2f57 100644 --- a/src/test/run-pass/regions-addr-of-ret.rs +++ b/src/test/ui/run-pass/regions/regions-addr-of-ret.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn f(x: &isize) -> &isize { return &*x; } diff --git a/src/test/run-pass/regions-assoc-type-region-bound.rs b/src/test/ui/run-pass/regions/regions-assoc-type-region-bound.rs similarity index 98% rename from src/test/run-pass/regions-assoc-type-region-bound.rs rename to src/test/ui/run-pass/regions/regions-assoc-type-region-bound.rs index b51d62f490f3..a7801136a842 100644 --- a/src/test/run-pass/regions-assoc-type-region-bound.rs +++ b/src/test/ui/run-pass/regions/regions-assoc-type-region-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the compiler considers the 'a bound declared in the // trait. Issue #20890. diff --git a/src/test/run-pass/regions-assoc-type-static-bound.rs b/src/test/ui/run-pass/regions/regions-assoc-type-static-bound.rs similarity index 98% rename from src/test/run-pass/regions-assoc-type-static-bound.rs rename to src/test/ui/run-pass/regions/regions-assoc-type-static-bound.rs index 344f707aefc0..b81d30568130 100644 --- a/src/test/run-pass/regions-assoc-type-static-bound.rs +++ b/src/test/ui/run-pass/regions/regions-assoc-type-static-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the compiler considers the 'static bound declared in the // trait. Issue #20890. diff --git a/src/test/run-pass/regions-borrow-at.rs b/src/test/ui/run-pass/regions/regions-borrow-at.rs similarity index 98% rename from src/test/run-pass/regions-borrow-at.rs rename to src/test/ui/run-pass/regions/regions-borrow-at.rs index abebb670e65d..02603292d1b4 100644 --- a/src/test/run-pass/regions-borrow-at.rs +++ b/src/test/ui/run-pass/regions/regions-borrow-at.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn foo(x: &usize) -> usize { diff --git a/src/test/run-pass/regions-borrow-evec-fixed.rs b/src/test/ui/run-pass/regions/regions-borrow-evec-fixed.rs similarity index 97% rename from src/test/run-pass/regions-borrow-evec-fixed.rs rename to src/test/ui/run-pass/regions/regions-borrow-evec-fixed.rs index 6d1f2930abf3..50336cf8cdcb 100644 --- a/src/test/run-pass/regions-borrow-evec-fixed.rs +++ b/src/test/ui/run-pass/regions/regions-borrow-evec-fixed.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo(x: &[isize]) -> isize { x[0] diff --git a/src/test/run-pass/regions-borrow-evec-uniq.rs b/src/test/ui/run-pass/regions/regions-borrow-evec-uniq.rs similarity index 98% rename from src/test/run-pass/regions-borrow-evec-uniq.rs rename to src/test/ui/run-pass/regions/regions-borrow-evec-uniq.rs index e61a8d147757..5f61ab896355 100644 --- a/src/test/run-pass/regions-borrow-evec-uniq.rs +++ b/src/test/ui/run-pass/regions/regions-borrow-evec-uniq.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo(x: &[isize]) -> isize { diff --git a/src/test/run-pass/regions-borrow-uniq.rs b/src/test/ui/run-pass/regions/regions-borrow-uniq.rs similarity index 98% rename from src/test/run-pass/regions-borrow-uniq.rs rename to src/test/ui/run-pass/regions/regions-borrow-uniq.rs index 48b09b338511..cc88528f64bd 100644 --- a/src/test/run-pass/regions-borrow-uniq.rs +++ b/src/test/ui/run-pass/regions/regions-borrow-uniq.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn foo(x: &usize) -> usize { diff --git a/src/test/run-pass/regions-bot.rs b/src/test/ui/run-pass/regions/regions-bot.rs similarity index 98% rename from src/test/run-pass/regions-bot.rs rename to src/test/ui/run-pass/regions/regions-bot.rs index 4347cbe2dc9c..d3af66b41622 100644 --- a/src/test/run-pass/regions-bot.rs +++ b/src/test/ui/run-pass/regions/regions-bot.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A very limited test of the "bottom" region diff --git a/src/test/run-pass/regions-bound-lists-feature-gate-2.rs b/src/test/ui/run-pass/regions/regions-bound-lists-feature-gate-2.rs similarity index 93% rename from src/test/run-pass/regions-bound-lists-feature-gate-2.rs rename to src/test/ui/run-pass/regions/regions-bound-lists-feature-gate-2.rs index 47d2fe363d36..d5d2408d5d24 100644 --- a/src/test/run-pass/regions-bound-lists-feature-gate-2.rs +++ b/src/test/ui/run-pass/regions/regions-bound-lists-feature-gate-2.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + #![feature(issue_5723_bootstrap)] trait Foo { diff --git a/src/test/run-pass/regions-bound-lists-feature-gate.rs b/src/test/ui/run-pass/regions/regions-bound-lists-feature-gate.rs similarity index 93% rename from src/test/run-pass/regions-bound-lists-feature-gate.rs rename to src/test/ui/run-pass/regions/regions-bound-lists-feature-gate.rs index 72db92aa93ce..50073f8b9f05 100644 --- a/src/test/run-pass/regions-bound-lists-feature-gate.rs +++ b/src/test/ui/run-pass/regions/regions-bound-lists-feature-gate.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + #![feature(issue_5723_bootstrap)] trait Foo { diff --git a/src/test/run-pass/regions-close-over-type-parameter-successfully.rs b/src/test/ui/run-pass/regions/regions-close-over-type-parameter-successfully.rs similarity index 98% rename from src/test/run-pass/regions-close-over-type-parameter-successfully.rs rename to src/test/ui/run-pass/regions/regions-close-over-type-parameter-successfully.rs index 4a24e201b353..b2bf71f02fba 100644 --- a/src/test/run-pass/regions-close-over-type-parameter-successfully.rs +++ b/src/test/ui/run-pass/regions/regions-close-over-type-parameter-successfully.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A test where we (successfully) close over a reference into // an object. diff --git a/src/test/run-pass/regions-copy-closure.rs b/src/test/ui/run-pass/regions/regions-copy-closure.rs similarity index 94% rename from src/test/run-pass/regions-copy-closure.rs rename to src/test/ui/run-pass/regions/regions-copy-closure.rs index 371823ece294..a5f0860be167 100644 --- a/src/test/run-pass/regions-copy-closure.rs +++ b/src/test/ui/run-pass/regions/regions-copy-closure.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + struct closure_box<'a> { cl: Box, } diff --git a/src/test/run-pass/regions-creating-enums2.rs b/src/test/ui/run-pass/regions/regions-creating-enums2.rs similarity index 93% rename from src/test/run-pass/regions-creating-enums2.rs rename to src/test/ui/run-pass/regions/regions-creating-enums2.rs index 66d28f5afa17..84d4a261f1d9 100644 --- a/src/test/run-pass/regions-creating-enums2.rs +++ b/src/test/ui/run-pass/regions/regions-creating-enums2.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 enum ast<'a> { diff --git a/src/test/run-pass/regions-creating-enums5.rs b/src/test/ui/run-pass/regions/regions-creating-enums5.rs similarity index 93% rename from src/test/run-pass/regions-creating-enums5.rs rename to src/test/ui/run-pass/regions/regions-creating-enums5.rs index 4bd12863e2a3..24ba0c176113 100644 --- a/src/test/run-pass/regions-creating-enums5.rs +++ b/src/test/ui/run-pass/regions/regions-creating-enums5.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 enum ast<'a> { diff --git a/src/test/run-pass/regions-debruijn-of-object.rs b/src/test/ui/run-pass/regions/regions-debruijn-of-object.rs similarity index 94% rename from src/test/run-pass/regions-debruijn-of-object.rs rename to src/test/ui/run-pass/regions/regions-debruijn-of-object.rs index 9f2d27f024bb..71464f30ef03 100644 --- a/src/test/run-pass/regions-debruijn-of-object.rs +++ b/src/test/ui/run-pass/regions/regions-debruijn-of-object.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 struct ctxt<'tcx> { diff --git a/src/test/run-pass/regions-dependent-addr-of.rs b/src/test/ui/run-pass/regions/regions-dependent-addr-of.rs similarity index 99% rename from src/test/run-pass/regions-dependent-addr-of.rs rename to src/test/ui/run-pass/regions/regions-dependent-addr-of.rs index c8b39bbe7499..2a86d8aa4e5b 100644 --- a/src/test/run-pass/regions-dependent-addr-of.rs +++ b/src/test/ui/run-pass/regions/regions-dependent-addr-of.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test lifetimes are linked properly when we create dependent region pointers. // Issue #3148. diff --git a/src/test/run-pass/regions-dependent-autofn.rs b/src/test/ui/run-pass/regions/regions-dependent-autofn.rs similarity index 98% rename from src/test/run-pass/regions-dependent-autofn.rs rename to src/test/ui/run-pass/regions/regions-dependent-autofn.rs index ef05fc595df1..19b345575c39 100644 --- a/src/test/run-pass/regions-dependent-autofn.rs +++ b/src/test/ui/run-pass/regions/regions-dependent-autofn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test lifetimes are linked properly when we autoslice a vector. // Issue #3148. diff --git a/src/test/run-pass/regions-dependent-autoslice.rs b/src/test/ui/run-pass/regions/regions-dependent-autoslice.rs similarity index 98% rename from src/test/run-pass/regions-dependent-autoslice.rs rename to src/test/ui/run-pass/regions/regions-dependent-autoslice.rs index cd140f7aa599..12e14ed49b9c 100644 --- a/src/test/run-pass/regions-dependent-autoslice.rs +++ b/src/test/ui/run-pass/regions/regions-dependent-autoslice.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test lifetimes are linked properly when we autoslice a vector. // Issue #3148. diff --git a/src/test/run-pass/regions-dependent-let-ref.rs b/src/test/ui/run-pass/regions/regions-dependent-let-ref.rs similarity index 98% rename from src/test/run-pass/regions-dependent-let-ref.rs rename to src/test/ui/run-pass/regions/regions-dependent-let-ref.rs index 1b869e462b0f..fa0955bc351e 100644 --- a/src/test/run-pass/regions-dependent-let-ref.rs +++ b/src/test/ui/run-pass/regions/regions-dependent-let-ref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test lifetimes are linked properly when we take reference // to interior. diff --git a/src/test/run-pass/regions-early-bound-lifetime-in-assoc-fn.rs b/src/test/ui/run-pass/regions/regions-early-bound-lifetime-in-assoc-fn.rs similarity index 99% rename from src/test/run-pass/regions-early-bound-lifetime-in-assoc-fn.rs rename to src/test/ui/run-pass/regions/regions-early-bound-lifetime-in-assoc-fn.rs index 0ffbc432aaeb..77659c100ff3 100644 --- a/src/test/run-pass/regions-early-bound-lifetime-in-assoc-fn.rs +++ b/src/test/ui/run-pass/regions/regions-early-bound-lifetime-in-assoc-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to compile calls to associated fns like // `decode()` where the bound on the `Self` parameter references a // lifetime parameter of the trait. This example indicates why trait diff --git a/src/test/run-pass/regions-early-bound-trait-param.rs b/src/test/ui/run-pass/regions/regions-early-bound-trait-param.rs similarity index 99% rename from src/test/run-pass/regions-early-bound-trait-param.rs rename to src/test/ui/run-pass/regions/regions-early-bound-trait-param.rs index 75c209a09207..220614c9203e 100644 --- a/src/test/run-pass/regions-early-bound-trait-param.rs +++ b/src/test/ui/run-pass/regions/regions-early-bound-trait-param.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that you can use an early-bound lifetime parameter as // on of the generic parameters in a trait. diff --git a/src/test/run-pass/regions-early-bound-used-in-bound-method.rs b/src/test/ui/run-pass/regions/regions-early-bound-used-in-bound-method.rs similarity index 98% rename from src/test/run-pass/regions-early-bound-used-in-bound-method.rs rename to src/test/ui/run-pass/regions/regions-early-bound-used-in-bound-method.rs index c7bc8dc0a515..718ab873a41f 100644 --- a/src/test/run-pass/regions-early-bound-used-in-bound-method.rs +++ b/src/test/ui/run-pass/regions/regions-early-bound-used-in-bound-method.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that you can use a fn lifetime parameter as part of // the value for a type parameter in a bound. diff --git a/src/test/run-pass/regions-early-bound-used-in-bound.rs b/src/test/ui/run-pass/regions/regions-early-bound-used-in-bound.rs similarity index 98% rename from src/test/run-pass/regions-early-bound-used-in-bound.rs rename to src/test/ui/run-pass/regions/regions-early-bound-used-in-bound.rs index 3c8c78aa1169..e994303643f4 100644 --- a/src/test/run-pass/regions-early-bound-used-in-bound.rs +++ b/src/test/ui/run-pass/regions/regions-early-bound-used-in-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that you can use a fn lifetime parameter as part of // the value for a type parameter in a bound. diff --git a/src/test/run-pass/regions-early-bound-used-in-type-param.rs b/src/test/ui/run-pass/regions/regions-early-bound-used-in-type-param.rs similarity index 98% rename from src/test/run-pass/regions-early-bound-used-in-type-param.rs rename to src/test/ui/run-pass/regions/regions-early-bound-used-in-type-param.rs index 8d145fad004a..fd4e46b5392c 100644 --- a/src/test/run-pass/regions-early-bound-used-in-type-param.rs +++ b/src/test/ui/run-pass/regions/regions-early-bound-used-in-type-param.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that you can use a fn lifetime parameter as part of // the value for a type parameter in a bound. diff --git a/src/test/run-pass/regions-escape-into-other-fn.rs b/src/test/ui/run-pass/regions/regions-escape-into-other-fn.rs similarity index 98% rename from src/test/run-pass/regions-escape-into-other-fn.rs rename to src/test/ui/run-pass/regions/regions-escape-into-other-fn.rs index 7cb719cccced..1601e73aff92 100644 --- a/src/test/run-pass/regions-escape-into-other-fn.rs +++ b/src/test/ui/run-pass/regions/regions-escape-into-other-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn foo(x: &usize) -> &usize { x } diff --git a/src/test/run-pass/regions-expl-self.rs b/src/test/ui/run-pass/regions/regions-expl-self.rs similarity index 98% rename from src/test/run-pass/regions-expl-self.rs rename to src/test/ui/run-pass/regions/regions-expl-self.rs index 7ad3c3f4e171..1af6febb53af 100644 --- a/src/test/run-pass/regions-expl-self.rs +++ b/src/test/ui/run-pass/regions/regions-expl-self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that you can insert an explicit lifetime in explicit self. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/regions-fn-subtyping-2.rs b/src/test/ui/run-pass/regions/regions-fn-subtyping-2.rs similarity index 98% rename from src/test/run-pass/regions-fn-subtyping-2.rs rename to src/test/ui/run-pass/regions/regions-fn-subtyping-2.rs index 7f2fc11cb8e0..a23c5005f07d 100644 --- a/src/test/run-pass/regions-fn-subtyping-2.rs +++ b/src/test/ui/run-pass/regions/regions-fn-subtyping-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #2263. // Here, `f` is a function that takes a pointer `x` and a function diff --git a/src/test/run-pass/regions-fn-subtyping.rs b/src/test/ui/run-pass/regions/regions-fn-subtyping.rs similarity index 97% rename from src/test/run-pass/regions-fn-subtyping.rs rename to src/test/ui/run-pass/regions/regions-fn-subtyping.rs index f762b4f41ed4..e561fa743462 100644 --- a/src/test/run-pass/regions-fn-subtyping.rs +++ b/src/test/ui/run-pass/regions/regions-fn-subtyping.rs @@ -8,11 +8,11 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #2263. // pretty-expanded FIXME #23616 -#![allow(dead_assignment)] #![allow(unused_variables)] // Should pass region checking. diff --git a/src/test/run-pass/regions-free-region-outlives-static-outlives-free-region.rs b/src/test/ui/run-pass/regions/regions-free-region-outlives-static-outlives-free-region.rs similarity index 98% rename from src/test/run-pass/regions-free-region-outlives-static-outlives-free-region.rs rename to src/test/ui/run-pass/regions/regions-free-region-outlives-static-outlives-free-region.rs index 09c8d1f23a26..67a77940742d 100644 --- a/src/test/run-pass/regions-free-region-outlives-static-outlives-free-region.rs +++ b/src/test/ui/run-pass/regions/regions-free-region-outlives-static-outlives-free-region.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we recognize that if you have // // 'a : 'static diff --git a/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-addr-of.rs similarity index 98% rename from src/test/run-pass/regions-infer-borrow-scope-addr-of.rs rename to src/test/ui/run-pass/regions/regions-infer-borrow-scope-addr-of.rs index 5c80863ce859..6ac09930f857 100644 --- a/src/test/run-pass/regions-infer-borrow-scope-addr-of.rs +++ b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-addr-of.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem::swap; diff --git a/src/test/run-pass/regions-infer-borrow-scope-view.rs b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-view.rs similarity index 98% rename from src/test/run-pass/regions-infer-borrow-scope-view.rs rename to src/test/ui/run-pass/regions/regions-infer-borrow-scope-view.rs index 262e936826e5..2ad1378de041 100644 --- a/src/test/run-pass/regions-infer-borrow-scope-view.rs +++ b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-view.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn view(x: &[T]) -> &[T] {x} diff --git a/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-within-loop-ok.rs similarity index 98% rename from src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs rename to src/test/ui/run-pass/regions/regions-infer-borrow-scope-within-loop-ok.rs index a40ba8382fc2..d527f298ce02 100644 --- a/src/test/run-pass/regions-infer-borrow-scope-within-loop-ok.rs +++ b/src/test/ui/run-pass/regions/regions-infer-borrow-scope-within-loop-ok.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn borrow(x: &T) -> &T {x} diff --git a/src/test/run-pass/regions-infer-borrow-scope.rs b/src/test/ui/run-pass/regions/regions-infer-borrow-scope.rs similarity index 98% rename from src/test/run-pass/regions-infer-borrow-scope.rs rename to src/test/ui/run-pass/regions/regions-infer-borrow-scope.rs index 72208272df75..f3660d8dd17d 100644 --- a/src/test/run-pass/regions-infer-borrow-scope.rs +++ b/src/test/ui/run-pass/regions/regions-infer-borrow-scope.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct Point {x: isize, y: isize} diff --git a/src/test/run-pass/regions-infer-call-2.rs b/src/test/ui/run-pass/regions/regions-infer-call-2.rs similarity index 98% rename from src/test/run-pass/regions-infer-call-2.rs rename to src/test/ui/run-pass/regions/regions-infer-call-2.rs index b994bc7b8555..8fcfd5f2ee5c 100644 --- a/src/test/run-pass/regions-infer-call-2.rs +++ b/src/test/ui/run-pass/regions/regions-infer-call-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn takes_two(x: &isize, y: &isize) -> isize { *x + *y } diff --git a/src/test/run-pass/regions-infer-call.rs b/src/test/ui/run-pass/regions/regions-infer-call.rs similarity index 98% rename from src/test/run-pass/regions-infer-call.rs rename to src/test/ui/run-pass/regions/regions-infer-call.rs index 76b93f2356b0..42ab24705dee 100644 --- a/src/test/run-pass/regions-infer-call.rs +++ b/src/test/ui/run-pass/regions/regions-infer-call.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn takes_two(x: &isize, y: &isize) -> isize { *x + *y } diff --git a/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs b/src/test/ui/run-pass/regions/regions-infer-contravariance-due-to-ret.rs similarity index 94% rename from src/test/run-pass/regions-infer-contravariance-due-to-ret.rs rename to src/test/ui/run-pass/regions/regions-infer-contravariance-due-to-ret.rs index 3c6bc1339996..fc152fd275a2 100644 --- a/src/test/run-pass/regions-infer-contravariance-due-to-ret.rs +++ b/src/test/ui/run-pass/regions/regions-infer-contravariance-due-to-ret.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + struct boxed_int<'a> { f: &'a isize, diff --git a/src/test/run-pass/regions-infer-reborrow-ref-mut-recurse.rs b/src/test/ui/run-pass/regions/regions-infer-reborrow-ref-mut-recurse.rs similarity index 98% rename from src/test/run-pass/regions-infer-reborrow-ref-mut-recurse.rs rename to src/test/ui/run-pass/regions/regions-infer-reborrow-ref-mut-recurse.rs index 2349b6c3bc14..f6ed97195c1d 100644 --- a/src/test/run-pass/regions-infer-reborrow-ref-mut-recurse.rs +++ b/src/test/ui/run-pass/regions/regions-infer-reborrow-ref-mut-recurse.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test an edge case in region inference: the lifetime of the borrow // of `*x` must be extended to at least 'a. diff --git a/src/test/run-pass/regions-infer-region-in-fn-but-not-type.rs b/src/test/ui/run-pass/regions/regions-infer-region-in-fn-but-not-type.rs similarity index 94% rename from src/test/run-pass/regions-infer-region-in-fn-but-not-type.rs rename to src/test/ui/run-pass/regions/regions-infer-region-in-fn-but-not-type.rs index a8418f967fdb..7af25be1d03a 100644 --- a/src/test/run-pass/regions-infer-region-in-fn-but-not-type.rs +++ b/src/test/ui/run-pass/regions/regions-infer-region-in-fn-but-not-type.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // check that the &isize here does not cause us to think that `foo` // contains region pointers diff --git a/src/test/run-pass/regions-infer-static-from-proc.rs b/src/test/ui/run-pass/regions/regions-infer-static-from-proc.rs similarity index 94% rename from src/test/run-pass/regions-infer-static-from-proc.rs rename to src/test/ui/run-pass/regions/regions-infer-static-from-proc.rs index 403dfbf655f3..2a3cb3735ec3 100644 --- a/src/test/run-pass/regions-infer-static-from-proc.rs +++ b/src/test/ui/run-pass/regions/regions-infer-static-from-proc.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // Check that the 'static bound on a proc influences lifetimes of // region variables contained within (otherwise, region inference will // give `x` a very short lifetime). diff --git a/src/test/run-pass/regions-issue-21422.rs b/src/test/ui/run-pass/regions/regions-issue-21422.rs similarity index 98% rename from src/test/run-pass/regions-issue-21422.rs rename to src/test/ui/run-pass/regions/regions-issue-21422.rs index ecc170a1462a..6e76793e8b9a 100644 --- a/src/test/run-pass/regions-issue-21422.rs +++ b/src/test/ui/run-pass/regions/regions-issue-21422.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #21422, which was related to failing to // add inference constraints that the operands of a binary operator // should outlive the binary operation itself. diff --git a/src/test/run-pass/regions-issue-22246.rs b/src/test/ui/run-pass/regions/regions-issue-22246.rs similarity index 98% rename from src/test/run-pass/regions-issue-22246.rs rename to src/test/ui/run-pass/regions/regions-issue-22246.rs index b6815d929678..8a54f30133ed 100644 --- a/src/test/run-pass/regions-issue-22246.rs +++ b/src/test/ui/run-pass/regions/regions-issue-22246.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #22246 -- we should be able to deduce // that `&'a B::Owned` implies that `B::Owned : 'a`. diff --git a/src/test/run-pass/regions-lifetime-nonfree-late-bound.rs b/src/test/ui/run-pass/regions/regions-lifetime-nonfree-late-bound.rs similarity index 99% rename from src/test/run-pass/regions-lifetime-nonfree-late-bound.rs rename to src/test/ui/run-pass/regions/regions-lifetime-nonfree-late-bound.rs index 2a20cd2b773c..1a294dceab8a 100644 --- a/src/test/run-pass/regions-lifetime-nonfree-late-bound.rs +++ b/src/test/ui/run-pass/regions/regions-lifetime-nonfree-late-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This is a regression test for the ICE from issue #10846. // // The original issue causing the ICE: the LUB-computations during diff --git a/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs b/src/test/ui/run-pass/regions/regions-lifetime-static-items-enclosing-scopes.rs similarity index 98% rename from src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs rename to src/test/ui/run-pass/regions/regions-lifetime-static-items-enclosing-scopes.rs index df034df73624..758473634cb4 100644 --- a/src/test/run-pass/regions-lifetime-static-items-enclosing-scopes.rs +++ b/src/test/ui/run-pass/regions/regions-lifetime-static-items-enclosing-scopes.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test verifies that temporary lifetime is correctly computed // for static objects in enclosing scopes. diff --git a/src/test/run-pass/regions-link-fn-args.rs b/src/test/ui/run-pass/regions/regions-link-fn-args.rs similarity index 98% rename from src/test/run-pass/regions-link-fn-args.rs rename to src/test/ui/run-pass/regions/regions-link-fn-args.rs index 9e8ce6160487..cb52c69cbe3e 100644 --- a/src/test/run-pass/regions-link-fn-args.rs +++ b/src/test/ui/run-pass/regions/regions-link-fn-args.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that region inference correctly links up the regions when a // `ref` borrow occurs inside a fn argument. diff --git a/src/test/run-pass/regions-lub-ref-ref-rc.rs b/src/test/ui/run-pass/regions/regions-lub-ref-ref-rc.rs similarity index 99% rename from src/test/run-pass/regions-lub-ref-ref-rc.rs rename to src/test/ui/run-pass/regions/regions-lub-ref-ref-rc.rs index ade742863a9d..907746a65eed 100644 --- a/src/test/run-pass/regions-lub-ref-ref-rc.rs +++ b/src/test/ui/run-pass/regions/regions-lub-ref-ref-rc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test a corner case of LUB coercion. In this case, one arm of the // match requires a deref coercion and the other doesn't, and there // is an extra `&` on the `rc`. We want to be sure that the lifetime diff --git a/src/test/run-pass/regions-mock-codegen.rs b/src/test/ui/run-pass/regions/regions-mock-codegen.rs similarity index 96% rename from src/test/run-pass/regions-mock-codegen.rs rename to src/test/ui/run-pass/regions/regions-mock-codegen.rs index b58e837f3bdc..6d521432849e 100644 --- a/src/test/run-pass/regions-mock-codegen.rs +++ b/src/test/ui/run-pass/regions/regions-mock-codegen.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 #![feature(allocator_api)] diff --git a/src/test/run-pass/regions-no-bound-in-argument-cleanup.rs b/src/test/ui/run-pass/regions/regions-no-bound-in-argument-cleanup.rs similarity index 98% rename from src/test/run-pass/regions-no-bound-in-argument-cleanup.rs rename to src/test/ui/run-pass/regions/regions-no-bound-in-argument-cleanup.rs index cdb58d1ba4c0..0f2fa1f7c78e 100644 --- a/src/test/run-pass/regions-no-bound-in-argument-cleanup.rs +++ b/src/test/ui/run-pass/regions/regions-no-bound-in-argument-cleanup.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::marker; diff --git a/src/test/run-pass/regions-no-variance-from-fn-generics.rs b/src/test/ui/run-pass/regions/regions-no-variance-from-fn-generics.rs similarity index 99% rename from src/test/run-pass/regions-no-variance-from-fn-generics.rs rename to src/test/ui/run-pass/regions/regions-no-variance-from-fn-generics.rs index c339be25f8bb..3d0d5f2dbcfe 100644 --- a/src/test/run-pass/regions-no-variance-from-fn-generics.rs +++ b/src/test/ui/run-pass/regions/regions-no-variance-from-fn-generics.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #12856: a lifetime formal binding introduced by a generic fn // should not upset the variance inference for actual occurrences of // that lifetime in type expressions. diff --git a/src/test/run-pass/regions-nullary-variant.rs b/src/test/ui/run-pass/regions/regions-nullary-variant.rs similarity index 93% rename from src/test/run-pass/regions-nullary-variant.rs rename to src/test/ui/run-pass/regions/regions-nullary-variant.rs index ae55b97dc932..b24e24963506 100644 --- a/src/test/run-pass/regions-nullary-variant.rs +++ b/src/test/ui/run-pass/regions/regions-nullary-variant.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 enum roption<'a> { diff --git a/src/test/run-pass/regions-params.rs b/src/test/ui/run-pass/regions/regions-params.rs similarity index 98% rename from src/test/run-pass/regions-params.rs rename to src/test/ui/run-pass/regions/regions-params.rs index dbd52bd6b60e..b7060cb2b942 100644 --- a/src/test/run-pass/regions-params.rs +++ b/src/test/ui/run-pass/regions/regions-params.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn region_identity(x: &usize) -> &usize { x } diff --git a/src/test/run-pass/regions-reassign-let-bound-pointer.rs b/src/test/ui/run-pass/regions/regions-reassign-let-bound-pointer.rs similarity index 98% rename from src/test/run-pass/regions-reassign-let-bound-pointer.rs rename to src/test/ui/run-pass/regions/regions-reassign-let-bound-pointer.rs index b29cc8f90368..0a30dcb721f9 100644 --- a/src/test/run-pass/regions-reassign-let-bound-pointer.rs +++ b/src/test/ui/run-pass/regions/regions-reassign-let-bound-pointer.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that the type checker permits us to reassign `z` which // started out with a longer lifetime and was reassigned to a shorter // one (it should infer to be the intersection). diff --git a/src/test/run-pass/regions-reassign-match-bound-pointer.rs b/src/test/ui/run-pass/regions/regions-reassign-match-bound-pointer.rs similarity index 98% rename from src/test/run-pass/regions-reassign-match-bound-pointer.rs rename to src/test/ui/run-pass/regions/regions-reassign-match-bound-pointer.rs index 58d4f556a79c..28455b1f3cf1 100644 --- a/src/test/run-pass/regions-reassign-match-bound-pointer.rs +++ b/src/test/ui/run-pass/regions/regions-reassign-match-bound-pointer.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that the type checker permits us to reassign `z` which // started out with a longer lifetime and was reassigned to a shorter // one (it should infer to be the intersection). diff --git a/src/test/run-pass/regions-refcell.rs b/src/test/ui/run-pass/regions/regions-refcell.rs similarity index 99% rename from src/test/run-pass/regions-refcell.rs rename to src/test/ui/run-pass/regions/regions-refcell.rs index ca6a62c10c26..0042edb65ad8 100644 --- a/src/test/run-pass/regions-refcell.rs +++ b/src/test/ui/run-pass/regions/regions-refcell.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This is a regression test for something that only came up while // attempting to bootstrap librustc with new destructor lifetime // semantics. diff --git a/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs b/src/test/ui/run-pass/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs similarity index 99% rename from src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs rename to src/test/ui/run-pass/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs index 3322fc36fd3a..86d841726293 100644 --- a/src/test/run-pass/regions-relate-bound-regions-on-closures-to-inference-variables.rs +++ b/src/test/ui/run-pass/regions/regions-relate-bound-regions-on-closures-to-inference-variables.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that this fairly specialized, but also reasonable, pattern // typechecks. The pattern involves regions bound in closures that // wind up related to inference variables. diff --git a/src/test/run-pass/regions-return-interior-of-option.rs b/src/test/ui/run-pass/regions/regions-return-interior-of-option.rs similarity index 98% rename from src/test/run-pass/regions-return-interior-of-option.rs rename to src/test/ui/run-pass/regions/regions-return-interior-of-option.rs index fe1c68ff4281..6566969185c2 100644 --- a/src/test/run-pass/regions-return-interior-of-option.rs +++ b/src/test/ui/run-pass/regions/regions-return-interior-of-option.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn get(opt: &Option) -> &T { match *opt { diff --git a/src/test/run-pass/regions-scope-chain-example.rs b/src/test/ui/run-pass/regions/regions-scope-chain-example.rs similarity index 99% rename from src/test/run-pass/regions-scope-chain-example.rs rename to src/test/ui/run-pass/regions/regions-scope-chain-example.rs index 185d5db1f511..973f7bd5319a 100644 --- a/src/test/run-pass/regions-scope-chain-example.rs +++ b/src/test/ui/run-pass/regions/regions-scope-chain-example.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This is an example where the older inference algorithm failed. The // specifics of why it failed are somewhat, but not entirely, tailed // to the algorithm. Ultimately the problem is that when computing the diff --git a/src/test/run-pass/regions-self-impls.rs b/src/test/ui/run-pass/regions/regions-self-impls.rs similarity index 94% rename from src/test/run-pass/regions-self-impls.rs rename to src/test/ui/run-pass/regions/regions-self-impls.rs index 26e3fbfab9e6..027c7698bf80 100644 --- a/src/test/run-pass/regions-self-impls.rs +++ b/src/test/ui/run-pass/regions/regions-self-impls.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + struct Clam<'a> { chowder: &'a isize } diff --git a/src/test/run-pass/regions-self-in-enums.rs b/src/test/ui/run-pass/regions/regions-self-in-enums.rs similarity index 94% rename from src/test/run-pass/regions-self-in-enums.rs rename to src/test/ui/run-pass/regions/regions-self-in-enums.rs index 9ff20e93a0df..5cb9ad7774ce 100644 --- a/src/test/run-pass/regions-self-in-enums.rs +++ b/src/test/ui/run-pass/regions/regions-self-in-enums.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + enum int_wrapper<'a> { int_wrapper_ctor(&'a isize) } diff --git a/src/test/run-pass/regions-simple.rs b/src/test/ui/run-pass/regions/regions-simple.rs similarity index 97% rename from src/test/run-pass/regions-simple.rs rename to src/test/ui/run-pass/regions/regions-simple.rs index f4fe73131fe3..66492b966d13 100644 --- a/src/test/run-pass/regions-simple.rs +++ b/src/test/ui/run-pass/regions/regions-simple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut x: isize = 3; let y: &mut isize = &mut x; diff --git a/src/test/run-pass/regions-static-bound.rs b/src/test/ui/run-pass/regions/regions-static-bound.rs similarity index 98% rename from src/test/run-pass/regions-static-bound.rs rename to src/test/ui/run-pass/regions/regions-static-bound.rs index 1c6411e3b8f1..7a8e91ccddae 100644 --- a/src/test/run-pass/regions-static-bound.rs +++ b/src/test/ui/run-pass/regions/regions-static-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn invariant_id<'a,'b>(t: &'b mut &'static ()) -> &'b mut &'a () where 'a: 'static { t } fn static_id<'a>(t: &'a ()) -> &'static () diff --git a/src/test/run-pass/regions-static-closure.rs b/src/test/ui/run-pass/regions/regions-static-closure.rs similarity index 94% rename from src/test/run-pass/regions-static-closure.rs rename to src/test/ui/run-pass/regions/regions-static-closure.rs index fa1c3b230c6e..fa579a31806e 100644 --- a/src/test/run-pass/regions-static-closure.rs +++ b/src/test/ui/run-pass/regions/regions-static-closure.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + struct closure_box<'a> { cl: Box, } diff --git a/src/test/run-pass/regions-trait-object-1.rs b/src/test/ui/run-pass/regions/regions-trait-object-1.rs similarity index 98% rename from src/test/run-pass/regions-trait-object-1.rs rename to src/test/ui/run-pass/regions/regions-trait-object-1.rs index 542dc76061fe..63bbe31d4310 100644 --- a/src/test/run-pass/regions-trait-object-1.rs +++ b/src/test/ui/run-pass/regions/regions-trait-object-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This is a regression test for something that only came up while // attempting to bootstrap libsyntax; it is adapted from // `syntax::ext::tt::generic_extension`. diff --git a/src/test/run-pass/regions-variance-contravariant-use-contravariant.rs b/src/test/ui/run-pass/regions/regions-variance-contravariant-use-contravariant.rs similarity index 98% rename from src/test/run-pass/regions-variance-contravariant-use-contravariant.rs rename to src/test/ui/run-pass/regions/regions-variance-contravariant-use-contravariant.rs index 5e5be1c25877..ffab7dc2e413 100644 --- a/src/test/run-pass/regions-variance-contravariant-use-contravariant.rs +++ b/src/test/ui/run-pass/regions/regions-variance-contravariant-use-contravariant.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that a type which is contravariant with respect to its region // parameter compiles successfully when used in a contravariant way. // diff --git a/src/test/run-pass/regions-variance-covariant-use-covariant.rs b/src/test/ui/run-pass/regions/regions-variance-covariant-use-covariant.rs similarity index 98% rename from src/test/run-pass/regions-variance-covariant-use-covariant.rs rename to src/test/ui/run-pass/regions/regions-variance-covariant-use-covariant.rs index 02562781373a..ea0051c6b265 100644 --- a/src/test/run-pass/regions-variance-covariant-use-covariant.rs +++ b/src/test/ui/run-pass/regions/regions-variance-covariant-use-covariant.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that a type which is covariant with respect to its region // parameter is successful when used in a covariant way. // diff --git a/src/test/run-pass/rfc-1014-2.rs b/src/test/ui/run-pass/rfcs/rfc-1014-2.rs similarity index 98% rename from src/test/run-pass/rfc-1014-2.rs rename to src/test/ui/run-pass/rfcs/rfc-1014-2.rs index 7cdaf278a08f..f0ff85612436 100644 --- a/src/test/run-pass/rfc-1014-2.rs +++ b/src/test/ui/run-pass/rfcs/rfc-1014-2.rs @@ -7,6 +7,9 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass + #![feature(libc)] extern crate libc; diff --git a/src/test/run-pass/rfc-1014.rs b/src/test/ui/run-pass/rfcs/rfc-1014.rs similarity index 98% rename from src/test/run-pass/rfc-1014.rs rename to src/test/ui/run-pass/rfcs/rfc-1014.rs index 61487b6953db..35290ae8e6a2 100644 --- a/src/test/run-pass/rfc-1014.rs +++ b/src/test/ui/run-pass/rfcs/rfc-1014.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-cloudabi stdout does not map to file descriptor 1 by default // ignore-wasm32-bare no libc diff --git a/src/test/run-pass/rfc-1789-as-cell/from-mut.rs b/src/test/ui/run-pass/rfcs/rfc-1789-as-cell/from-mut.rs similarity index 98% rename from src/test/run-pass/rfc-1789-as-cell/from-mut.rs rename to src/test/ui/run-pass/rfcs/rfc-1789-as-cell/from-mut.rs index 88f7fbc86df6..e873b1946d9e 100644 --- a/src/test/run-pass/rfc-1789-as-cell/from-mut.rs +++ b/src/test/ui/run-pass/rfcs/rfc-1789-as-cell/from-mut.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(as_cell)] use std::cell::Cell; diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs similarity index 97% rename from src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs rename to src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs index 183bb5535305..b245b659559a 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs +++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-box-dyn-error.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::error::Error; fn main() -> Result<(), Box> { diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-empty.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs similarity index 97% rename from src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-empty.rs rename to src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs index 046d27a9f0fe..62ad0e2489a5 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-empty.rs +++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-empty.rs @@ -8,4 +8,5 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() {} diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-exitcode.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs similarity index 97% rename from src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-exitcode.rs rename to src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs index 4aa7d8c3a77d..bff6f9a6bca9 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-exitcode.rs +++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-exitcode.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(process_exitcode_placeholder)] use std::process::ExitCode; diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs similarity index 97% rename from src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs rename to src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs index 5bce3f8045ee..6c3f2fe4ea5c 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs +++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-impl-termination.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(termination_trait_lib)] fn main() -> impl std::process::Termination { } diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs similarity index 97% rename from src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs rename to src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs index 33686ed0b8fa..cf63737d07fd 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs +++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result-box-error_ok.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::io::Error; fn main() -> Result<(), Box> { diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs similarity index 97% rename from src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result.rs rename to src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs index 1c87e31e763e..d61876d422a1 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-result.rs +++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-result.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::io::Error; fn main() -> Result<(), Error> { diff --git a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-str.rs b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs similarity index 97% rename from src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-str.rs rename to src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs index 2023ff75564f..4f60eda0d9ac 100644 --- a/src/test/run-pass/rfc-1937-termination-trait/termination-trait-for-str.rs +++ b/src/test/ui/run-pass/rfcs/rfc-1937-termination-trait/termination-trait-for-str.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn main() -> Result<(), &'static str> { Ok(()) } diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/box.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/box.rs similarity index 98% rename from src/test/run-pass/rfc-2005-default-binding-mode/box.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/box.rs index 95bce1935e52..f0ef9ca37b3a 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/box.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/box.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax, box_patterns)] struct Foo{} diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/constref.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/constref.rs similarity index 99% rename from src/test/run-pass/rfc-2005-default-binding-mode/constref.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/constref.rs index af40ef2b1c5d..ac245ba6ff8d 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/constref.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/constref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass const CONST_REF: &[u8; 3] = b"foo"; trait Foo { diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/enum.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/enum.rs similarity index 99% rename from src/test/run-pass/rfc-2005-default-binding-mode/enum.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/enum.rs index 4755fc37ef34..6ea3b6f99ce2 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/enum.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Wrapper { Wrap(i32), } diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/for.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/for.rs similarity index 98% rename from src/test/run-pass/rfc-2005-default-binding-mode/for.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/for.rs index c2467d3f0091..e85d11f073d7 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/for.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/for.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let mut tups = vec![(0u8, 1u8)]; diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/general.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/general.rs similarity index 99% rename from src/test/run-pass/rfc-2005-default-binding-mode/general.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/general.rs index df28046d7d70..2aad9ccd6efa 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/general.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/general.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn some_or_wildcard(r: &Option, b: &i32) { let _: &i32 = match r { Some(a) => a, diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/lit.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/lit.rs similarity index 98% rename from src/test/run-pass/rfc-2005-default-binding-mode/lit.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/lit.rs index 004ea42b65b8..ac6f61b32b71 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/lit.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/lit.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn with_u8() { let s = 5u8; let r = match &s { diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/range.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/range.rs similarity index 98% rename from src/test/run-pass/rfc-2005-default-binding-mode/range.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/range.rs index f38bd2de8697..3c8463f77ef5 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/range.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/range.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let i = 5; match &&&&i { diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/ref-region.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/ref-region.rs similarity index 98% rename from src/test/run-pass/rfc-2005-default-binding-mode/ref-region.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/ref-region.rs index bc96853fd948..7cdd35acaadf 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/ref-region.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/ref-region.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn foo<'a, 'b>(x: &'a &'b Option) -> &'a u32 { let x: &'a &'a Option = x; match x { diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/reset-mode.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/reset-mode.rs similarity index 98% rename from src/test/run-pass/rfc-2005-default-binding-mode/reset-mode.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/reset-mode.rs index 1d86a2ecf869..c8144e09fc83 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/reset-mode.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/reset-mode.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we "reset" the mode as we pass through a `&` pattern. // // cc #46688 diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/slice.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/slice.rs similarity index 98% rename from src/test/run-pass/rfc-2005-default-binding-mode/slice.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/slice.rs index 0d1d0893c593..90fa52bc9037 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/slice.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/slice.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(slice_patterns)] fn slice_pat() { diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/struct.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/struct.rs similarity index 98% rename from src/test/run-pass/rfc-2005-default-binding-mode/struct.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/struct.rs index 017439b3b140..5e41f0121372 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/struct.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug, PartialEq)] struct Foo { x: u8, diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/tuple-struct.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs similarity index 98% rename from src/test/run-pass/rfc-2005-default-binding-mode/tuple-struct.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs index 3b55405abdd7..072332cd9d0a 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/tuple-struct.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/tuple-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Foo { Bar(Option, (), (), Vec), Baz, diff --git a/src/test/run-pass/rfc-2005-default-binding-mode/tuple.rs b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/tuple.rs similarity index 98% rename from src/test/run-pass/rfc-2005-default-binding-mode/tuple.rs rename to src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/tuple.rs index 966b8e1a8127..830e6f5e5bae 100644 --- a/src/test/run-pass/rfc-2005-default-binding-mode/tuple.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2005-default-binding-mode/tuple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { let foo = (Some(1), (), (), vec![2, 3]); diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/enums.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/enums.rs similarity index 98% rename from src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/enums.rs rename to src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/enums.rs index 12d1bf9ea910..0dbc5c8f969e 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/enums.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/enums.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![crate_type = "rlib"] #![feature(non_exhaustive)] diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/structs.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/structs.rs similarity index 98% rename from src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/structs.rs rename to src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/structs.rs index a2c6f8c05e2c..25764457701f 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/structs.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/structs.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(non_exhaustive)] #[non_exhaustive] diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/variants.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/variants.rs similarity index 98% rename from src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/variants.rs rename to src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/variants.rs index d04c1073ad9b..2975126709bd 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/auxiliary/variants.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/auxiliary/variants.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![crate_type = "rlib"] #![feature(non_exhaustive)] diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/enums.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/enums.rs similarity index 99% rename from src/test/run-pass/rfc-2008-non-exhaustive/enums.rs rename to src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/enums.rs index 83fb24cda088..ff8b473b43b3 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/enums.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/enums.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:enums.rs extern crate enums; diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/enums_same_crate.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/enums_same_crate.rs similarity index 98% rename from src/test/run-pass/rfc-2008-non-exhaustive/enums_same_crate.rs rename to src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/enums_same_crate.rs index 8f1ba364b0e2..8f0274f318d0 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/enums_same_crate.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/enums_same_crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(non_exhaustive)] #[non_exhaustive] diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/structs.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/structs.rs similarity index 98% rename from src/test/run-pass/rfc-2008-non-exhaustive/structs.rs rename to src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/structs.rs index bb65e10da27b..2bfdddc8eb70 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/structs.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/structs.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:structs.rs extern crate structs; diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/structs_same_crate.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/structs_same_crate.rs similarity index 98% rename from src/test/run-pass/rfc-2008-non-exhaustive/structs_same_crate.rs rename to src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/structs_same_crate.rs index 175782f10fc9..6c71c05709c5 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/structs_same_crate.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/structs_same_crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(non_exhaustive)] #[non_exhaustive] diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/variants.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/variants.rs similarity index 98% rename from src/test/run-pass/rfc-2008-non-exhaustive/variants.rs rename to src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/variants.rs index 2658c59a6998..2122534facbe 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/variants.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/variants.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:variants.rs extern crate variants; diff --git a/src/test/run-pass/rfc-2008-non-exhaustive/variants_same_crate.rs b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/variants_same_crate.rs similarity index 98% rename from src/test/run-pass/rfc-2008-non-exhaustive/variants_same_crate.rs rename to src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/variants_same_crate.rs index a1c376c17985..e339c046b18a 100644 --- a/src/test/run-pass/rfc-2008-non-exhaustive/variants_same_crate.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2008-non-exhaustive/variants_same_crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(non_exhaustive)] /* diff --git a/src/test/run-pass/rfc-2126-crate-paths/crate-path-absolute.rs b/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.rs similarity index 98% rename from src/test/run-pass/rfc-2126-crate-paths/crate-path-absolute.rs rename to src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.rs index 31f683a17355..e44ab838cafa 100644 --- a/src/test/run-pass/rfc-2126-crate-paths/crate-path-absolute.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-absolute.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(crate_in_paths)] use crate::m::f; diff --git a/src/test/run-pass/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs b/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs similarity index 98% rename from src/test/run-pass/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs rename to src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs index 4646d81cf518..37821777822f 100644 --- a/src/test/run-pass/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2126-crate-paths/crate-path-visibility-ambiguity.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(crate_in_paths)] #![feature(crate_visibility_modifier)] diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs similarity index 100% rename from src/test/run-pass/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs rename to src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/auxiliary/xcrate.rs diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/basic.rs similarity index 98% rename from src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs rename to src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/basic.rs index 93384b81e4aa..c5a356d979d3 100644 --- a/src/test/run-pass/rfc-2126-extern-absolute-paths/basic.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/basic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:xcrate.rs // edition:2018 diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/extern.rs similarity index 98% rename from src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs rename to src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/extern.rs index 15b754e1fe6b..3d31c2d3a4dd 100644 --- a/src/test/run-pass/rfc-2126-extern-absolute-paths/extern.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/extern.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:xcrate.rs #![feature(extern_in_paths)] diff --git a/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/test.rs similarity index 98% rename from src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs rename to src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/test.rs index cace83d62746..a8fa07af14dc 100644 --- a/src/test/run-pass/rfc-2126-extern-absolute-paths/test.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2126-extern-absolute-paths/test.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that `#[test]` works with extern-absolute-paths enabled. // // Regression test for #47075. diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/attr.rs similarity index 98% rename from src/test/run-pass/rfc-2151-raw-identifiers/attr.rs rename to src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/attr.rs index 2ef9fba2076a..95db38736195 100644 --- a/src/test/run-pass/rfc-2151-raw-identifiers/attr.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/attr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; #[r#repr(r#C, r#packed)] diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/basic.rs similarity index 98% rename from src/test/run-pass/rfc-2151-raw-identifiers/basic.rs rename to src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/basic.rs index eefce3981bec..38c00f4a7e12 100644 --- a/src/test/run-pass/rfc-2151-raw-identifiers/basic.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/basic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn r#fn(r#match: u32) -> u32 { r#match } diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/items.rs b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/items.rs similarity index 98% rename from src/test/run-pass/rfc-2151-raw-identifiers/items.rs rename to src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/items.rs index 4306ffe2042a..b3ea7b28362f 100644 --- a/src/test/run-pass/rfc-2151-raw-identifiers/items.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/items.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug, PartialEq, Eq)] struct IntWrapper(u32); diff --git a/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/macros.rs similarity index 98% rename from src/test/run-pass/rfc-2151-raw-identifiers/macros.rs rename to src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/macros.rs index 9e89b79266cf..ed39498526df 100644 --- a/src/test/run-pass/rfc-2151-raw-identifiers/macros.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2151-raw-identifiers/macros.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(decl_macro)] r#macro_rules! r#struct { diff --git a/src/test/run-pass/rfc-2175-or-if-while-let/basic.rs b/src/test/ui/run-pass/rfcs/rfc-2175-or-if-while-let/basic.rs similarity index 98% rename from src/test/run-pass/rfc-2175-or-if-while-let/basic.rs rename to src/test/ui/run-pass/rfcs/rfc-2175-or-if-while-let/basic.rs index a516a3e5dcd7..29e8ab8ed1fb 100644 --- a/src/test/run-pass/rfc-2175-or-if-while-let/basic.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2175-or-if-while-let/basic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(if_while_or_patterns)] enum E { diff --git a/src/test/run-pass/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs b/src/test/ui/run-pass/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs similarity index 98% rename from src/test/run-pass/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs rename to src/test/ui/run-pass/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs index 7d8050a07a31..755e3cb8c3b7 100644 --- a/src/test/run-pass/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs +++ b/src/test/ui/run-pass/rfcs/rfc-2421-unreserve-pure-offsetof-sizeof-alignof.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that removed keywords are allowed as identifiers. fn main () { let offsetof = (); diff --git a/src/test/run-pass/rfc1445/eq-allows-match-on-ty-in-macro.rs b/src/test/ui/run-pass/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs similarity index 98% rename from src/test/run-pass/rfc1445/eq-allows-match-on-ty-in-macro.rs rename to src/test/ui/run-pass/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs index 241fe6c6ab1e..a6b46d9c00c0 100644 --- a/src/test/run-pass/rfc1445/eq-allows-match-on-ty-in-macro.rs +++ b/src/test/ui/run-pass/rfcs/rfc1445/eq-allows-match-on-ty-in-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] macro_rules! foo { diff --git a/src/test/run-pass/rfc1445/eq-allows-match.rs b/src/test/ui/run-pass/rfcs/rfc1445/eq-allows-match.rs similarity index 98% rename from src/test/run-pass/rfc1445/eq-allows-match.rs rename to src/test/ui/run-pass/rfcs/rfc1445/eq-allows-match.rs index f02a45625c9f..2dfe62b044ad 100644 --- a/src/test/run-pass/rfc1445/eq-allows-match.rs +++ b/src/test/ui/run-pass/rfcs/rfc1445/eq-allows-match.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] #[derive(PartialEq, Eq)] diff --git a/src/test/run-pass/rfc1623.rs b/src/test/ui/run-pass/rfcs/rfc1623.rs similarity index 98% rename from src/test/run-pass/rfc1623.rs rename to src/test/ui/run-pass/rfcs/rfc1623.rs index 17453933c8ab..ddb83317fd93 100644 --- a/src/test/run-pass/rfc1623.rs +++ b/src/test/ui/run-pass/rfcs/rfc1623.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + #![allow(dead_code)] // very simple test for a 'static static with default lifetime diff --git a/src/test/run-pass/rfc1717/auxiliary/clibrary.rs b/src/test/ui/run-pass/rfcs/rfc1717/auxiliary/clibrary.rs similarity index 100% rename from src/test/run-pass/rfc1717/auxiliary/clibrary.rs rename to src/test/ui/run-pass/rfcs/rfc1717/auxiliary/clibrary.rs diff --git a/src/test/run-pass/rfc1717/library-override.rs b/src/test/ui/run-pass/rfcs/rfc1717/library-override.rs similarity index 98% rename from src/test/run-pass/rfc1717/library-override.rs rename to src/test/ui/run-pass/rfcs/rfc1717/library-override.rs index c51b33f9c4af..6e0ff4470816 100644 --- a/src/test/run-pass/rfc1717/library-override.rs +++ b/src/test/ui/run-pass/rfcs/rfc1717/library-override.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc to test ffi with // compile-flags: -lstatic=wronglibrary:rust_test_helpers diff --git a/src/test/run-pass/rfc1857-drop-order.rs b/src/test/ui/run-pass/rfcs/rfc1857-drop-order.rs similarity index 99% rename from src/test/run-pass/rfc1857-drop-order.rs rename to src/test/ui/run-pass/rfcs/rfc1857-drop-order.rs index 94b2a586ddfa..66edfd06730f 100644 --- a/src/test/run-pass/rfc1857-drop-order.rs +++ b/src/test/ui/run-pass/rfcs/rfc1857-drop-order.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare compiled with panic=abort by default #![allow(dead_code, unreachable_code)] diff --git a/src/test/run-pass/arbitrary_self_types_raw_pointer_struct.rs b/src/test/ui/run-pass/self/arbitrary_self_types_raw_pointer_struct.rs similarity index 98% rename from src/test/run-pass/arbitrary_self_types_raw_pointer_struct.rs rename to src/test/ui/run-pass/self/arbitrary_self_types_raw_pointer_struct.rs index 8b6941e1c635..c609f0dd83e0 100644 --- a/src/test/run-pass/arbitrary_self_types_raw_pointer_struct.rs +++ b/src/test/ui/run-pass/self/arbitrary_self_types_raw_pointer_struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(arbitrary_self_types)] use std::rc::Rc; diff --git a/src/test/run-pass/arbitrary_self_types_raw_pointer_trait.rs b/src/test/ui/run-pass/self/arbitrary_self_types_raw_pointer_trait.rs similarity index 99% rename from src/test/run-pass/arbitrary_self_types_raw_pointer_trait.rs rename to src/test/ui/run-pass/self/arbitrary_self_types_raw_pointer_trait.rs index f70e38a14e41..86b3c86564b1 100644 --- a/src/test/run-pass/arbitrary_self_types_raw_pointer_trait.rs +++ b/src/test/ui/run-pass/self/arbitrary_self_types_raw_pointer_trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(arbitrary_self_types)] use std::ptr; diff --git a/src/test/run-pass/arbitrary_self_types_silly.rs b/src/test/ui/run-pass/self/arbitrary_self_types_silly.rs similarity index 98% rename from src/test/run-pass/arbitrary_self_types_silly.rs rename to src/test/ui/run-pass/self/arbitrary_self_types_silly.rs index 755a8d7ea294..9fb023403ecb 100644 --- a/src/test/run-pass/arbitrary_self_types_silly.rs +++ b/src/test/ui/run-pass/self/arbitrary_self_types_silly.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass #![feature(arbitrary_self_types)] struct Foo; diff --git a/src/test/run-pass/arbitrary_self_types_struct.rs b/src/test/ui/run-pass/self/arbitrary_self_types_struct.rs similarity index 98% rename from src/test/run-pass/arbitrary_self_types_struct.rs rename to src/test/ui/run-pass/self/arbitrary_self_types_struct.rs index 961717de0463..bc526701b6c1 100644 --- a/src/test/run-pass/arbitrary_self_types_struct.rs +++ b/src/test/ui/run-pass/self/arbitrary_self_types_struct.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass #![feature(arbitrary_self_types)] use std::rc::Rc; diff --git a/src/test/run-pass/arbitrary_self_types_trait.rs b/src/test/ui/run-pass/self/arbitrary_self_types_trait.rs similarity index 98% rename from src/test/run-pass/arbitrary_self_types_trait.rs rename to src/test/ui/run-pass/self/arbitrary_self_types_trait.rs index e74d614dd6bd..bd06573c99b1 100644 --- a/src/test/run-pass/arbitrary_self_types_trait.rs +++ b/src/test/ui/run-pass/self/arbitrary_self_types_trait.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass #![feature(arbitrary_self_types)] use std::rc::Rc; diff --git a/src/test/run-pass/arbitrary_self_types_unsized_struct.rs b/src/test/ui/run-pass/self/arbitrary_self_types_unsized_struct.rs similarity index 98% rename from src/test/run-pass/arbitrary_self_types_unsized_struct.rs rename to src/test/ui/run-pass/self/arbitrary_self_types_unsized_struct.rs index 8dc40e7aab11..e75e848db246 100644 --- a/src/test/run-pass/arbitrary_self_types_unsized_struct.rs +++ b/src/test/ui/run-pass/self/arbitrary_self_types_unsized_struct.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass #![feature(arbitrary_self_types)] use std::rc::Rc; diff --git a/src/test/run-pass/auxiliary/explicit_self_xcrate.rs b/src/test/ui/run-pass/self/auxiliary/explicit_self_xcrate.rs similarity index 100% rename from src/test/run-pass/auxiliary/explicit_self_xcrate.rs rename to src/test/ui/run-pass/self/auxiliary/explicit_self_xcrate.rs diff --git a/src/test/run-pass/builtin-superkinds-self-type.rs b/src/test/ui/run-pass/self/builtin-superkinds-self-type.rs similarity index 98% rename from src/test/run-pass/builtin-superkinds-self-type.rs rename to src/test/ui/run-pass/self/builtin-superkinds-self-type.rs index 9b8893b0762f..a7754e068921 100644 --- a/src/test/run-pass/builtin-superkinds-self-type.rs +++ b/src/test/ui/run-pass/self/builtin-superkinds-self-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests the ability for the Self type in default methods to use // capabilities granted by builtin kinds as supertraits. diff --git a/src/test/run-pass/by-value-self-in-mut-slot.rs b/src/test/ui/run-pass/self/by-value-self-in-mut-slot.rs similarity index 98% rename from src/test/run-pass/by-value-self-in-mut-slot.rs rename to src/test/ui/run-pass/self/by-value-self-in-mut-slot.rs index 846b695c35b3..d7f9ac6cc762 100644 --- a/src/test/run-pass/by-value-self-in-mut-slot.rs +++ b/src/test/ui/run-pass/self/by-value-self-in-mut-slot.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct X { a: isize diff --git a/src/test/run-pass/explicit-self-closures.rs b/src/test/ui/run-pass/self/explicit-self-closures.rs similarity index 98% rename from src/test/run-pass/explicit-self-closures.rs rename to src/test/ui/run-pass/self/explicit-self-closures.rs index cb3a28d19d2e..0144433010f4 100644 --- a/src/test/run-pass/explicit-self-closures.rs +++ b/src/test/ui/run-pass/self/explicit-self-closures.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test to make sure that explicit self params work inside closures // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/explicit-self-generic.rs b/src/test/ui/run-pass/self/explicit-self-generic.rs similarity index 98% rename from src/test/run-pass/explicit-self-generic.rs rename to src/test/ui/run-pass/self/explicit-self-generic.rs index d2274ced5561..cf1546810a45 100644 --- a/src/test/run-pass/explicit-self-generic.rs +++ b/src/test/ui/run-pass/self/explicit-self-generic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] #[derive(Copy, Clone)] diff --git a/src/test/run-pass/explicit-self-objects-uniq.rs b/src/test/ui/run-pass/self/explicit-self-objects-uniq.rs similarity index 98% rename from src/test/run-pass/explicit-self-objects-uniq.rs rename to src/test/ui/run-pass/self/explicit-self-objects-uniq.rs index bb7e612a9f2a..373325aca065 100644 --- a/src/test/run-pass/explicit-self-objects-uniq.rs +++ b/src/test/ui/run-pass/self/explicit-self-objects-uniq.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] trait Foo { diff --git a/src/test/run-pass/explicit-self.rs b/src/test/ui/run-pass/self/explicit-self.rs similarity index 95% rename from src/test/run-pass/explicit-self.rs rename to src/test/ui/run-pass/self/explicit-self.rs index 11711e6ab74b..862d02bda0ce 100644 --- a/src/test/run-pass/explicit-self.rs +++ b/src/test/ui/run-pass/self/explicit-self.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_upper_case_globals)] + #![feature(box_syntax)] static tau: f64 = 2.0*3.14159265358979323; diff --git a/src/test/run-pass/explicit_self_xcrate_exe.rs b/src/test/ui/run-pass/self/explicit_self_xcrate_exe.rs similarity index 98% rename from src/test/run-pass/explicit_self_xcrate_exe.rs rename to src/test/ui/run-pass/self/explicit_self_xcrate_exe.rs index eaaf92fbea9c..3847bb4c6611 100644 --- a/src/test/run-pass/explicit_self_xcrate_exe.rs +++ b/src/test/ui/run-pass/self/explicit_self_xcrate_exe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:explicit_self_xcrate.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/move-self.rs b/src/test/ui/run-pass/self/move-self.rs similarity index 98% rename from src/test/run-pass/move-self.rs rename to src/test/ui/run-pass/self/move-self.rs index c69cd17864a5..d414a11edf4f 100644 --- a/src/test/run-pass/move-self.rs +++ b/src/test/ui/run-pass/self/move-self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S { x: String } diff --git a/src/test/run-pass/object-safety-sized-self-by-value-self.rs b/src/test/ui/run-pass/self/object-safety-sized-self-by-value-self.rs similarity index 98% rename from src/test/run-pass/object-safety-sized-self-by-value-self.rs rename to src/test/ui/run-pass/self/object-safety-sized-self-by-value-self.rs index 81acd94ebe51..2ea1dcb221e1 100644 --- a/src/test/run-pass/object-safety-sized-self-by-value-self.rs +++ b/src/test/ui/run-pass/self/object-safety-sized-self-by-value-self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that a trait is still object-safe (and usable) if it has // methods with by-value self so long as they require `Self : Sized`. diff --git a/src/test/run-pass/object-safety-sized-self-generic-method.rs b/src/test/ui/run-pass/self/object-safety-sized-self-generic-method.rs similarity index 98% rename from src/test/run-pass/object-safety-sized-self-generic-method.rs rename to src/test/ui/run-pass/self/object-safety-sized-self-generic-method.rs index 2e84117566e4..5f8ae3ce4954 100644 --- a/src/test/run-pass/object-safety-sized-self-generic-method.rs +++ b/src/test/ui/run-pass/self/object-safety-sized-self-generic-method.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that a trait is still object-safe (and usable) if it has // generic methods so long as they require `Self : Sized`. diff --git a/src/test/run-pass/object-safety-sized-self-return-Self.rs b/src/test/ui/run-pass/self/object-safety-sized-self-return-Self.rs similarity index 98% rename from src/test/run-pass/object-safety-sized-self-return-Self.rs rename to src/test/ui/run-pass/self/object-safety-sized-self-return-Self.rs index eda541262bd9..09e28473fa77 100644 --- a/src/test/run-pass/object-safety-sized-self-return-Self.rs +++ b/src/test/ui/run-pass/self/object-safety-sized-self-return-Self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that a trait is still object-safe (and usable) if it has // methods that return `Self` so long as they require `Self : Sized`. diff --git a/src/test/run-pass/self-impl.rs b/src/test/ui/run-pass/self/self-impl.rs similarity index 99% rename from src/test/run-pass/self-impl.rs rename to src/test/ui/run-pass/self/self-impl.rs index fcd233c361b8..c0a7eee437cc 100644 --- a/src/test/run-pass/self-impl.rs +++ b/src/test/ui/run-pass/self/self-impl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can use `Self` types in impls in the expected way. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/self-in-mut-slot-default-method.rs b/src/test/ui/run-pass/self/self-in-mut-slot-default-method.rs similarity index 98% rename from src/test/run-pass/self-in-mut-slot-default-method.rs rename to src/test/ui/run-pass/self/self-in-mut-slot-default-method.rs index 905a23f22a6f..058ad2ef64e9 100644 --- a/src/test/run-pass/self-in-mut-slot-default-method.rs +++ b/src/test/ui/run-pass/self/self-in-mut-slot-default-method.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct X { diff --git a/src/test/run-pass/self-in-mut-slot-immediate-value.rs b/src/test/ui/run-pass/self/self-in-mut-slot-immediate-value.rs similarity index 98% rename from src/test/run-pass/self-in-mut-slot-immediate-value.rs rename to src/test/ui/run-pass/self/self-in-mut-slot-immediate-value.rs index 24014c289f91..d32f1e13804f 100644 --- a/src/test/run-pass/self-in-mut-slot-immediate-value.rs +++ b/src/test/ui/run-pass/self/self-in-mut-slot-immediate-value.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Assert that `mut self` on an immediate value doesn't // allow mutating the original - issue #10615. diff --git a/src/test/run-pass/self-in-typedefs.rs b/src/test/ui/run-pass/self/self-in-typedefs.rs similarity index 94% rename from src/test/run-pass/self-in-typedefs.rs rename to src/test/ui/run-pass/self/self-in-typedefs.rs index d262e8c60a18..92eccb47e189 100644 --- a/src/test/run-pass/self-in-typedefs.rs +++ b/src/test/ui/run-pass/self/self-in-typedefs.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(unions_with_drop_fields)] + #![feature(self_in_typedefs)] #![feature(untagged_unions)] diff --git a/src/test/run-pass/self-re-assign.rs b/src/test/ui/run-pass/self/self-re-assign.rs similarity index 98% rename from src/test/run-pass/self-re-assign.rs rename to src/test/ui/run-pass/self/self-re-assign.rs index 05295aa3309d..982cc6675fa2 100644 --- a/src/test/run-pass/self-re-assign.rs +++ b/src/test/ui/run-pass/self/self-re-assign.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Ensure assigning an owned or managed variable to itself works. In particular, // that we do not glue_drop before we glue_take (#3290). diff --git a/src/test/run-pass/self-shadowing-import.rs b/src/test/ui/run-pass/self/self-shadowing-import.rs similarity index 98% rename from src/test/run-pass/self-shadowing-import.rs rename to src/test/ui/run-pass/self/self-shadowing-import.rs index 5ef6e08f857c..fbf965df06b9 100644 --- a/src/test/run-pass/self-shadowing-import.rs +++ b/src/test/ui/run-pass/self/self-shadowing-import.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod a { pub mod b { diff --git a/src/test/run-pass/self-type-param.rs b/src/test/ui/run-pass/self/self-type-param.rs similarity index 98% rename from src/test/run-pass/self-type-param.rs rename to src/test/ui/run-pass/self/self-type-param.rs index ac810606a932..13e28e62e5ea 100644 --- a/src/test/run-pass/self-type-param.rs +++ b/src/test/ui/run-pass/self/self-type-param.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait MyTrait { diff --git a/src/test/run-pass/string-self-append.rs b/src/test/ui/run-pass/self/string-self-append.rs similarity index 98% rename from src/test/run-pass/string-self-append.rs rename to src/test/ui/run-pass/self/string-self-append.rs index cef7a93aeedd..54729856a6a1 100644 --- a/src/test/run-pass/string-self-append.rs +++ b/src/test/ui/run-pass/self/string-self-append.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { // Make sure we properly handle repeated self-appends. let mut a: String = "A".to_string(); diff --git a/src/test/run-pass/ufcs-explicit-self.rs b/src/test/ui/run-pass/self/ufcs-explicit-self.rs similarity index 99% rename from src/test/run-pass/ufcs-explicit-self.rs rename to src/test/ui/run-pass/self/ufcs-explicit-self.rs index b3cbd2c4eb37..df86065904d5 100644 --- a/src/test/run-pass/ufcs-explicit-self.rs +++ b/src/test/ui/run-pass/self/ufcs-explicit-self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] #[derive(Copy, Clone)] diff --git a/src/test/run-pass/uniq-self-in-mut-slot.rs b/src/test/ui/run-pass/self/uniq-self-in-mut-slot.rs similarity index 98% rename from src/test/run-pass/uniq-self-in-mut-slot.rs rename to src/test/ui/run-pass/self/uniq-self-in-mut-slot.rs index a4f953ceaf5c..46d51d485479 100644 --- a/src/test/run-pass/uniq-self-in-mut-slot.rs +++ b/src/test/ui/run-pass/self/uniq-self-in-mut-slot.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct X { diff --git a/src/test/run-pass/where-for-self.rs b/src/test/ui/run-pass/self/where-for-self.rs similarity index 99% rename from src/test/run-pass/where-for-self.rs rename to src/test/ui/run-pass/self/where-for-self.rs index ee19e76c1462..147ab0be74a8 100644 --- a/src/test/run-pass/where-for-self.rs +++ b/src/test/ui/run-pass/self/where-for-self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can quantify lifetimes outside a constraint (i.e., including // the self type) in a where clause. diff --git a/src/test/run-pass/auxiliary/sepcomp-extern-lib.rs b/src/test/ui/run-pass/sepcomp/auxiliary/sepcomp-extern-lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/sepcomp-extern-lib.rs rename to src/test/ui/run-pass/sepcomp/auxiliary/sepcomp-extern-lib.rs diff --git a/src/test/run-pass/auxiliary/sepcomp_cci_lib.rs b/src/test/ui/run-pass/sepcomp/auxiliary/sepcomp_cci_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/sepcomp_cci_lib.rs rename to src/test/ui/run-pass/sepcomp/auxiliary/sepcomp_cci_lib.rs diff --git a/src/test/run-pass/auxiliary/sepcomp_lib.rs b/src/test/ui/run-pass/sepcomp/auxiliary/sepcomp_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/sepcomp_lib.rs rename to src/test/ui/run-pass/sepcomp/auxiliary/sepcomp_lib.rs diff --git a/src/test/run-pass/sepcomp-cci.rs b/src/test/ui/run-pass/sepcomp/sepcomp-cci.rs similarity index 98% rename from src/test/run-pass/sepcomp-cci.rs rename to src/test/ui/run-pass/sepcomp/sepcomp-cci.rs index d3d3de0e2c0c..beeece32337b 100644 --- a/src/test/run-pass/sepcomp-cci.rs +++ b/src/test/ui/run-pass/sepcomp/sepcomp-cci.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-bitrig // compile-flags: -C codegen-units=3 // aux-build:sepcomp_cci_lib.rs diff --git a/src/test/run-pass/sepcomp-extern.rs b/src/test/ui/run-pass/sepcomp/sepcomp-extern.rs similarity index 97% rename from src/test/run-pass/sepcomp-extern.rs rename to src/test/ui/run-pass/sepcomp/sepcomp-extern.rs index f21b787dab72..ae392febc275 100644 --- a/src/test/run-pass/sepcomp-extern.rs +++ b/src/test/ui/run-pass/sepcomp/sepcomp-extern.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-bitrig // compile-flags: -C codegen-units=3 // aux-build:sepcomp-extern-lib.rs @@ -17,7 +18,6 @@ extern crate sepcomp_extern_lib; extern { - #[allow(ctypes)] fn foo() -> usize; } diff --git a/src/test/run-pass/sepcomp-fns-backwards.rs b/src/test/ui/run-pass/sepcomp/sepcomp-fns-backwards.rs similarity index 98% rename from src/test/run-pass/sepcomp-fns-backwards.rs rename to src/test/ui/run-pass/sepcomp/sepcomp-fns-backwards.rs index 4fea07028b61..96993d3a7bef 100644 --- a/src/test/run-pass/sepcomp-fns-backwards.rs +++ b/src/test/ui/run-pass/sepcomp/sepcomp-fns-backwards.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-bitrig // compile-flags: -C codegen-units=3 diff --git a/src/test/run-pass/sepcomp-fns.rs b/src/test/ui/run-pass/sepcomp/sepcomp-fns.rs similarity index 98% rename from src/test/run-pass/sepcomp-fns.rs rename to src/test/ui/run-pass/sepcomp/sepcomp-fns.rs index a2356cf02a11..3d917cb70e3f 100644 --- a/src/test/run-pass/sepcomp-fns.rs +++ b/src/test/ui/run-pass/sepcomp/sepcomp-fns.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-bitrig // compile-flags: -C codegen-units=3 diff --git a/src/test/run-pass/sepcomp-lib-lto.rs b/src/test/ui/run-pass/sepcomp/sepcomp-lib-lto.rs similarity index 98% rename from src/test/run-pass/sepcomp-lib-lto.rs rename to src/test/ui/run-pass/sepcomp/sepcomp-lib-lto.rs index 8d73f4db7d23..03b837cdcf48 100644 --- a/src/test/run-pass/sepcomp-lib-lto.rs +++ b/src/test/ui/run-pass/sepcomp/sepcomp-lib-lto.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Check that we can use `-C lto` when linking against libraries that were // separately compiled. diff --git a/src/test/run-pass/sepcomp-lib.rs b/src/test/ui/run-pass/sepcomp/sepcomp-lib.rs similarity index 98% rename from src/test/run-pass/sepcomp-lib.rs rename to src/test/ui/run-pass/sepcomp/sepcomp-lib.rs index abe842a332d8..11ad12611e15 100644 --- a/src/test/run-pass/sepcomp-lib.rs +++ b/src/test/ui/run-pass/sepcomp/sepcomp-lib.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:sepcomp_lib.rs // Test linking against a library built with -C codegen-units > 1 diff --git a/src/test/run-pass/sepcomp-statics.rs b/src/test/ui/run-pass/sepcomp/sepcomp-statics.rs similarity index 98% rename from src/test/run-pass/sepcomp-statics.rs rename to src/test/ui/run-pass/sepcomp/sepcomp-statics.rs index 8cda469a88bf..7022a5eee719 100644 --- a/src/test/run-pass/sepcomp-statics.rs +++ b/src/test/ui/run-pass/sepcomp/sepcomp-statics.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-bitrig // compile-flags: -C codegen-units=3 diff --git a/src/test/run-pass/sepcomp-unwind.rs b/src/test/ui/run-pass/sepcomp/sepcomp-unwind.rs similarity index 99% rename from src/test/run-pass/sepcomp-unwind.rs rename to src/test/ui/run-pass/sepcomp/sepcomp-unwind.rs index 3a93845a0620..15b076532246 100644 --- a/src/test/run-pass/sepcomp-unwind.rs +++ b/src/test/ui/run-pass/sepcomp/sepcomp-unwind.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-bitrig // compile-flags: -C codegen-units=3 // ignore-emscripten no threads support diff --git a/src/test/run-pass/simd-generics.rs b/src/test/ui/run-pass/simd/simd-generics.rs similarity index 96% rename from src/test/run-pass/simd-generics.rs rename to src/test/ui/run-pass/simd/simd-generics.rs index ef40a6ce96bd..b69b6f0a4cd6 100644 --- a/src/test/run-pass/simd-generics.rs +++ b/src/test/ui/run-pass/simd/simd-generics.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #![feature(repr_simd, platform_intrinsics)] diff --git a/src/test/run-pass/simd-intrinsic-float-math.rs b/src/test/ui/run-pass/simd/simd-intrinsic-float-math.rs similarity index 99% rename from src/test/run-pass/simd-intrinsic-float-math.rs rename to src/test/ui/run-pass/simd/simd-intrinsic-float-math.rs index 3c7ca21459f4..216855db747a 100644 --- a/src/test/run-pass/simd-intrinsic-float-math.rs +++ b/src/test/ui/run-pass/simd/simd-intrinsic-float-math.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten // ignore-android diff --git a/src/test/run-pass/simd-intrinsic-float-minmax.rs b/src/test/ui/run-pass/simd/simd-intrinsic-float-minmax.rs similarity index 99% rename from src/test/run-pass/simd-intrinsic-float-minmax.rs rename to src/test/ui/run-pass/simd/simd-intrinsic-float-minmax.rs index d35123e2235e..a146b4b2f709 100644 --- a/src/test/run-pass/simd-intrinsic-float-minmax.rs +++ b/src/test/ui/run-pass/simd/simd-intrinsic-float-minmax.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten // min-llvm-version 7.0 // error-pattern: panicked diff --git a/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-arithmetic.rs similarity index 99% rename from src/test/run-pass/simd-intrinsic-generic-arithmetic.rs rename to src/test/ui/run-pass/simd/simd-intrinsic-generic-arithmetic.rs index ac6d0c697ecc..c1094336c29f 100644 --- a/src/test/run-pass/simd-intrinsic-generic-arithmetic.rs +++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-arithmetic.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // ignore-emscripten FIXME(#45351) hits an LLVM assert #![feature(repr_simd, platform_intrinsics)] diff --git a/src/test/run-pass/simd-intrinsic-generic-cast.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-cast.rs similarity index 99% rename from src/test/run-pass/simd-intrinsic-generic-cast.rs rename to src/test/ui/run-pass/simd/simd-intrinsic-generic-cast.rs index ed2786edf3a3..e24a141e6e03 100644 --- a/src/test/run-pass/simd-intrinsic-generic-cast.rs +++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-cast.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten FIXME(#45351) hits an LLVM assert #![feature(repr_simd, platform_intrinsics, concat_idents, test)] diff --git a/src/test/run-pass/simd-intrinsic-generic-comparison.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-comparison.rs similarity index 99% rename from src/test/run-pass/simd-intrinsic-generic-comparison.rs rename to src/test/ui/run-pass/simd/simd-intrinsic-generic-comparison.rs index d27378ba8930..0c36d88dafd6 100644 --- a/src/test/run-pass/simd-intrinsic-generic-comparison.rs +++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-comparison.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten FIXME(#45351) hits an LLVM assert #![feature(repr_simd, platform_intrinsics, concat_idents)] diff --git a/src/test/run-pass/simd-intrinsic-generic-elements.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-elements.rs similarity index 99% rename from src/test/run-pass/simd-intrinsic-generic-elements.rs rename to src/test/ui/run-pass/simd/simd-intrinsic-generic-elements.rs index 72fcef27a665..0dd1cae18f15 100644 --- a/src/test/run-pass/simd-intrinsic-generic-elements.rs +++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-elements.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten FIXME(#45351) hits an LLVM assert #![feature(repr_simd, platform_intrinsics)] diff --git a/src/test/run-pass/simd-intrinsic-generic-gather.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-gather.rs similarity index 99% rename from src/test/run-pass/simd-intrinsic-generic-gather.rs rename to src/test/ui/run-pass/simd/simd-intrinsic-generic-gather.rs index 54143739a88f..5f6a72a8e1e1 100644 --- a/src/test/run-pass/simd-intrinsic-generic-gather.rs +++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-gather.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten // min-llvm-version 6.0 diff --git a/src/test/run-pass/simd-intrinsic-generic-reduction.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-reduction.rs similarity index 99% rename from src/test/run-pass/simd-intrinsic-generic-reduction.rs rename to src/test/ui/run-pass/simd/simd-intrinsic-generic-reduction.rs index 8e999b7115ea..822101558ce0 100644 --- a/src/test/run-pass/simd-intrinsic-generic-reduction.rs +++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-reduction.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // ignore-emscripten // Test that the simd_reduce_{op} intrinsics produce the correct results. diff --git a/src/test/run-pass/simd-intrinsic-generic-select.rs b/src/test/ui/run-pass/simd/simd-intrinsic-generic-select.rs similarity index 98% rename from src/test/run-pass/simd-intrinsic-generic-select.rs rename to src/test/ui/run-pass/simd/simd-intrinsic-generic-select.rs index 8e94d797e894..590a2990270d 100644 --- a/src/test/run-pass/simd-intrinsic-generic-select.rs +++ b/src/test/ui/run-pass/simd/simd-intrinsic-generic-select.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // ignore-emscripten // Test that the simd_select intrinsics produces correct results. diff --git a/src/test/run-pass/simd-size-align.rs b/src/test/ui/run-pass/simd/simd-size-align.rs similarity index 98% rename from src/test/run-pass/simd-size-align.rs rename to src/test/ui/run-pass/simd/simd-size-align.rs index b8d7cd841417..6a1189ef2db5 100644 --- a/src/test/run-pass/simd-size-align.rs +++ b/src/test/ui/run-pass/simd/simd-size-align.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] + #![feature(repr_simd)] #![allow(non_camel_case_types)] diff --git a/src/test/run-pass/simd-target-feature-mixup.rs b/src/test/ui/run-pass/simd/simd-target-feature-mixup.rs similarity index 98% rename from src/test/run-pass/simd-target-feature-mixup.rs rename to src/test/ui/run-pass/simd/simd-target-feature-mixup.rs index a7fd9f299c03..7ac91592d81d 100644 --- a/src/test/run-pass/simd-target-feature-mixup.rs +++ b/src/test/ui/run-pass/simd/simd-target-feature-mixup.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] +#![allow(overflowing_literals)] + // ignore-emscripten #![feature(repr_simd, target_feature, cfg_target_feature)] diff --git a/src/test/run-pass/simd-type.rs b/src/test/ui/run-pass/simd/simd-type.rs similarity index 98% rename from src/test/run-pass/simd-type.rs rename to src/test/ui/run-pass/simd/simd-type.rs index 2883b80a25b9..a1a655eec86d 100644 --- a/src/test/run-pass/simd-type.rs +++ b/src/test/ui/run-pass/simd/simd-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/simd-upgraded.rs b/src/test/ui/run-pass/simd/simd-upgraded.rs similarity index 94% rename from src/test/run-pass/simd-upgraded.rs rename to src/test/ui/run-pass/simd/simd-upgraded.rs index 821a505c1384..e255c4d47a70 100644 --- a/src/test/run-pass/simd-upgraded.rs +++ b/src/test/ui/run-pass/simd/simd-upgraded.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] +#![allow(non_camel_case_types)] + // Test that removed LLVM SIMD intrinsics continue // to work via the "AutoUpgrade" mechanism. diff --git a/src/test/run-pass/specialization/README.md b/src/test/ui/run-pass/specialization/README.md similarity index 100% rename from src/test/run-pass/specialization/README.md rename to src/test/ui/run-pass/specialization/README.md diff --git a/src/test/run-pass/specialization/assoc-ty-graph-cycle.rs b/src/test/ui/run-pass/specialization/assoc-ty-graph-cycle.rs similarity index 98% rename from src/test/run-pass/specialization/assoc-ty-graph-cycle.rs rename to src/test/ui/run-pass/specialization/assoc-ty-graph-cycle.rs index a65dcf33d85b..f484e98640f7 100644 --- a/src/test/run-pass/specialization/assoc-ty-graph-cycle.rs +++ b/src/test/ui/run-pass/specialization/assoc-ty-graph-cycle.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Make sure we don't crash with a cycle error during coherence. #![feature(specialization)] diff --git a/src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs b/src/test/ui/run-pass/specialization/auxiliary/cross_crates_defaults.rs similarity index 100% rename from src/test/run-pass/specialization/auxiliary/cross_crates_defaults.rs rename to src/test/ui/run-pass/specialization/auxiliary/cross_crates_defaults.rs diff --git a/src/test/run-pass/auxiliary/go_trait.rs b/src/test/ui/run-pass/specialization/auxiliary/go_trait.rs similarity index 100% rename from src/test/run-pass/auxiliary/go_trait.rs rename to src/test/ui/run-pass/specialization/auxiliary/go_trait.rs diff --git a/src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs b/src/test/ui/run-pass/specialization/auxiliary/specialization_cross_crate.rs similarity index 100% rename from src/test/run-pass/specialization/auxiliary/specialization_cross_crate.rs rename to src/test/ui/run-pass/specialization/auxiliary/specialization_cross_crate.rs diff --git a/src/test/run-pass/specialization/cross-crate-defaults.rs b/src/test/ui/run-pass/specialization/cross-crate-defaults.rs similarity index 98% rename from src/test/run-pass/specialization/cross-crate-defaults.rs rename to src/test/ui/run-pass/specialization/cross-crate-defaults.rs index 132520dcb736..ee978755cbd2 100644 --- a/src/test/run-pass/specialization/cross-crate-defaults.rs +++ b/src/test/ui/run-pass/specialization/cross-crate-defaults.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:cross_crates_defaults.rs #![feature(specialization)] diff --git a/src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.rs b/src/test/ui/run-pass/specialization/defaultimpl/allowed-cross-crate.rs similarity index 98% rename from src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.rs rename to src/test/ui/run-pass/specialization/defaultimpl/allowed-cross-crate.rs index 6b999f383583..4a481beffd2a 100644 --- a/src/test/run-pass/specialization/defaultimpl/allowed-cross-crate.rs +++ b/src/test/ui/run-pass/specialization/defaultimpl/allowed-cross-crate.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:go_trait.rs #![feature(specialization)] diff --git a/src/test/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs b/src/test/ui/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs similarity index 100% rename from src/test/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs rename to src/test/ui/run-pass/specialization/defaultimpl/auxiliary/go_trait.rs diff --git a/src/test/run-pass/specialization/defaultimpl/out-of-order.rs b/src/test/ui/run-pass/specialization/defaultimpl/out-of-order.rs similarity index 98% rename from src/test/run-pass/specialization/defaultimpl/out-of-order.rs rename to src/test/ui/run-pass/specialization/defaultimpl/out-of-order.rs index f77b88e2f850..e78b06579446 100644 --- a/src/test/run-pass/specialization/defaultimpl/out-of-order.rs +++ b/src/test/ui/run-pass/specialization/defaultimpl/out-of-order.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that you can list the more specific impl before the more general one. #![feature(specialization)] diff --git a/src/test/run-pass/specialization/defaultimpl/overlap-projection.rs b/src/test/ui/run-pass/specialization/defaultimpl/overlap-projection.rs similarity index 98% rename from src/test/run-pass/specialization/defaultimpl/overlap-projection.rs rename to src/test/ui/run-pass/specialization/defaultimpl/overlap-projection.rs index 500cded38c1a..00381bb09c98 100644 --- a/src/test/run-pass/specialization/defaultimpl/overlap-projection.rs +++ b/src/test/ui/run-pass/specialization/defaultimpl/overlap-projection.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that impls on projected self types can resolve overlap, even when the // projections involve specialization, so long as the associated type is // provided by the most specialized impl. diff --git a/src/test/run-pass/specialization/defaultimpl/projection.rs b/src/test/ui/run-pass/specialization/defaultimpl/projection.rs similarity index 98% rename from src/test/run-pass/specialization/defaultimpl/projection.rs rename to src/test/ui/run-pass/specialization/defaultimpl/projection.rs index 6a833ba6760f..989f4f286f2c 100644 --- a/src/test/run-pass/specialization/defaultimpl/projection.rs +++ b/src/test/ui/run-pass/specialization/defaultimpl/projection.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(specialization)] // Make sure we *can* project non-defaulted associated types diff --git a/src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs b/src/test/ui/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs similarity index 98% rename from src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs rename to src/test/ui/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs index fc7312020053..440b8d748a4a 100644 --- a/src/test/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs +++ b/src/test/ui/run-pass/specialization/defaultimpl/specialization-trait-item-not-implemented.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Tests that we can combine a default impl that supplies one method with a // full impl that supplies the other, and they can invoke one another. diff --git a/src/test/run-pass/specialization/specialization-allowed-cross-crate.rs b/src/test/ui/run-pass/specialization/specialization-allowed-cross-crate.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-allowed-cross-crate.rs rename to src/test/ui/run-pass/specialization/specialization-allowed-cross-crate.rs index 6b999f383583..4a481beffd2a 100644 --- a/src/test/run-pass/specialization/specialization-allowed-cross-crate.rs +++ b/src/test/ui/run-pass/specialization/specialization-allowed-cross-crate.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:go_trait.rs #![feature(specialization)] diff --git a/src/test/run-pass/specialization/specialization-assoc-fns.rs b/src/test/ui/run-pass/specialization/specialization-assoc-fns.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-assoc-fns.rs rename to src/test/ui/run-pass/specialization/specialization-assoc-fns.rs index 577f217862da..e6db162a70b8 100644 --- a/src/test/run-pass/specialization/specialization-assoc-fns.rs +++ b/src/test/ui/run-pass/specialization/specialization-assoc-fns.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that non-method associated functions can be specialized #![feature(specialization)] diff --git a/src/test/run-pass/specialization/specialization-basics.rs b/src/test/ui/run-pass/specialization/specialization-basics.rs similarity index 99% rename from src/test/run-pass/specialization/specialization-basics.rs rename to src/test/ui/run-pass/specialization/specialization-basics.rs index b11495e9edf1..7638b91c3bc8 100644 --- a/src/test/run-pass/specialization/specialization-basics.rs +++ b/src/test/ui/run-pass/specialization/specialization-basics.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(specialization)] // Tests a variety of basic specialization scenarios and method diff --git a/src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs b/src/test/ui/run-pass/specialization/specialization-cross-crate-no-gate.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs rename to src/test/ui/run-pass/specialization/specialization-cross-crate-no-gate.rs index b9548539e164..0427a9a429a7 100644 --- a/src/test/run-pass/specialization/specialization-cross-crate-no-gate.rs +++ b/src/test/ui/run-pass/specialization/specialization-cross-crate-no-gate.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that specialization works even if only the upstream crate enables it // aux-build:specialization_cross_crate.rs diff --git a/src/test/run-pass/specialization/specialization-cross-crate.rs b/src/test/ui/run-pass/specialization/specialization-cross-crate.rs similarity index 99% rename from src/test/run-pass/specialization/specialization-cross-crate.rs rename to src/test/ui/run-pass/specialization/specialization-cross-crate.rs index 7593ac4fb1dd..9520c0c0d613 100644 --- a/src/test/run-pass/specialization/specialization-cross-crate.rs +++ b/src/test/ui/run-pass/specialization/specialization-cross-crate.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:specialization_cross_crate.rs #![feature(specialization)] diff --git a/src/test/run-pass/specialization/specialization-default-methods.rs b/src/test/ui/run-pass/specialization/specialization-default-methods.rs similarity index 99% rename from src/test/run-pass/specialization/specialization-default-methods.rs rename to src/test/ui/run-pass/specialization/specialization-default-methods.rs index 9cfc6aabbb4f..e384687f8664 100644 --- a/src/test/run-pass/specialization/specialization-default-methods.rs +++ b/src/test/ui/run-pass/specialization/specialization-default-methods.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(specialization)] // Test that default methods are cascaded correctly diff --git a/src/test/run-pass/specialization/specialization-on-projection.rs b/src/test/ui/run-pass/specialization/specialization-on-projection.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-on-projection.rs rename to src/test/ui/run-pass/specialization/specialization-on-projection.rs index acf78def1b96..39af761fd48b 100644 --- a/src/test/run-pass/specialization/specialization-on-projection.rs +++ b/src/test/ui/run-pass/specialization/specialization-on-projection.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(specialization)] // Ensure that specialization works for impls defined directly on a projection diff --git a/src/test/run-pass/specialization/specialization-out-of-order.rs b/src/test/ui/run-pass/specialization/specialization-out-of-order.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-out-of-order.rs rename to src/test/ui/run-pass/specialization/specialization-out-of-order.rs index 2d293f494a34..1bc2a5f9af7f 100644 --- a/src/test/run-pass/specialization/specialization-out-of-order.rs +++ b/src/test/ui/run-pass/specialization/specialization-out-of-order.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that you can list the more specific impl before the more general one. #![feature(specialization)] diff --git a/src/test/run-pass/specialization/specialization-overlap-projection.rs b/src/test/ui/run-pass/specialization/specialization-overlap-projection.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-overlap-projection.rs rename to src/test/ui/run-pass/specialization/specialization-overlap-projection.rs index 20046ee66b0e..4223f8144c11 100644 --- a/src/test/run-pass/specialization/specialization-overlap-projection.rs +++ b/src/test/ui/run-pass/specialization/specialization-overlap-projection.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Test that impls on projected self types can resolve overlap, even when the // projections involve specialization, so long as the associated type is // provided by the most specialized impl. diff --git a/src/test/run-pass/specialization/specialization-projection-alias.rs b/src/test/ui/run-pass/specialization/specialization-projection-alias.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-projection-alias.rs rename to src/test/ui/run-pass/specialization/specialization-projection-alias.rs index 7fce1cca582c..f2f107653445 100644 --- a/src/test/run-pass/specialization/specialization-projection-alias.rs +++ b/src/test/ui/run-pass/specialization/specialization-projection-alias.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(specialization)] // Regression test for ICE when combining specialized associated types and type diff --git a/src/test/run-pass/specialization/specialization-projection.rs b/src/test/ui/run-pass/specialization/specialization-projection.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-projection.rs rename to src/test/ui/run-pass/specialization/specialization-projection.rs index 4e0bdec297fe..2bed94ccbc16 100644 --- a/src/test/run-pass/specialization/specialization-projection.rs +++ b/src/test/ui/run-pass/specialization/specialization-projection.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(specialization)] // Make sure we *can* project non-defaulted associated types diff --git a/src/test/run-pass/specialization/specialization-super-traits.rs b/src/test/ui/run-pass/specialization/specialization-super-traits.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-super-traits.rs rename to src/test/ui/run-pass/specialization/specialization-super-traits.rs index a9b3bfca53d1..d7c340f890d2 100644 --- a/src/test/run-pass/specialization/specialization-super-traits.rs +++ b/src/test/ui/run-pass/specialization/specialization-super-traits.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(specialization)] // Test that you can specialize via an explicit trait hierarchy diff --git a/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs b/src/test/ui/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs rename to src/test/ui/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs index 9702f6324137..1ead57e8adc9 100644 --- a/src/test/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs +++ b/src/test/ui/run-pass/specialization/specialization-translate-projections-with-lifetimes.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(specialization)] trait Iterator { diff --git a/src/test/run-pass/specialization/specialization-translate-projections-with-params.rs b/src/test/ui/run-pass/specialization/specialization-translate-projections-with-params.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-translate-projections-with-params.rs rename to src/test/ui/run-pass/specialization/specialization-translate-projections-with-params.rs index 647d5523c376..ba823c43557b 100644 --- a/src/test/run-pass/specialization/specialization-translate-projections-with-params.rs +++ b/src/test/ui/run-pass/specialization/specialization-translate-projections-with-params.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Ensure that provided items are inherited properly even when impls vary in // type parameters *and* rely on projections, and the type parameters are input // types on the trait. diff --git a/src/test/run-pass/specialization/specialization-translate-projections.rs b/src/test/ui/run-pass/specialization/specialization-translate-projections.rs similarity index 98% rename from src/test/run-pass/specialization/specialization-translate-projections.rs rename to src/test/ui/run-pass/specialization/specialization-translate-projections.rs index 11e1d997fdda..796485017c5d 100644 --- a/src/test/run-pass/specialization/specialization-translate-projections.rs +++ b/src/test/ui/run-pass/specialization/specialization-translate-projections.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // Ensure that provided items are inherited properly even when impls vary in // type parameters *and* rely on projections. diff --git a/src/test/run-pass/auxiliary/static-function-pointer-aux.rs b/src/test/ui/run-pass/statics/auxiliary/static-function-pointer-aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/static-function-pointer-aux.rs rename to src/test/ui/run-pass/statics/auxiliary/static-function-pointer-aux.rs diff --git a/src/test/run-pass/auxiliary/static-methods-crate.rs b/src/test/ui/run-pass/statics/auxiliary/static-methods-crate.rs similarity index 100% rename from src/test/run-pass/auxiliary/static-methods-crate.rs rename to src/test/ui/run-pass/statics/auxiliary/static-methods-crate.rs diff --git a/src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs b/src/test/ui/run-pass/statics/auxiliary/static_fn_inline_xc_aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/static_fn_inline_xc_aux.rs rename to src/test/ui/run-pass/statics/auxiliary/static_fn_inline_xc_aux.rs diff --git a/src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs b/src/test/ui/run-pass/statics/auxiliary/static_fn_trait_xc_aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/static_fn_trait_xc_aux.rs rename to src/test/ui/run-pass/statics/auxiliary/static_fn_trait_xc_aux.rs diff --git a/src/test/run-pass/auxiliary/static_mut_xc.rs b/src/test/ui/run-pass/statics/auxiliary/static_mut_xc.rs similarity index 100% rename from src/test/run-pass/auxiliary/static_mut_xc.rs rename to src/test/ui/run-pass/statics/auxiliary/static_mut_xc.rs diff --git a/src/test/run-pass/static-fn-inline-xc.rs b/src/test/ui/run-pass/statics/static-fn-inline-xc.rs similarity index 98% rename from src/test/run-pass/static-fn-inline-xc.rs rename to src/test/ui/run-pass/statics/static-fn-inline-xc.rs index 80de65c0e9f6..a30c3dba3c32 100644 --- a/src/test/run-pass/static-fn-inline-xc.rs +++ b/src/test/ui/run-pass/statics/static-fn-inline-xc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:static_fn_inline_xc_aux.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/static-fn-trait-xc.rs b/src/test/ui/run-pass/statics/static-fn-trait-xc.rs similarity index 98% rename from src/test/run-pass/static-fn-trait-xc.rs rename to src/test/ui/run-pass/statics/static-fn-trait-xc.rs index 550e03c8b12f..da6108c78525 100644 --- a/src/test/run-pass/static-fn-trait-xc.rs +++ b/src/test/ui/run-pass/statics/static-fn-trait-xc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:static_fn_trait_xc_aux.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/static-function-pointer-xc.rs b/src/test/ui/run-pass/statics/static-function-pointer-xc.rs similarity index 98% rename from src/test/run-pass/static-function-pointer-xc.rs rename to src/test/ui/run-pass/statics/static-function-pointer-xc.rs index a09928bd2208..19231ca51341 100644 --- a/src/test/run-pass/static-function-pointer-xc.rs +++ b/src/test/ui/run-pass/statics/static-function-pointer-xc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:static-function-pointer-aux.rs extern crate static_function_pointer_aux as aux; diff --git a/src/test/run-pass/static-function-pointer.rs b/src/test/ui/run-pass/statics/static-function-pointer.rs similarity index 98% rename from src/test/run-pass/static-function-pointer.rs rename to src/test/ui/run-pass/statics/static-function-pointer.rs index be297524309d..e923ee7308e4 100644 --- a/src/test/run-pass/static-function-pointer.rs +++ b/src/test/ui/run-pass/statics/static-function-pointer.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn f(x: isize) -> isize { x } fn g(x: isize) -> isize { 2 * x } diff --git a/src/test/run-pass/static-impl.rs b/src/test/ui/run-pass/statics/static-impl.rs similarity index 97% rename from src/test/run-pass/static-impl.rs rename to src/test/ui/run-pass/statics/static-impl.rs index 89fd83ced4c8..b1cbd5de0b9e 100644 --- a/src/test/run-pass/static-impl.rs +++ b/src/test/ui/run-pass/statics/static-impl.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + diff --git a/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs b/src/test/ui/run-pass/statics/static-method-in-trait-with-tps-intracrate.rs similarity index 98% rename from src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs rename to src/test/ui/run-pass/statics/static-method-in-trait-with-tps-intracrate.rs index c2b3a9a72283..e70984df37e6 100644 --- a/src/test/run-pass/static-method-in-trait-with-tps-intracrate.rs +++ b/src/test/ui/run-pass/statics/static-method-in-trait-with-tps-intracrate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Deserializer { fn read_int(&self) -> isize; diff --git a/src/test/run-pass/static-method-xcrate.rs b/src/test/ui/run-pass/statics/static-method-xcrate.rs similarity index 98% rename from src/test/run-pass/static-method-xcrate.rs rename to src/test/ui/run-pass/statics/static-method-xcrate.rs index ab6adcbbffe7..f9bae7f3a3b2 100644 --- a/src/test/run-pass/static-method-xcrate.rs +++ b/src/test/ui/run-pass/statics/static-method-xcrate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:static-methods-crate.rs extern crate static_methods_crate; diff --git a/src/test/run-pass/static-methods-in-traits.rs b/src/test/ui/run-pass/statics/static-methods-in-traits.rs similarity index 98% rename from src/test/run-pass/static-methods-in-traits.rs rename to src/test/ui/run-pass/statics/static-methods-in-traits.rs index 3fd3bbe936ff..cdf2168f7dca 100644 --- a/src/test/run-pass/static-methods-in-traits.rs +++ b/src/test/ui/run-pass/statics/static-methods-in-traits.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod a { pub trait Foo { diff --git a/src/test/run-pass/static-methods-in-traits2.rs b/src/test/ui/run-pass/statics/static-methods-in-traits2.rs similarity index 98% rename from src/test/run-pass/static-methods-in-traits2.rs rename to src/test/ui/run-pass/statics/static-methods-in-traits2.rs index cd8406983fbb..7e50cc58618c 100644 --- a/src/test/run-pass/static-methods-in-traits2.rs +++ b/src/test/ui/run-pass/statics/static-methods-in-traits2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub trait Number: NumConv { diff --git a/src/test/run-pass/static-mut-foreign.rs b/src/test/ui/run-pass/statics/static-mut-foreign.rs similarity index 99% rename from src/test/run-pass/static-mut-foreign.rs rename to src/test/ui/run-pass/statics/static-mut-foreign.rs index 2b7fa0166a8e..d9e43ddea718 100644 --- a/src/test/run-pass/static-mut-foreign.rs +++ b/src/test/ui/run-pass/statics/static-mut-foreign.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Constants (static variables) can be used to match in patterns, but mutable // statics cannot. This ensures that there's some form of error if this is // attempted. diff --git a/src/test/run-pass/static-mut-xc.rs b/src/test/ui/run-pass/statics/static-mut-xc.rs similarity index 96% rename from src/test/run-pass/static-mut-xc.rs rename to src/test/ui/run-pass/statics/static-mut-xc.rs index 5911b6cfa850..1e8f5f34ea6a 100644 --- a/src/test/run-pass/static-mut-xc.rs +++ b/src/test/ui/run-pass/statics/static-mut-xc.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // Constants (static variables) can be used to match in patterns, but mutable // statics cannot. This ensures that there's some form of error if this is // attempted. diff --git a/src/test/run-pass/static-recursive.rs b/src/test/ui/run-pass/statics/static-recursive.rs similarity index 99% rename from src/test/run-pass/static-recursive.rs rename to src/test/ui/run-pass/statics/static-recursive.rs index 4a6ba984eef0..606604e5f6f1 100644 --- a/src/test/run-pass/static-recursive.rs +++ b/src/test/ui/run-pass/statics/static-recursive.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass static mut S: *const u8 = unsafe { &S as *const *const u8 as *const u8 }; struct StaticDoubleLinked { diff --git a/src/test/run-pass/align-struct.rs b/src/test/ui/run-pass/structs-enums/align-struct.rs similarity index 99% rename from src/test/run-pass/align-struct.rs rename to src/test/ui/run-pass/structs-enums/align-struct.rs index 2b6a151574ad..122734e817a6 100644 --- a/src/test/run-pass/align-struct.rs +++ b/src/test/ui/run-pass/structs-enums/align-struct.rs @@ -7,6 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. + +// run-pass #![feature(box_syntax)] #![feature(repr_packed)] diff --git a/src/test/run-pass/auxiliary/cci_class.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_class.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class.rs diff --git a/src/test/run-pass/auxiliary/cci_class_2.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_2.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_class_2.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_2.rs diff --git a/src/test/run-pass/auxiliary/cci_class_3.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_3.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_class_3.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_3.rs diff --git a/src/test/run-pass/auxiliary/cci_class_4.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_4.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_class_4.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_4.rs diff --git a/src/test/run-pass/auxiliary/cci_class_6.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_6.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_class_6.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_6.rs diff --git a/src/test/run-pass/auxiliary/cci_class_cast.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_cast.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_class_cast.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_cast.rs diff --git a/src/test/run-pass/auxiliary/cci_class_trait.rs b/src/test/ui/run-pass/structs-enums/auxiliary/cci_class_trait.rs similarity index 100% rename from src/test/run-pass/auxiliary/cci_class_trait.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/cci_class_trait.rs diff --git a/src/test/ui/run-pass/structs-enums/auxiliary/empty-struct.rs b/src/test/ui/run-pass/structs-enums/auxiliary/empty-struct.rs new file mode 100644 index 000000000000..734e57a774d8 --- /dev/null +++ b/src/test/ui/run-pass/structs-enums/auxiliary/empty-struct.rs @@ -0,0 +1,19 @@ +// Copyright 2015 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +pub struct XEmpty1 {} +pub struct XEmpty2; +pub struct XEmpty7(); + +pub enum XE { + XEmpty3 {}, + XEmpty4, + XEmpty6(), +} diff --git a/src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs b/src/test/ui/run-pass/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs similarity index 100% rename from src/test/run-pass/auxiliary/namespaced_enum_emulate_flat.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/namespaced_enum_emulate_flat.rs diff --git a/src/test/run-pass/auxiliary/namespaced_enums.rs b/src/test/ui/run-pass/structs-enums/auxiliary/namespaced_enums.rs similarity index 100% rename from src/test/run-pass/auxiliary/namespaced_enums.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/namespaced_enums.rs diff --git a/src/test/ui/run-pass/structs-enums/auxiliary/newtype_struct_xc.rs b/src/test/ui/run-pass/structs-enums/auxiliary/newtype_struct_xc.rs new file mode 100644 index 000000000000..be3414b7ad2c --- /dev/null +++ b/src/test/ui/run-pass/structs-enums/auxiliary/newtype_struct_xc.rs @@ -0,0 +1,13 @@ +// Copyright 2014 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![crate_type="lib"] + +pub struct Au(pub isize); diff --git a/src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs b/src/test/ui/run-pass/structs-enums/auxiliary/struct_destructuring_cross_crate.rs similarity index 100% rename from src/test/run-pass/auxiliary/struct_destructuring_cross_crate.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/struct_destructuring_cross_crate.rs diff --git a/src/test/run-pass/auxiliary/struct_variant_xc_aux.rs b/src/test/ui/run-pass/structs-enums/auxiliary/struct_variant_xc_aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/struct_variant_xc_aux.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/struct_variant_xc_aux.rs diff --git a/src/test/run-pass/auxiliary/xcrate_struct_aliases.rs b/src/test/ui/run-pass/structs-enums/auxiliary/xcrate_struct_aliases.rs similarity index 100% rename from src/test/run-pass/auxiliary/xcrate_struct_aliases.rs rename to src/test/ui/run-pass/structs-enums/auxiliary/xcrate_struct_aliases.rs diff --git a/src/test/run-pass/borrow-tuple-fields.rs b/src/test/ui/run-pass/structs-enums/borrow-tuple-fields.rs similarity index 98% rename from src/test/run-pass/borrow-tuple-fields.rs rename to src/test/ui/run-pass/structs-enums/borrow-tuple-fields.rs index f0d09688192c..c7f9c481579a 100644 --- a/src/test/run-pass/borrow-tuple-fields.rs +++ b/src/test/ui/run-pass/structs-enums/borrow-tuple-fields.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo(isize, isize); diff --git a/src/test/run-pass/class-attributes-1.rs b/src/test/ui/run-pass/structs-enums/class-attributes-1.rs similarity index 94% rename from src/test/run-pass/class-attributes-1.rs rename to src/test/ui/run-pass/structs-enums/class-attributes-1.rs index 5dc27472184d..c5926bc15866 100644 --- a/src/test/run-pass/class-attributes-1.rs +++ b/src/test/ui/run-pass/structs-enums/class-attributes-1.rs @@ -8,8 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pp-exact - Make sure we actually print the attributes -#![allow(unused_attribute)] #![feature(custom_attribute)] struct cat { diff --git a/src/test/run-pass/class-attributes-2.rs b/src/test/ui/run-pass/structs-enums/class-attributes-2.rs similarity index 95% rename from src/test/run-pass/class-attributes-2.rs rename to src/test/ui/run-pass/structs-enums/class-attributes-2.rs index cc1b15bcb81c..f9d88de145ac 100644 --- a/src/test/run-pass/class-attributes-2.rs +++ b/src/test/ui/run-pass/structs-enums/class-attributes-2.rs @@ -7,7 +7,10 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -#![allow(unused_attribute)] + +// run-pass +#![allow(non_camel_case_types)] + #![feature(custom_attribute)] struct cat { diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/src/test/ui/run-pass/structs-enums/class-cast-to-trait-cross-crate-2.rs similarity index 98% rename from src/test/run-pass/class-cast-to-trait-cross-crate-2.rs rename to src/test/ui/run-pass/structs-enums/class-cast-to-trait-cross-crate-2.rs index 04c4b2cb3776..c28244a9f903 100644 --- a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs +++ b/src/test/ui/run-pass/structs-enums/class-cast-to-trait-cross-crate-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_class_cast.rs #![feature(box_syntax)] diff --git a/src/test/run-pass/class-cast-to-trait-multiple-types.rs b/src/test/ui/run-pass/structs-enums/class-cast-to-trait-multiple-types.rs similarity index 97% rename from src/test/run-pass/class-cast-to-trait-multiple-types.rs rename to src/test/ui/run-pass/structs-enums/class-cast-to-trait-multiple-types.rs index e5acad3a3ad3..e2efc146c4b1 100644 --- a/src/test/run-pass/class-cast-to-trait-multiple-types.rs +++ b/src/test/ui/run-pass/structs-enums/class-cast-to-trait-multiple-types.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] trait noisy { fn speak(&mut self) -> isize; diff --git a/src/test/run-pass/class-cast-to-trait.rs b/src/test/ui/run-pass/structs-enums/class-cast-to-trait.rs similarity index 96% rename from src/test/run-pass/class-cast-to-trait.rs rename to src/test/ui/run-pass/structs-enums/class-cast-to-trait.rs index adb0b6cd0a75..695318d0ee79 100644 --- a/src/test/run-pass/class-cast-to-trait.rs +++ b/src/test/ui/run-pass/structs-enums/class-cast-to-trait.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // ignore-freebsd FIXME fails on BSD diff --git a/src/test/run-pass/class-dtor.rs b/src/test/ui/run-pass/structs-enums/class-dtor.rs similarity index 94% rename from src/test/run-pass/class-dtor.rs rename to src/test/ui/run-pass/structs-enums/class-dtor.rs index 05ec2bc0ac75..13559906795e 100644 --- a/src/test/run-pass/class-dtor.rs +++ b/src/test/ui/run-pass/structs-enums/class-dtor.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 struct cat { diff --git a/src/test/run-pass/class-exports.rs b/src/test/ui/run-pass/structs-enums/class-exports.rs similarity index 95% rename from src/test/run-pass/class-exports.rs rename to src/test/ui/run-pass/structs-enums/class-exports.rs index 6783609b256c..b4bce42e6470 100644 --- a/src/test/run-pass/class-exports.rs +++ b/src/test/ui/run-pass/structs-enums/class-exports.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] /* Test that exporting a class also exports its public fields and methods */ diff --git a/src/test/run-pass/class-impl-very-parameterized-trait.rs b/src/test/ui/run-pass/structs-enums/class-impl-very-parameterized-trait.rs similarity index 98% rename from src/test/run-pass/class-impl-very-parameterized-trait.rs rename to src/test/ui/run-pass/structs-enums/class-impl-very-parameterized-trait.rs index 27a57a888591..6ceaab93e792 100644 --- a/src/test/run-pass/class-impl-very-parameterized-trait.rs +++ b/src/test/ui/run-pass/structs-enums/class-impl-very-parameterized-trait.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] use std::cmp; diff --git a/src/test/run-pass/class-implement-trait-cross-crate.rs b/src/test/ui/run-pass/structs-enums/class-implement-trait-cross-crate.rs similarity index 97% rename from src/test/run-pass/class-implement-trait-cross-crate.rs rename to src/test/ui/run-pass/structs-enums/class-implement-trait-cross-crate.rs index 5a1dc930efa5..4f319cf8ea4d 100644 --- a/src/test/run-pass/class-implement-trait-cross-crate.rs +++ b/src/test/ui/run-pass/structs-enums/class-implement-trait-cross-crate.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // aux-build:cci_class_trait.rs extern crate cci_class_trait; use cci_class_trait::animals::noisy; diff --git a/src/test/run-pass/class-implement-traits.rs b/src/test/ui/run-pass/structs-enums/class-implement-traits.rs similarity index 97% rename from src/test/run-pass/class-implement-traits.rs rename to src/test/ui/run-pass/structs-enums/class-implement-traits.rs index 394af6b9ecd5..e582940c1e46 100644 --- a/src/test/run-pass/class-implement-traits.rs +++ b/src/test/ui/run-pass/structs-enums/class-implement-traits.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] trait noisy { fn speak(&mut self); diff --git a/src/test/run-pass/class-method-cross-crate.rs b/src/test/ui/run-pass/structs-enums/class-method-cross-crate.rs similarity index 98% rename from src/test/run-pass/class-method-cross-crate.rs rename to src/test/ui/run-pass/structs-enums/class-method-cross-crate.rs index 6ab158dc37ca..010f735beeed 100644 --- a/src/test/run-pass/class-method-cross-crate.rs +++ b/src/test/ui/run-pass/structs-enums/class-method-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_class_2.rs extern crate cci_class_2; diff --git a/src/test/run-pass/class-methods-cross-crate.rs b/src/test/ui/run-pass/structs-enums/class-methods-cross-crate.rs similarity index 98% rename from src/test/run-pass/class-methods-cross-crate.rs rename to src/test/ui/run-pass/structs-enums/class-methods-cross-crate.rs index 666571007595..ca4a783b70a2 100644 --- a/src/test/run-pass/class-methods-cross-crate.rs +++ b/src/test/ui/run-pass/structs-enums/class-methods-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_class_3.rs extern crate cci_class_3; diff --git a/src/test/run-pass/class-methods.rs b/src/test/ui/run-pass/structs-enums/class-methods.rs similarity index 95% rename from src/test/run-pass/class-methods.rs rename to src/test/ui/run-pass/structs-enums/class-methods.rs index 93af906bd5a6..8cc6025dc43d 100644 --- a/src/test/run-pass/class-methods.rs +++ b/src/test/ui/run-pass/structs-enums/class-methods.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + struct cat { meows : usize, diff --git a/src/test/run-pass/class-poly-methods-cross-crate.rs b/src/test/ui/run-pass/structs-enums/class-poly-methods-cross-crate.rs similarity index 98% rename from src/test/run-pass/class-poly-methods-cross-crate.rs rename to src/test/ui/run-pass/structs-enums/class-poly-methods-cross-crate.rs index 7d266181c9eb..7ee981251482 100644 --- a/src/test/run-pass/class-poly-methods-cross-crate.rs +++ b/src/test/ui/run-pass/structs-enums/class-poly-methods-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_class_6.rs extern crate cci_class_6; diff --git a/src/test/run-pass/class-poly-methods.rs b/src/test/ui/run-pass/structs-enums/class-poly-methods.rs similarity index 96% rename from src/test/run-pass/class-poly-methods.rs rename to src/test/ui/run-pass/structs-enums/class-poly-methods.rs index 5da858e3c409..e32ba9d02395 100644 --- a/src/test/run-pass/class-poly-methods.rs +++ b/src/test/ui/run-pass/structs-enums/class-poly-methods.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] struct cat { diff --git a/src/test/run-pass/class-separate-impl.rs b/src/test/ui/run-pass/structs-enums/class-separate-impl.rs similarity index 97% rename from src/test/run-pass/class-separate-impl.rs rename to src/test/ui/run-pass/structs-enums/class-separate-impl.rs index 343d414758cc..a1c9afaa6346 100644 --- a/src/test/run-pass/class-separate-impl.rs +++ b/src/test/ui/run-pass/structs-enums/class-separate-impl.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #![feature(box_syntax)] use std::fmt; diff --git a/src/test/run-pass/class-str-field.rs b/src/test/ui/run-pass/structs-enums/class-str-field.rs similarity index 93% rename from src/test/run-pass/class-str-field.rs rename to src/test/ui/run-pass/structs-enums/class-str-field.rs index e3b9b56db0b5..5ad60dfd6d96 100644 --- a/src/test/run-pass/class-str-field.rs +++ b/src/test/ui/run-pass/structs-enums/class-str-field.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 struct cat { diff --git a/src/test/run-pass/class-typarams.rs b/src/test/ui/run-pass/structs-enums/class-typarams.rs similarity index 95% rename from src/test/run-pass/class-typarams.rs rename to src/test/ui/run-pass/structs-enums/class-typarams.rs index cc9a118ba19d..d3b4083f843a 100644 --- a/src/test/run-pass/class-typarams.rs +++ b/src/test/ui/run-pass/structs-enums/class-typarams.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 use std::marker::PhantomData; diff --git a/src/test/run-pass/classes-cross-crate.rs b/src/test/ui/run-pass/structs-enums/classes-cross-crate.rs similarity index 98% rename from src/test/run-pass/classes-cross-crate.rs rename to src/test/ui/run-pass/structs-enums/classes-cross-crate.rs index 3d99aa1ef1d0..c9cc609e8a12 100644 --- a/src/test/run-pass/classes-cross-crate.rs +++ b/src/test/ui/run-pass/structs-enums/classes-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_class_4.rs extern crate cci_class_4; diff --git a/src/test/run-pass/classes-self-referential.rs b/src/test/ui/run-pass/structs-enums/classes-self-referential.rs similarity index 93% rename from src/test/run-pass/classes-self-referential.rs rename to src/test/ui/run-pass/structs-enums/classes-self-referential.rs index 487d20729d4e..49016d14b9dd 100644 --- a/src/test/run-pass/classes-self-referential.rs +++ b/src/test/ui/run-pass/structs-enums/classes-self-referential.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/classes-simple-cross-crate.rs b/src/test/ui/run-pass/structs-enums/classes-simple-cross-crate.rs similarity index 98% rename from src/test/run-pass/classes-simple-cross-crate.rs rename to src/test/ui/run-pass/structs-enums/classes-simple-cross-crate.rs index db15001c62f1..c90ae80036fc 100644 --- a/src/test/run-pass/classes-simple-cross-crate.rs +++ b/src/test/ui/run-pass/structs-enums/classes-simple-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:cci_class.rs extern crate cci_class; diff --git a/src/test/run-pass/classes-simple-method.rs b/src/test/ui/run-pass/structs-enums/classes-simple-method.rs similarity index 95% rename from src/test/run-pass/classes-simple-method.rs rename to src/test/ui/run-pass/structs-enums/classes-simple-method.rs index 64ec2ea7e71a..6eaf8939dcc7 100644 --- a/src/test/run-pass/classes-simple-method.rs +++ b/src/test/ui/run-pass/structs-enums/classes-simple-method.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] struct cat { meows : usize, diff --git a/src/test/run-pass/classes-simple.rs b/src/test/ui/run-pass/structs-enums/classes-simple.rs similarity index 94% rename from src/test/run-pass/classes-simple.rs rename to src/test/ui/run-pass/structs-enums/classes-simple.rs index c475fb2cff94..771943802aa2 100644 --- a/src/test/run-pass/classes-simple.rs +++ b/src/test/ui/run-pass/structs-enums/classes-simple.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] struct cat { meows : usize, diff --git a/src/test/run-pass/classes.rs b/src/test/ui/run-pass/structs-enums/classes.rs similarity index 96% rename from src/test/run-pass/classes.rs rename to src/test/ui/run-pass/structs-enums/classes.rs index fa0dda11233a..f40fe3e8186e 100644 --- a/src/test/run-pass/classes.rs +++ b/src/test/ui/run-pass/structs-enums/classes.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + struct cat { meows : usize, diff --git a/src/test/run-pass/codegen-tag-static-padding.rs b/src/test/ui/run-pass/structs-enums/codegen-tag-static-padding.rs similarity index 97% rename from src/test/run-pass/codegen-tag-static-padding.rs rename to src/test/ui/run-pass/structs-enums/codegen-tag-static-padding.rs index ba01d51dc6a5..3d75786654d2 100644 --- a/src/test/run-pass/codegen-tag-static-padding.rs +++ b/src/test/ui/run-pass/structs-enums/codegen-tag-static-padding.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] // Issue #13186 diff --git a/src/test/run-pass/compare-generic-enums.rs b/src/test/ui/run-pass/structs-enums/compare-generic-enums.rs similarity index 94% rename from src/test/run-pass/compare-generic-enums.rs rename to src/test/ui/run-pass/structs-enums/compare-generic-enums.rs index 228a73326e11..60d6cd2746bf 100644 --- a/src/test/run-pass/compare-generic-enums.rs +++ b/src/test/ui/run-pass/structs-enums/compare-generic-enums.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + type an_int = isize; diff --git a/src/test/run-pass/discrim-explicit-23030.rs b/src/test/ui/run-pass/structs-enums/discrim-explicit-23030.rs similarity index 99% rename from src/test/run-pass/discrim-explicit-23030.rs rename to src/test/ui/run-pass/structs-enums/discrim-explicit-23030.rs index aed7b1527ce7..73053131865a 100644 --- a/src/test/run-pass/discrim-explicit-23030.rs +++ b/src/test/ui/run-pass/structs-enums/discrim-explicit-23030.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue 23030: Workaround overflowing discriminant // with explicit assignments. diff --git a/src/test/run-pass/empty-struct-braces.rs b/src/test/ui/run-pass/structs-enums/empty-struct-braces.rs similarity index 98% rename from src/test/run-pass/empty-struct-braces.rs rename to src/test/ui/run-pass/structs-enums/empty-struct-braces.rs index 7c161ba8dd96..7deb90cc3e8e 100644 --- a/src/test/run-pass/empty-struct-braces.rs +++ b/src/test/ui/run-pass/structs-enums/empty-struct-braces.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // Empty struct defined with braces add names into type namespace // Empty struct defined without braces add names into both type and value namespaces diff --git a/src/test/run-pass/empty-tag.rs b/src/test/ui/run-pass/structs-enums/empty-tag.rs similarity index 94% rename from src/test/run-pass/empty-tag.rs rename to src/test/ui/run-pass/structs-enums/empty-tag.rs index e60cd02ce999..eab02fd5741b 100644 --- a/src/test/run-pass/empty-tag.rs +++ b/src/test/ui/run-pass/structs-enums/empty-tag.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #[derive(Copy, Clone, Debug)] enum chan { chan_t, } diff --git a/src/test/run-pass/enum-alignment.rs b/src/test/ui/run-pass/structs-enums/enum-alignment.rs similarity index 96% rename from src/test/run-pass/enum-alignment.rs rename to src/test/ui/run-pass/structs-enums/enum-alignment.rs index 827894f8f32c..862025ea9342 100644 --- a/src/test/run-pass/enum-alignment.rs +++ b/src/test/ui/run-pass/structs-enums/enum-alignment.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] use std::mem; diff --git a/src/test/run-pass/enum-clike-ffi-as-int.rs b/src/test/ui/run-pass/structs-enums/enum-clike-ffi-as-int.rs similarity index 99% rename from src/test/run-pass/enum-clike-ffi-as-int.rs rename to src/test/ui/run-pass/structs-enums/enum-clike-ffi-as-int.rs index fdaad9e1fabc..838db7058173 100644 --- a/src/test/run-pass/enum-clike-ffi-as-int.rs +++ b/src/test/ui/run-pass/structs-enums/enum-clike-ffi-as-int.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass /*! * C-like enums have to be represented as LLVM ints, not wrapped in a diff --git a/src/test/run-pass/enum-discr.rs b/src/test/ui/run-pass/structs-enums/enum-discr.rs similarity index 98% rename from src/test/run-pass/enum-discr.rs rename to src/test/ui/run-pass/structs-enums/enum-discr.rs index fafd8b576ff0..0962f41f78d0 100644 --- a/src/test/run-pass/enum-discr.rs +++ b/src/test/ui/run-pass/structs-enums/enum-discr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass enum Animal { Cat = 0, diff --git a/src/test/run-pass/enum-discrim-autosizing.rs b/src/test/ui/run-pass/structs-enums/enum-discrim-autosizing.rs similarity index 96% rename from src/test/run-pass/enum-discrim-autosizing.rs rename to src/test/ui/run-pass/structs-enums/enum-discrim-autosizing.rs index c85ab535fc16..55bf80138b97 100644 --- a/src/test/run-pass/enum-discrim-autosizing.rs +++ b/src/test/ui/run-pass/structs-enums/enum-discrim-autosizing.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(overflowing_literals)] + use std::mem::size_of; enum Ei8 { diff --git a/src/test/run-pass/enum-discrim-manual-sizing.rs b/src/test/ui/run-pass/structs-enums/enum-discrim-manual-sizing.rs similarity index 99% rename from src/test/run-pass/enum-discrim-manual-sizing.rs rename to src/test/ui/run-pass/structs-enums/enum-discrim-manual-sizing.rs index 8557c065dc69..b4f8b5427e0d 100644 --- a/src/test/run-pass/enum-discrim-manual-sizing.rs +++ b/src/test/ui/run-pass/structs-enums/enum-discrim-manual-sizing.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem::{size_of, align_of}; diff --git a/src/test/run-pass/enum-discrim-range-overflow.rs b/src/test/ui/run-pass/structs-enums/enum-discrim-range-overflow.rs similarity index 95% rename from src/test/run-pass/enum-discrim-range-overflow.rs rename to src/test/ui/run-pass/structs-enums/enum-discrim-range-overflow.rs index f1306b3f08cf..731cb003776e 100644 --- a/src/test/run-pass/enum-discrim-range-overflow.rs +++ b/src/test/ui/run-pass/structs-enums/enum-discrim-range-overflow.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(overflowing_literals)] + // pretty-expanded FIXME #23616 pub enum E64 { diff --git a/src/test/run-pass/enum-discrim-width-stuff.rs b/src/test/ui/run-pass/structs-enums/enum-discrim-width-stuff.rs similarity index 95% rename from src/test/run-pass/enum-discrim-width-stuff.rs rename to src/test/ui/run-pass/structs-enums/enum-discrim-width-stuff.rs index 46238c457208..6b38de6f6b38 100644 --- a/src/test/run-pass/enum-discrim-width-stuff.rs +++ b/src/test/ui/run-pass/structs-enums/enum-discrim-width-stuff.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(overflowing_literals)] +#![allow(dead_code)] + macro_rules! check { ($m:ident, $t:ty, $v:expr) => {{ mod $m { diff --git a/src/test/run-pass/enum-disr-val-pretty.rs b/src/test/ui/run-pass/structs-enums/enum-disr-val-pretty.rs similarity index 95% rename from src/test/run-pass/enum-disr-val-pretty.rs rename to src/test/ui/run-pass/structs-enums/enum-disr-val-pretty.rs index 425d8f6d651c..5c02bf288848 100644 --- a/src/test/run-pass/enum-disr-val-pretty.rs +++ b/src/test/ui/run-pass/structs-enums/enum-disr-val-pretty.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] // pp-exact diff --git a/src/test/run-pass/enum-export-inheritance.rs b/src/test/ui/run-pass/structs-enums/enum-export-inheritance.rs similarity index 98% rename from src/test/run-pass/enum-export-inheritance.rs rename to src/test/ui/run-pass/structs-enums/enum-export-inheritance.rs index 4cf8fff23764..050479d28dcd 100644 --- a/src/test/run-pass/enum-export-inheritance.rs +++ b/src/test/ui/run-pass/structs-enums/enum-export-inheritance.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 mod a { diff --git a/src/test/run-pass/enum-layout-optimization.rs b/src/test/ui/run-pass/structs-enums/enum-layout-optimization.rs similarity index 99% rename from src/test/run-pass/enum-layout-optimization.rs rename to src/test/ui/run-pass/structs-enums/enum-layout-optimization.rs index a562761cab92..fcc5cc079964 100644 --- a/src/test/run-pass/enum-layout-optimization.rs +++ b/src/test/ui/run-pass/structs-enums/enum-layout-optimization.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we will do various size optimizations to enum layout, but // *not* if `#[repr(u8)]` or `#[repr(C)]` is passed. See also #40029. diff --git a/src/test/run-pass/enum-non-c-like-repr-c-and-int.rs b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-c-and-int.rs similarity index 99% rename from src/test/run-pass/enum-non-c-like-repr-c-and-int.rs rename to src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-c-and-int.rs index 86453fdf6fae..14eac687ecf9 100644 --- a/src/test/run-pass/enum-non-c-like-repr-c-and-int.rs +++ b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-c-and-int.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test deserializes an enum in-place by transmuting to a union that // should have the same layout, and manipulating the tag and payloads // independently. This verifies that `repr(some_int)` has a stable representation, diff --git a/src/test/run-pass/enum-non-c-like-repr-c.rs b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-c.rs similarity index 99% rename from src/test/run-pass/enum-non-c-like-repr-c.rs rename to src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-c.rs index b4e0fe8d4572..80c4339af9d6 100644 --- a/src/test/run-pass/enum-non-c-like-repr-c.rs +++ b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-c.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test deserializes an enum in-place by transmuting to a union that // should have the same layout, and manipulating the tag and payloads // independently. This verifies that `repr(some_int)` has a stable representation, diff --git a/src/test/run-pass/enum-non-c-like-repr-int.rs b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-int.rs similarity index 99% rename from src/test/run-pass/enum-non-c-like-repr-int.rs rename to src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-int.rs index 6e147b00ef9a..4c1fe8db1cda 100644 --- a/src/test/run-pass/enum-non-c-like-repr-int.rs +++ b/src/test/ui/run-pass/structs-enums/enum-non-c-like-repr-int.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // This test deserializes an enum in-place by transmuting to a union that // should have the same layout, and manipulating the tag and payloads // independently. This verifies that `repr(some_int)` has a stable representation, diff --git a/src/test/run-pass/enum-null-pointer-opt.rs b/src/test/ui/run-pass/structs-enums/enum-null-pointer-opt.rs similarity index 99% rename from src/test/run-pass/enum-null-pointer-opt.rs rename to src/test/ui/run-pass/structs-enums/enum-null-pointer-opt.rs index 34ed589d418c..f5f90c62b883 100644 --- a/src/test/run-pass/enum-null-pointer-opt.rs +++ b/src/test/ui/run-pass/structs-enums/enum-null-pointer-opt.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem::size_of; use std::num::NonZeroUsize; use std::ptr::NonNull; diff --git a/src/test/run-pass/enum-nullable-const-null-with-fields.rs b/src/test/ui/run-pass/structs-enums/enum-nullable-const-null-with-fields.rs similarity index 98% rename from src/test/run-pass/enum-nullable-const-null-with-fields.rs rename to src/test/ui/run-pass/structs-enums/enum-nullable-const-null-with-fields.rs index 1342c4e104de..21d481128417 100644 --- a/src/test/run-pass/enum-nullable-const-null-with-fields.rs +++ b/src/test/ui/run-pass/structs-enums/enum-nullable-const-null-with-fields.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::result::Result; use std::result::Result::Ok; diff --git a/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs b/src/test/ui/run-pass/structs-enums/enum-nullable-simplifycfg-misopt.rs similarity index 98% rename from src/test/run-pass/enum-nullable-simplifycfg-misopt.rs rename to src/test/ui/run-pass/structs-enums/enum-nullable-simplifycfg-misopt.rs index b5db8d913204..431d105f01f5 100644 --- a/src/test/run-pass/enum-nullable-simplifycfg-misopt.rs +++ b/src/test/ui/run-pass/structs-enums/enum-nullable-simplifycfg-misopt.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] /*! diff --git a/src/test/run-pass/enum-univariant-repr.rs b/src/test/ui/run-pass/structs-enums/enum-univariant-repr.rs similarity index 99% rename from src/test/run-pass/enum-univariant-repr.rs rename to src/test/ui/run-pass/structs-enums/enum-univariant-repr.rs index 17d614b54969..7f78da64b671 100644 --- a/src/test/run-pass/enum-univariant-repr.rs +++ b/src/test/ui/run-pass/structs-enums/enum-univariant-repr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem; diff --git a/src/test/run-pass/enum-variants.rs b/src/test/ui/run-pass/structs-enums/enum-variants.rs similarity index 96% rename from src/test/run-pass/enum-variants.rs rename to src/test/ui/run-pass/structs-enums/enum-variants.rs index 5eb7a243acf0..1eff9ad413d5 100644 --- a/src/test/run-pass/enum-variants.rs +++ b/src/test/ui/run-pass/structs-enums/enum-variants.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 -#![allow(dead_assignment)] #![allow(unused_variables)] enum Animal { diff --git a/src/test/run-pass/enum-vec-initializer.rs b/src/test/ui/run-pass/structs-enums/enum-vec-initializer.rs similarity index 98% rename from src/test/run-pass/enum-vec-initializer.rs rename to src/test/ui/run-pass/structs-enums/enum-vec-initializer.rs index 037ee5f77775..9a2abdbb7063 100644 --- a/src/test/run-pass/enum-vec-initializer.rs +++ b/src/test/ui/run-pass/structs-enums/enum-vec-initializer.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 enum Flopsy { diff --git a/src/test/run-pass/export-abstract-tag.rs b/src/test/ui/run-pass/structs-enums/export-abstract-tag.rs similarity index 94% rename from src/test/run-pass/export-abstract-tag.rs rename to src/test/ui/run-pass/structs-enums/export-abstract-tag.rs index 7333d739f4b6..6de6e1847fe7 100644 --- a/src/test/run-pass/export-abstract-tag.rs +++ b/src/test/ui/run-pass/structs-enums/export-abstract-tag.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // We can export tags without exporting the variants to create a simple // sort of ADT. diff --git a/src/test/run-pass/export-tag-variant.rs b/src/test/ui/run-pass/structs-enums/export-tag-variant.rs similarity index 92% rename from src/test/run-pass/export-tag-variant.rs rename to src/test/ui/run-pass/structs-enums/export-tag-variant.rs index 6257332a6656..700ad4fbe7e8 100644 --- a/src/test/run-pass/export-tag-variant.rs +++ b/src/test/ui/run-pass/structs-enums/export-tag-variant.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] // pretty-expanded FIXME #23616 mod foo { diff --git a/src/test/run-pass/expr-if-struct.rs b/src/test/ui/run-pass/structs-enums/expr-if-struct.rs similarity index 96% rename from src/test/run-pass/expr-if-struct.rs rename to src/test/ui/run-pass/structs-enums/expr-if-struct.rs index e79daed4c33d..25777fba2743 100644 --- a/src/test/run-pass/expr-if-struct.rs +++ b/src/test/ui/run-pass/structs-enums/expr-if-struct.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] diff --git a/src/test/run-pass/expr-match-struct.rs b/src/test/ui/run-pass/structs-enums/expr-match-struct.rs similarity index 96% rename from src/test/run-pass/expr-match-struct.rs rename to src/test/ui/run-pass/structs-enums/expr-match-struct.rs index 2dcb0f833e4b..7c18eff1c46b 100644 --- a/src/test/run-pass/expr-match-struct.rs +++ b/src/test/ui/run-pass/structs-enums/expr-match-struct.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] diff --git a/src/test/run-pass/field-destruction-order.rs b/src/test/ui/run-pass/structs-enums/field-destruction-order.rs similarity index 97% rename from src/test/run-pass/field-destruction-order.rs rename to src/test/ui/run-pass/structs-enums/field-destruction-order.rs index 624167db36da..5b9d1530321f 100644 --- a/src/test/run-pass/field-destruction-order.rs +++ b/src/test/ui/run-pass/structs-enums/field-destruction-order.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // In theory, it doesn't matter what order destructors are run in for rust // because we have explicit ownership of values meaning that there's no need to // run one before another. With unsafe code, however, there may be a safe diff --git a/src/test/run-pass/foreign-struct.rs b/src/test/ui/run-pass/structs-enums/foreign-struct.rs similarity index 93% rename from src/test/run-pass/foreign-struct.rs rename to src/test/ui/run-pass/structs-enums/foreign-struct.rs index 8b48731ee0ba..1e4955bd5ece 100644 --- a/src/test/run-pass/foreign-struct.rs +++ b/src/test/ui/run-pass/structs-enums/foreign-struct.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // Passing enums by value // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/functional-struct-upd.rs b/src/test/ui/run-pass/structs-enums/functional-struct-upd.rs similarity index 98% rename from src/test/run-pass/functional-struct-upd.rs rename to src/test/ui/run-pass/structs-enums/functional-struct-upd.rs index 240d49d718f3..6fe028c51452 100644 --- a/src/test/run-pass/functional-struct-upd.rs +++ b/src/test/ui/run-pass/structs-enums/functional-struct-upd.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] struct Foo { x: isize, diff --git a/src/test/run-pass/ivec-tag.rs b/src/test/ui/run-pass/structs-enums/ivec-tag.rs similarity index 98% rename from src/test/run-pass/ivec-tag.rs rename to src/test/ui/run-pass/structs-enums/ivec-tag.rs index 0da1d18afd8e..fb7585f99894 100644 --- a/src/test/run-pass/ivec-tag.rs +++ b/src/test/ui/run-pass/structs-enums/ivec-tag.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/module-qualified-struct-destructure.rs b/src/test/ui/run-pass/structs-enums/module-qualified-struct-destructure.rs similarity index 98% rename from src/test/run-pass/module-qualified-struct-destructure.rs rename to src/test/ui/run-pass/structs-enums/module-qualified-struct-destructure.rs index d6844f0f4abd..8334dc532e03 100644 --- a/src/test/run-pass/module-qualified-struct-destructure.rs +++ b/src/test/ui/run-pass/structs-enums/module-qualified-struct-destructure.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 mod m { diff --git a/src/test/run-pass/namespaced-enum-emulate-flat-xc.rs b/src/test/ui/run-pass/structs-enums/namespaced-enum-emulate-flat-xc.rs similarity index 95% rename from src/test/run-pass/namespaced-enum-emulate-flat-xc.rs rename to src/test/ui/run-pass/structs-enums/namespaced-enum-emulate-flat-xc.rs index f275e9b7425b..1f57c9dd473f 100644 --- a/src/test/run-pass/namespaced-enum-emulate-flat-xc.rs +++ b/src/test/ui/run-pass/structs-enums/namespaced-enum-emulate-flat-xc.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // aux-build:namespaced_enum_emulate_flat.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/namespaced-enum-emulate-flat.rs b/src/test/ui/run-pass/structs-enums/namespaced-enum-emulate-flat.rs similarity index 98% rename from src/test/run-pass/namespaced-enum-emulate-flat.rs rename to src/test/ui/run-pass/structs-enums/namespaced-enum-emulate-flat.rs index 0f85c20d3151..1185519dac66 100644 --- a/src/test/run-pass/namespaced-enum-emulate-flat.rs +++ b/src/test/ui/run-pass/structs-enums/namespaced-enum-emulate-flat.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub use Foo::*; diff --git a/src/test/run-pass/namespaced-enum-glob-import-xcrate.rs b/src/test/ui/run-pass/structs-enums/namespaced-enum-glob-import-xcrate.rs similarity index 98% rename from src/test/run-pass/namespaced-enum-glob-import-xcrate.rs rename to src/test/ui/run-pass/structs-enums/namespaced-enum-glob-import-xcrate.rs index 7bfe90bad7f4..aff4125ef176 100644 --- a/src/test/run-pass/namespaced-enum-glob-import-xcrate.rs +++ b/src/test/ui/run-pass/structs-enums/namespaced-enum-glob-import-xcrate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:namespaced_enums.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/namespaced-enum-glob-import.rs b/src/test/ui/run-pass/structs-enums/namespaced-enum-glob-import.rs similarity index 98% rename from src/test/run-pass/namespaced-enum-glob-import.rs rename to src/test/ui/run-pass/structs-enums/namespaced-enum-glob-import.rs index f506ea11f848..85af2f0d9d61 100644 --- a/src/test/run-pass/namespaced-enum-glob-import.rs +++ b/src/test/ui/run-pass/structs-enums/namespaced-enum-glob-import.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 mod m2 { diff --git a/src/test/run-pass/namespaced-enums-xcrate.rs b/src/test/ui/run-pass/structs-enums/namespaced-enums-xcrate.rs similarity index 98% rename from src/test/run-pass/namespaced-enums-xcrate.rs rename to src/test/ui/run-pass/structs-enums/namespaced-enums-xcrate.rs index 0046d80e086d..d107a9386c3c 100644 --- a/src/test/run-pass/namespaced-enums-xcrate.rs +++ b/src/test/ui/run-pass/structs-enums/namespaced-enums-xcrate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:namespaced_enums.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/namespaced-enums.rs b/src/test/ui/run-pass/structs-enums/namespaced-enums.rs similarity index 98% rename from src/test/run-pass/namespaced-enums.rs rename to src/test/ui/run-pass/structs-enums/namespaced-enums.rs index 3e72f73bc489..05a4c190712e 100644 --- a/src/test/run-pass/namespaced-enums.rs +++ b/src/test/ui/run-pass/structs-enums/namespaced-enums.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 enum Foo { diff --git a/src/test/run-pass/nested-enum-same-names.rs b/src/test/ui/run-pass/structs-enums/nested-enum-same-names.rs similarity index 98% rename from src/test/run-pass/nested-enum-same-names.rs rename to src/test/ui/run-pass/structs-enums/nested-enum-same-names.rs index c0baab66c597..6e294b27abf3 100644 --- a/src/test/run-pass/nested-enum-same-names.rs +++ b/src/test/ui/run-pass/structs-enums/nested-enum-same-names.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 /* diff --git a/src/test/run-pass/newtype-struct-drop-run.rs b/src/test/ui/run-pass/structs-enums/newtype-struct-drop-run.rs similarity index 98% rename from src/test/run-pass/newtype-struct-drop-run.rs rename to src/test/ui/run-pass/structs-enums/newtype-struct-drop-run.rs index 6a5d86b522ed..2221deeb5aec 100644 --- a/src/test/run-pass/newtype-struct-drop-run.rs +++ b/src/test/ui/run-pass/structs-enums/newtype-struct-drop-run.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Make sure the destructor is run for newtype structs. use std::cell::Cell; diff --git a/src/test/run-pass/newtype-struct-with-dtor.rs b/src/test/ui/run-pass/structs-enums/newtype-struct-with-dtor.rs similarity index 98% rename from src/test/run-pass/newtype-struct-with-dtor.rs rename to src/test/ui/run-pass/structs-enums/newtype-struct-with-dtor.rs index 07c76e27284f..6bdf69478aee 100644 --- a/src/test/run-pass/newtype-struct-with-dtor.rs +++ b/src/test/ui/run-pass/structs-enums/newtype-struct-with-dtor.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub struct Fd(u32); diff --git a/src/test/run-pass/newtype-struct-xc-2.rs b/src/test/ui/run-pass/structs-enums/newtype-struct-xc-2.rs similarity index 98% rename from src/test/run-pass/newtype-struct-xc-2.rs rename to src/test/ui/run-pass/structs-enums/newtype-struct-xc-2.rs index ac03f65750df..d83552b063c7 100644 --- a/src/test/run-pass/newtype-struct-xc-2.rs +++ b/src/test/ui/run-pass/structs-enums/newtype-struct-xc-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:newtype_struct_xc.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/newtype-struct-xc.rs b/src/test/ui/run-pass/structs-enums/newtype-struct-xc.rs similarity index 98% rename from src/test/run-pass/newtype-struct-xc.rs rename to src/test/ui/run-pass/structs-enums/newtype-struct-xc.rs index 0cac4530faf3..d88ddd7298cd 100644 --- a/src/test/run-pass/newtype-struct-xc.rs +++ b/src/test/ui/run-pass/structs-enums/newtype-struct-xc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:newtype_struct_xc.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/nonzero-enum.rs b/src/test/ui/run-pass/structs-enums/nonzero-enum.rs similarity index 98% rename from src/test/run-pass/nonzero-enum.rs rename to src/test/ui/run-pass/structs-enums/nonzero-enum.rs index fc92c9df9f7e..7a6afec4e6d2 100644 --- a/src/test/run-pass/nonzero-enum.rs +++ b/src/test/ui/run-pass/structs-enums/nonzero-enum.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem::size_of; enum E { diff --git a/src/test/run-pass/numeric-fields.rs b/src/test/ui/run-pass/structs-enums/numeric-fields.rs similarity index 98% rename from src/test/run-pass/numeric-fields.rs rename to src/test/ui/run-pass/structs-enums/numeric-fields.rs index 15f054de79d1..e311722d6514 100644 --- a/src/test/run-pass/numeric-fields.rs +++ b/src/test/ui/run-pass/structs-enums/numeric-fields.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S(u8, u16); fn main() { diff --git a/src/test/run-pass/object-lifetime-default-from-ref-struct.rs b/src/test/ui/run-pass/structs-enums/object-lifetime-default-from-ref-struct.rs similarity index 99% rename from src/test/run-pass/object-lifetime-default-from-ref-struct.rs rename to src/test/ui/run-pass/structs-enums/object-lifetime-default-from-ref-struct.rs index 6aaf89209713..86d8af174ac5 100644 --- a/src/test/run-pass/object-lifetime-default-from-ref-struct.rs +++ b/src/test/ui/run-pass/structs-enums/object-lifetime-default-from-ref-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the lifetime of the enclosing `&` is used for the object // lifetime bound. diff --git a/src/test/run-pass/object-lifetime-default-from-rptr-struct.rs b/src/test/ui/run-pass/structs-enums/object-lifetime-default-from-rptr-struct.rs similarity index 98% rename from src/test/run-pass/object-lifetime-default-from-rptr-struct.rs rename to src/test/ui/run-pass/structs-enums/object-lifetime-default-from-rptr-struct.rs index fcff5fd6f17d..cd88f7a42d0c 100644 --- a/src/test/run-pass/object-lifetime-default-from-rptr-struct.rs +++ b/src/test/ui/run-pass/structs-enums/object-lifetime-default-from-rptr-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the lifetime from the enclosing `&` is "inherited" // through the `MyBox` struct. diff --git a/src/test/run-pass/rec-align-u32.rs b/src/test/ui/run-pass/structs-enums/rec-align-u32.rs similarity index 99% rename from src/test/run-pass/rec-align-u32.rs rename to src/test/ui/run-pass/structs-enums/rec-align-u32.rs index 4a115c737da3..e2c960b89cb6 100644 --- a/src/test/run-pass/rec-align-u32.rs +++ b/src/test/ui/run-pass/structs-enums/rec-align-u32.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #2303 #![feature(intrinsics)] diff --git a/src/test/run-pass/rec-align-u64.rs b/src/test/ui/run-pass/structs-enums/rec-align-u64.rs similarity index 99% rename from src/test/run-pass/rec-align-u64.rs rename to src/test/ui/run-pass/structs-enums/rec-align-u64.rs index 85c1b2adb79e..6fe3aefaef5a 100644 --- a/src/test/run-pass/rec-align-u64.rs +++ b/src/test/ui/run-pass/structs-enums/rec-align-u64.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare seems unimportant to test // Issue #2303 diff --git a/src/test/run-pass/rec-auto.rs b/src/test/ui/run-pass/structs-enums/rec-auto.rs similarity index 98% rename from src/test/run-pass/rec-auto.rs rename to src/test/ui/run-pass/structs-enums/rec-auto.rs index 18431bc53794..db9a97bd0369 100644 --- a/src/test/run-pass/rec-auto.rs +++ b/src/test/ui/run-pass/structs-enums/rec-auto.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/rec-extend.rs b/src/test/ui/run-pass/structs-enums/rec-extend.rs similarity index 98% rename from src/test/run-pass/rec-extend.rs rename to src/test/ui/run-pass/structs-enums/rec-extend.rs index ffef77a4b8de..c20ff37222ca 100644 --- a/src/test/run-pass/rec-extend.rs +++ b/src/test/ui/run-pass/structs-enums/rec-extend.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass diff --git a/src/test/run-pass/rec-tup.rs b/src/test/ui/run-pass/structs-enums/rec-tup.rs similarity index 96% rename from src/test/run-pass/rec-tup.rs rename to src/test/ui/run-pass/structs-enums/rec-tup.rs index 810888b0d8e7..ae8819cb5b87 100644 --- a/src/test/run-pass/rec-tup.rs +++ b/src/test/ui/run-pass/structs-enums/rec-tup.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #[derive(Copy, Clone)] struct Point {x: isize, y: isize} diff --git a/src/test/run-pass/rec.rs b/src/test/ui/run-pass/structs-enums/rec.rs similarity index 98% rename from src/test/run-pass/rec.rs rename to src/test/ui/run-pass/structs-enums/rec.rs index b47bda0931fe..c8e8f81e0857 100644 --- a/src/test/run-pass/rec.rs +++ b/src/test/ui/run-pass/structs-enums/rec.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Copy, Clone)] struct Rect {x: isize, y: isize, w: isize, h: isize} diff --git a/src/test/run-pass/record-pat.rs b/src/test/ui/run-pass/structs-enums/record-pat.rs similarity index 91% rename from src/test/run-pass/record-pat.rs rename to src/test/ui/run-pass/structs-enums/record-pat.rs index 99bec7ab7d1f..966749b8354e 100644 --- a/src/test/run-pass/record-pat.rs +++ b/src/test/ui/run-pass/structs-enums/record-pat.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_shorthand_field_patterns)] enum t1 { a(isize), b(usize), } struct T2 {x: t1, y: isize} diff --git a/src/test/run-pass/resource-in-struct.rs b/src/test/ui/run-pass/structs-enums/resource-in-struct.rs similarity index 95% rename from src/test/run-pass/resource-in-struct.rs rename to src/test/ui/run-pass/structs-enums/resource-in-struct.rs index 2914127246a0..e8ac8ed749cc 100644 --- a/src/test/run-pass/resource-in-struct.rs +++ b/src/test/ui/run-pass/structs-enums/resource-in-struct.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // Ensures that class dtors run if the object is inside an enum // variant diff --git a/src/test/run-pass/simple-generic-tag.rs b/src/test/ui/run-pass/structs-enums/simple-generic-tag.rs similarity index 92% rename from src/test/run-pass/simple-generic-tag.rs rename to src/test/ui/run-pass/structs-enums/simple-generic-tag.rs index 2e8d8f61bc8a..be73224c7ecb 100644 --- a/src/test/run-pass/simple-generic-tag.rs +++ b/src/test/ui/run-pass/structs-enums/simple-generic-tag.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/simple-match-generic-tag.rs b/src/test/ui/run-pass/structs-enums/simple-match-generic-tag.rs similarity index 93% rename from src/test/run-pass/simple-match-generic-tag.rs rename to src/test/ui/run-pass/structs-enums/simple-match-generic-tag.rs index 52989b366692..7093ba5138d1 100644 --- a/src/test/run-pass/simple-match-generic-tag.rs +++ b/src/test/ui/run-pass/structs-enums/simple-match-generic-tag.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + enum opt { none, some(T) } pub fn main() { diff --git a/src/test/run-pass/small-enum-range-edge.rs b/src/test/ui/run-pass/structs-enums/small-enum-range-edge.rs similarity index 95% rename from src/test/run-pass/small-enum-range-edge.rs rename to src/test/ui/run-pass/structs-enums/small-enum-range-edge.rs index 7b6f0a7c9abc..5b2a3ca3caf0 100644 --- a/src/test/run-pass/small-enum-range-edge.rs +++ b/src/test/ui/run-pass/structs-enums/small-enum-range-edge.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // Tests the range assertion wraparound case when reading discriminants. #[repr(u8)] diff --git a/src/test/run-pass/small-enums-with-fields.rs b/src/test/ui/run-pass/structs-enums/small-enums-with-fields.rs similarity index 99% rename from src/test/run-pass/small-enums-with-fields.rs rename to src/test/ui/run-pass/structs-enums/small-enums-with-fields.rs index 86eed715f325..9e4d43956959 100644 --- a/src/test/run-pass/small-enums-with-fields.rs +++ b/src/test/ui/run-pass/structs-enums/small-enums-with-fields.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::mem::size_of; #[derive(PartialEq, Debug)] diff --git a/src/test/run-pass/struct-aliases-xcrate.rs b/src/test/ui/run-pass/structs-enums/struct-aliases-xcrate.rs similarity index 93% rename from src/test/run-pass/struct-aliases-xcrate.rs rename to src/test/ui/run-pass/structs-enums/struct-aliases-xcrate.rs index 2ca9d599d84a..b20173574cc7 100644 --- a/src/test/run-pass/struct-aliases-xcrate.rs +++ b/src/test/ui/run-pass/structs-enums/struct-aliases-xcrate.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_shorthand_field_patterns)] + // aux-build:xcrate_struct_aliases.rs extern crate xcrate_struct_aliases; diff --git a/src/test/run-pass/struct-aliases.rs b/src/test/ui/run-pass/structs-enums/struct-aliases.rs similarity index 96% rename from src/test/run-pass/struct-aliases.rs rename to src/test/ui/run-pass/structs-enums/struct-aliases.rs index f1337a5b0797..610c512628c7 100644 --- a/src/test/run-pass/struct-aliases.rs +++ b/src/test/ui/run-pass/structs-enums/struct-aliases.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_shorthand_field_patterns)] + use std::mem; struct S { diff --git a/src/test/run-pass/struct-destructuring-cross-crate.rs b/src/test/ui/run-pass/structs-enums/struct-destructuring-cross-crate.rs similarity index 98% rename from src/test/run-pass/struct-destructuring-cross-crate.rs rename to src/test/ui/run-pass/structs-enums/struct-destructuring-cross-crate.rs index 63e8d694ddb5..cd746f986f14 100644 --- a/src/test/run-pass/struct-destructuring-cross-crate.rs +++ b/src/test/ui/run-pass/structs-enums/struct-destructuring-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:struct_destructuring_cross_crate.rs diff --git a/src/test/run-pass/struct-field-shorthand.rs b/src/test/ui/run-pass/structs-enums/struct-field-shorthand.rs similarity index 98% rename from src/test/run-pass/struct-field-shorthand.rs rename to src/test/ui/run-pass/structs-enums/struct-field-shorthand.rs index b61e232200c9..1f06cd889a44 100644 --- a/src/test/run-pass/struct-field-shorthand.rs +++ b/src/test/ui/run-pass/structs-enums/struct-field-shorthand.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo { x: i32, y: bool, diff --git a/src/test/run-pass/struct-like-variant-construct.rs b/src/test/ui/run-pass/structs-enums/struct-like-variant-construct.rs similarity index 98% rename from src/test/run-pass/struct-like-variant-construct.rs rename to src/test/ui/run-pass/structs-enums/struct-like-variant-construct.rs index a55e5143a0bf..a970c1b0d78e 100644 --- a/src/test/run-pass/struct-like-variant-construct.rs +++ b/src/test/ui/run-pass/structs-enums/struct-like-variant-construct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 enum Foo { diff --git a/src/test/run-pass/struct-like-variant-match.rs b/src/test/ui/run-pass/structs-enums/struct-like-variant-match.rs similarity index 94% rename from src/test/run-pass/struct-like-variant-match.rs rename to src/test/ui/run-pass/structs-enums/struct-like-variant-match.rs index 175090eadd98..93539b45e231 100644 --- a/src/test/run-pass/struct-like-variant-match.rs +++ b/src/test/ui/run-pass/structs-enums/struct-like-variant-match.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_shorthand_field_patterns)] enum Foo { Bar { diff --git a/src/test/run-pass/struct-lit-functional-no-fields.rs b/src/test/ui/run-pass/structs-enums/struct-lit-functional-no-fields.rs similarity index 98% rename from src/test/run-pass/struct-lit-functional-no-fields.rs rename to src/test/ui/run-pass/structs-enums/struct-lit-functional-no-fields.rs index c3b1ff0f057b..fc28c837adf8 100644 --- a/src/test/run-pass/struct-lit-functional-no-fields.rs +++ b/src/test/ui/run-pass/structs-enums/struct-lit-functional-no-fields.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug,PartialEq,Clone)] struct Foo { bar: T, diff --git a/src/test/run-pass/struct-literal-dtor.rs b/src/test/ui/run-pass/structs-enums/struct-literal-dtor.rs similarity index 93% rename from src/test/run-pass/struct-literal-dtor.rs rename to src/test/ui/run-pass/structs-enums/struct-literal-dtor.rs index 61607cffc47f..032fcecb4903 100644 --- a/src/test/run-pass/struct-literal-dtor.rs +++ b/src/test/ui/run-pass/structs-enums/struct-literal-dtor.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + struct foo { x: String, } diff --git a/src/test/run-pass/struct-new-as-field-name.rs b/src/test/ui/run-pass/structs-enums/struct-new-as-field-name.rs similarity index 97% rename from src/test/run-pass/struct-new-as-field-name.rs rename to src/test/ui/run-pass/structs-enums/struct-new-as-field-name.rs index 7fb3a64e02b8..8f2bcbcf620a 100644 --- a/src/test/run-pass/struct-new-as-field-name.rs +++ b/src/test/ui/run-pass/structs-enums/struct-new-as-field-name.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo { new: isize, diff --git a/src/test/run-pass/struct-order-of-eval-1.rs b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-1.rs similarity index 98% rename from src/test/run-pass/struct-order-of-eval-1.rs rename to src/test/ui/run-pass/structs-enums/struct-order-of-eval-1.rs index b5e4011bbea5..1e674cb89708 100644 --- a/src/test/run-pass/struct-order-of-eval-1.rs +++ b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S { f0: String, f1: isize } diff --git a/src/test/run-pass/struct-order-of-eval-2.rs b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-2.rs similarity index 98% rename from src/test/run-pass/struct-order-of-eval-2.rs rename to src/test/ui/run-pass/structs-enums/struct-order-of-eval-2.rs index 7ec28f597edb..c054f31beae4 100644 --- a/src/test/run-pass/struct-order-of-eval-2.rs +++ b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S { f0: String, diff --git a/src/test/run-pass/struct-order-of-eval-3.rs b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-3.rs similarity index 99% rename from src/test/run-pass/struct-order-of-eval-3.rs rename to src/test/ui/run-pass/structs-enums/struct-order-of-eval-3.rs index 3059c8e9e896..30f8a0dfe574 100644 --- a/src/test/run-pass/struct-order-of-eval-3.rs +++ b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Checks that functional-record-update order-of-eval is as expected // even when no Drop-implementations are involved. diff --git a/src/test/run-pass/struct-order-of-eval-4.rs b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-4.rs similarity index 99% rename from src/test/run-pass/struct-order-of-eval-4.rs rename to src/test/ui/run-pass/structs-enums/struct-order-of-eval-4.rs index 2ae9ebc34e1b..8a436890f923 100644 --- a/src/test/run-pass/struct-order-of-eval-4.rs +++ b/src/test/ui/run-pass/structs-enums/struct-order-of-eval-4.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Checks that struct-literal expression order-of-eval is as expected // even when no Drop-implementations are involved. diff --git a/src/test/run-pass/struct-partial-move-1.rs b/src/test/ui/run-pass/structs-enums/struct-partial-move-1.rs similarity index 98% rename from src/test/run-pass/struct-partial-move-1.rs rename to src/test/ui/run-pass/structs-enums/struct-partial-move-1.rs index 3b04bfc1acca..546bd6997777 100644 --- a/src/test/run-pass/struct-partial-move-1.rs +++ b/src/test/ui/run-pass/structs-enums/struct-partial-move-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] pub struct Partial { x: T, y: T } diff --git a/src/test/run-pass/struct-partial-move-2.rs b/src/test/ui/run-pass/structs-enums/struct-partial-move-2.rs similarity index 99% rename from src/test/run-pass/struct-partial-move-2.rs rename to src/test/ui/run-pass/structs-enums/struct-partial-move-2.rs index b9c697c71eaa..c8a9527cc96e 100644 --- a/src/test/run-pass/struct-partial-move-2.rs +++ b/src/test/ui/run-pass/structs-enums/struct-partial-move-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] pub struct Partial { x: T, y: T } diff --git a/src/test/run-pass/struct-path-associated-type.rs b/src/test/ui/run-pass/structs-enums/struct-path-associated-type.rs similarity index 98% rename from src/test/run-pass/struct-path-associated-type.rs rename to src/test/ui/run-pass/structs-enums/struct-path-associated-type.rs index b033ed5c8021..868be1341217 100644 --- a/src/test/run-pass/struct-path-associated-type.rs +++ b/src/test/ui/run-pass/structs-enums/struct-path-associated-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct S { a: T, b: U, diff --git a/src/test/run-pass/struct-path-self.rs b/src/test/ui/run-pass/structs-enums/struct-path-self.rs similarity index 99% rename from src/test/run-pass/struct-path-self.rs rename to src/test/ui/run-pass/structs-enums/struct-path-self.rs index c7a282c2a2fa..9163569f9c1e 100644 --- a/src/test/run-pass/struct-path-self.rs +++ b/src/test/ui/run-pass/structs-enums/struct-path-self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::Add; struct S { diff --git a/src/test/run-pass/struct-pattern-matching.rs b/src/test/ui/run-pass/structs-enums/struct-pattern-matching.rs similarity index 92% rename from src/test/run-pass/struct-pattern-matching.rs rename to src/test/ui/run-pass/structs-enums/struct-pattern-matching.rs index 9c3ce54f3691..c6f769706a6d 100644 --- a/src/test/run-pass/struct-pattern-matching.rs +++ b/src/test/ui/run-pass/structs-enums/struct-pattern-matching.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_shorthand_field_patterns)] + struct Foo { x: isize, y: isize, diff --git a/src/test/run-pass/struct-return.rs b/src/test/ui/run-pass/structs-enums/struct-return.rs similarity index 99% rename from src/test/run-pass/struct-return.rs rename to src/test/ui/run-pass/structs-enums/struct-return.rs index 61a2bcb3a9b7..a2b380c7e18e 100644 --- a/src/test/run-pass/struct-return.rs +++ b/src/test/ui/run-pass/structs-enums/struct-return.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-wasm32-bare no libc to test ffi with #[repr(C)] diff --git a/src/test/run-pass/struct-variant-field-visibility.rs b/src/test/ui/run-pass/structs-enums/struct-variant-field-visibility.rs similarity index 98% rename from src/test/run-pass/struct-variant-field-visibility.rs rename to src/test/ui/run-pass/structs-enums/struct-variant-field-visibility.rs index b6e7846e96d0..4b7854145f00 100644 --- a/src/test/run-pass/struct-variant-field-visibility.rs +++ b/src/test/ui/run-pass/structs-enums/struct-variant-field-visibility.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 mod foo { diff --git a/src/test/run-pass/struct_variant_xc.rs b/src/test/ui/run-pass/structs-enums/struct_variant_xc.rs similarity index 98% rename from src/test/run-pass/struct_variant_xc.rs rename to src/test/ui/run-pass/structs-enums/struct_variant_xc.rs index 602650e4e06a..82881f6b348b 100644 --- a/src/test/run-pass/struct_variant_xc.rs +++ b/src/test/ui/run-pass/structs-enums/struct_variant_xc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:struct_variant_xc_aux.rs // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/struct_variant_xc_match.rs b/src/test/ui/run-pass/structs-enums/struct_variant_xc_match.rs similarity index 98% rename from src/test/run-pass/struct_variant_xc_match.rs rename to src/test/ui/run-pass/structs-enums/struct_variant_xc_match.rs index 3ceb65bcfdeb..55b3b1018e9d 100644 --- a/src/test/run-pass/struct_variant_xc_match.rs +++ b/src/test/ui/run-pass/structs-enums/struct_variant_xc_match.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:struct_variant_xc_aux.rs extern crate struct_variant_xc_aux; diff --git a/src/test/run-pass/tag-align-dyn-u64.rs b/src/test/ui/run-pass/structs-enums/tag-align-dyn-u64.rs similarity index 96% rename from src/test/run-pass/tag-align-dyn-u64.rs rename to src/test/ui/run-pass/structs-enums/tag-align-dyn-u64.rs index aaac1869af54..a7f7841fac84 100644 --- a/src/test/run-pass/tag-align-dyn-u64.rs +++ b/src/test/ui/run-pass/structs-enums/tag-align-dyn-u64.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] use std::mem; diff --git a/src/test/run-pass/tag-align-dyn-variants.rs b/src/test/ui/run-pass/structs-enums/tag-align-dyn-variants.rs similarity index 97% rename from src/test/run-pass/tag-align-dyn-variants.rs rename to src/test/ui/run-pass/structs-enums/tag-align-dyn-variants.rs index 1c3fb209e35a..cbba62d156bc 100644 --- a/src/test/run-pass/tag-align-dyn-variants.rs +++ b/src/test/ui/run-pass/structs-enums/tag-align-dyn-variants.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] +#![allow(non_snake_case)] use std::mem; diff --git a/src/test/run-pass/tag-align-shape.rs b/src/test/ui/run-pass/structs-enums/tag-align-shape.rs similarity index 94% rename from src/test/run-pass/tag-align-shape.rs rename to src/test/ui/run-pass/structs-enums/tag-align-shape.rs index 5db886c815b2..1aff17f77d40 100644 --- a/src/test/run-pass/tag-align-shape.rs +++ b/src/test/ui/run-pass/structs-enums/tag-align-shape.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #[derive(Debug)] enum a_tag { a_tag_var(u64) diff --git a/src/test/run-pass/tag-align-u64.rs b/src/test/ui/run-pass/structs-enums/tag-align-u64.rs similarity index 96% rename from src/test/run-pass/tag-align-u64.rs rename to src/test/ui/run-pass/structs-enums/tag-align-u64.rs index 43485a5bfcb6..9f6349a23ada 100644 --- a/src/test/run-pass/tag-align-u64.rs +++ b/src/test/ui/run-pass/structs-enums/tag-align-u64.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(deprecated)] use std::mem; diff --git a/src/test/run-pass/tag-disr-val-shape.rs b/src/test/ui/run-pass/structs-enums/tag-disr-val-shape.rs similarity index 95% rename from src/test/run-pass/tag-disr-val-shape.rs rename to src/test/ui/run-pass/structs-enums/tag-disr-val-shape.rs index fba3f9fb0d02..bfc3213a040c 100644 --- a/src/test/run-pass/tag-disr-val-shape.rs +++ b/src/test/ui/run-pass/structs-enums/tag-disr-val-shape.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #[derive(Debug)] enum color { red = 0xff0000, diff --git a/src/test/run-pass/tag-exports.rs b/src/test/ui/run-pass/structs-enums/tag-exports.rs similarity index 95% rename from src/test/run-pass/tag-exports.rs rename to src/test/ui/run-pass/structs-enums/tag-exports.rs index d797fd2e54f4..d0eea7bdcd24 100644 --- a/src/test/run-pass/tag-exports.rs +++ b/src/test/ui/run-pass/structs-enums/tag-exports.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/tag-in-block.rs b/src/test/ui/run-pass/structs-enums/tag-in-block.rs similarity index 93% rename from src/test/run-pass/tag-in-block.rs rename to src/test/ui/run-pass/structs-enums/tag-in-block.rs index f1a820c8d816..db9b2c3b60cc 100644 --- a/src/test/run-pass/tag-in-block.rs +++ b/src/test/ui/run-pass/structs-enums/tag-in-block.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/tag-variant-disr-type-mismatch.rs b/src/test/ui/run-pass/structs-enums/tag-variant-disr-type-mismatch.rs similarity index 92% rename from src/test/run-pass/tag-variant-disr-type-mismatch.rs rename to src/test/ui/run-pass/structs-enums/tag-variant-disr-type-mismatch.rs index d31eacc99769..085d0bc1fdce 100644 --- a/src/test/run-pass/tag-variant-disr-type-mismatch.rs +++ b/src/test/ui/run-pass/structs-enums/tag-variant-disr-type-mismatch.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 enum color { diff --git a/src/test/run-pass/tag-variant-disr-val.rs b/src/test/ui/run-pass/structs-enums/tag-variant-disr-val.rs similarity index 98% rename from src/test/run-pass/tag-variant-disr-val.rs rename to src/test/ui/run-pass/structs-enums/tag-variant-disr-val.rs index 9a2b3b1ff001..9f82faad1581 100644 --- a/src/test/run-pass/tag-variant-disr-val.rs +++ b/src/test/ui/run-pass/structs-enums/tag-variant-disr-val.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + use color::{red, green, blue, black, white, imaginary, purple, orange}; #[derive(Copy, Clone)] diff --git a/src/test/run-pass/tag.rs b/src/test/ui/run-pass/structs-enums/tag.rs similarity index 96% rename from src/test/run-pass/tag.rs rename to src/test/ui/run-pass/structs-enums/tag.rs index e3cfceb0d426..bd28320ffb67 100644 --- a/src/test/run-pass/tag.rs +++ b/src/test/ui/run-pass/structs-enums/tag.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] enum colour { red(isize, isize), green, } diff --git a/src/test/run-pass/tuple-struct-construct.rs b/src/test/ui/run-pass/structs-enums/tuple-struct-construct.rs similarity index 97% rename from src/test/run-pass/tuple-struct-construct.rs rename to src/test/ui/run-pass/structs-enums/tuple-struct-construct.rs index c40adf2260dd..58bed9d6b935 100644 --- a/src/test/run-pass/tuple-struct-construct.rs +++ b/src/test/ui/run-pass/structs-enums/tuple-struct-construct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(Debug)] struct Foo(isize, isize); diff --git a/src/test/run-pass/tuple-struct-constructor-pointer.rs b/src/test/ui/run-pass/structs-enums/tuple-struct-constructor-pointer.rs similarity index 98% rename from src/test/run-pass/tuple-struct-constructor-pointer.rs rename to src/test/ui/run-pass/structs-enums/tuple-struct-constructor-pointer.rs index 90cf94666ded..a4b5e41fdf54 100644 --- a/src/test/run-pass/tuple-struct-constructor-pointer.rs +++ b/src/test/ui/run-pass/structs-enums/tuple-struct-constructor-pointer.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #[derive(PartialEq, Debug)] struct Foo(isize); #[derive(PartialEq, Debug)] diff --git a/src/test/run-pass/tuple-struct-destructuring.rs b/src/test/ui/run-pass/structs-enums/tuple-struct-destructuring.rs similarity index 98% rename from src/test/run-pass/tuple-struct-destructuring.rs rename to src/test/ui/run-pass/structs-enums/tuple-struct-destructuring.rs index 4b0eb26cf948..cf2940e796f9 100644 --- a/src/test/run-pass/tuple-struct-destructuring.rs +++ b/src/test/ui/run-pass/structs-enums/tuple-struct-destructuring.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo(isize, isize); pub fn main() { diff --git a/src/test/run-pass/tuple-struct-matching.rs b/src/test/ui/run-pass/structs-enums/tuple-struct-matching.rs similarity index 98% rename from src/test/run-pass/tuple-struct-matching.rs rename to src/test/ui/run-pass/structs-enums/tuple-struct-matching.rs index b37302fce083..95ade509c0e6 100644 --- a/src/test/run-pass/tuple-struct-matching.rs +++ b/src/test/ui/run-pass/structs-enums/tuple-struct-matching.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo(isize, isize); pub fn main() { diff --git a/src/test/run-pass/tuple-struct-trivial.rs b/src/test/ui/run-pass/structs-enums/tuple-struct-trivial.rs similarity index 97% rename from src/test/run-pass/tuple-struct-trivial.rs rename to src/test/ui/run-pass/structs-enums/tuple-struct-trivial.rs index fa2c9768fcb5..d77d9c7e163b 100644 --- a/src/test/run-pass/tuple-struct-trivial.rs +++ b/src/test/ui/run-pass/structs-enums/tuple-struct-trivial.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Foo(isize, isize, isize); diff --git a/src/test/run-pass/uninstantiable-struct.rs b/src/test/ui/run-pass/structs-enums/uninstantiable-struct.rs similarity index 97% rename from src/test/run-pass/uninstantiable-struct.rs rename to src/test/ui/run-pass/structs-enums/uninstantiable-struct.rs index d97401715765..8706333c7436 100644 --- a/src/test/run-pass/uninstantiable-struct.rs +++ b/src/test/ui/run-pass/structs-enums/uninstantiable-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub struct Z(&'static Z); pub fn main() {} diff --git a/src/test/run-pass/unit-like-struct-drop-run.rs b/src/test/ui/run-pass/structs-enums/unit-like-struct-drop-run.rs similarity index 98% rename from src/test/run-pass/unit-like-struct-drop-run.rs rename to src/test/ui/run-pass/structs-enums/unit-like-struct-drop-run.rs index ec37be9420db..1e1605b7be68 100644 --- a/src/test/run-pass/unit-like-struct-drop-run.rs +++ b/src/test/ui/run-pass/structs-enums/unit-like-struct-drop-run.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support // Make sure the destructor is run for unit-like structs. diff --git a/src/test/run-pass/unit-like-struct.rs b/src/test/ui/run-pass/structs-enums/unit-like-struct.rs similarity index 97% rename from src/test/run-pass/unit-like-struct.rs rename to src/test/ui/run-pass/structs-enums/unit-like-struct.rs index 849b5810c5f1..1a2a4fbbf5f7 100644 --- a/src/test/run-pass/unit-like-struct.rs +++ b/src/test/ui/run-pass/structs-enums/unit-like-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo; pub fn main() { diff --git a/src/test/run-pass/variant-structs-trivial.rs b/src/test/ui/run-pass/structs-enums/variant-structs-trivial.rs similarity index 97% rename from src/test/run-pass/variant-structs-trivial.rs rename to src/test/ui/run-pass/structs-enums/variant-structs-trivial.rs index 6961cd4977d9..9cef1c834760 100644 --- a/src/test/run-pass/variant-structs-trivial.rs +++ b/src/test/ui/run-pass/structs-enums/variant-structs-trivial.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 enum Foo { diff --git a/src/test/run-pass/thinlto/all-crates.rs b/src/test/ui/run-pass/thinlto/all-crates.rs similarity index 97% rename from src/test/run-pass/thinlto/all-crates.rs rename to src/test/ui/run-pass/thinlto/all-crates.rs index 8d68202d7117..c10b5cc96d65 100644 --- a/src/test/run-pass/thinlto/all-crates.rs +++ b/src/test/ui/run-pass/thinlto/all-crates.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // compile-flags: -Clto=thin // no-prefer-dynamic diff --git a/src/test/run-pass/thinlto/auxiliary/dylib.rs b/src/test/ui/run-pass/thinlto/auxiliary/dylib.rs similarity index 100% rename from src/test/run-pass/thinlto/auxiliary/dylib.rs rename to src/test/ui/run-pass/thinlto/auxiliary/dylib.rs diff --git a/src/test/run-pass/thinlto/auxiliary/msvc-imp-present.rs b/src/test/ui/run-pass/thinlto/auxiliary/msvc-imp-present.rs similarity index 100% rename from src/test/run-pass/thinlto/auxiliary/msvc-imp-present.rs rename to src/test/ui/run-pass/thinlto/auxiliary/msvc-imp-present.rs diff --git a/src/test/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs b/src/test/ui/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs similarity index 100% rename from src/test/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs rename to src/test/ui/run-pass/thinlto/auxiliary/thin-lto-inlines-aux.rs diff --git a/src/test/run-pass/thinlto/dylib-works.rs b/src/test/ui/run-pass/thinlto/dylib-works.rs similarity index 97% rename from src/test/run-pass/thinlto/dylib-works.rs rename to src/test/ui/run-pass/thinlto/dylib-works.rs index 06df40f61427..fc8c0db2e26b 100644 --- a/src/test/run-pass/thinlto/dylib-works.rs +++ b/src/test/ui/run-pass/thinlto/dylib-works.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:dylib.rs extern crate dylib; diff --git a/src/test/run-pass/thinlto/msvc-imp-present.rs b/src/test/ui/run-pass/thinlto/msvc-imp-present.rs similarity index 99% rename from src/test/run-pass/thinlto/msvc-imp-present.rs rename to src/test/ui/run-pass/thinlto/msvc-imp-present.rs index 95cff2a28620..47fc00c79a7e 100644 --- a/src/test/run-pass/thinlto/msvc-imp-present.rs +++ b/src/test/ui/run-pass/thinlto/msvc-imp-present.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:msvc-imp-present.rs // compile-flags: -Z thinlto -C codegen-units=8 // no-prefer-dynamic diff --git a/src/test/run-pass/thinlto/thin-lto-inlines.rs b/src/test/ui/run-pass/thinlto/thin-lto-inlines.rs similarity index 98% rename from src/test/run-pass/thinlto/thin-lto-inlines.rs rename to src/test/ui/run-pass/thinlto/thin-lto-inlines.rs index 41ca983af51c..68b9ab769857 100644 --- a/src/test/run-pass/thinlto/thin-lto-inlines.rs +++ b/src/test/ui/run-pass/thinlto/thin-lto-inlines.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // compile-flags: -Z thinlto -C codegen-units=8 -O // ignore-emscripten can't inspect instructions on emscripten diff --git a/src/test/run-pass/thinlto/thin-lto-inlines2.rs b/src/test/ui/run-pass/thinlto/thin-lto-inlines2.rs similarity index 98% rename from src/test/run-pass/thinlto/thin-lto-inlines2.rs rename to src/test/ui/run-pass/thinlto/thin-lto-inlines2.rs index 3c0e904662a3..84809b09785e 100644 --- a/src/test/run-pass/thinlto/thin-lto-inlines2.rs +++ b/src/test/ui/run-pass/thinlto/thin-lto-inlines2.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // compile-flags: -C codegen-units=8 -O -C lto=thin // aux-build:thin-lto-inlines-aux.rs // no-prefer-dynamic diff --git a/src/test/run-pass/thinlto/weak-works.rs b/src/test/ui/run-pass/thinlto/weak-works.rs similarity index 98% rename from src/test/run-pass/thinlto/weak-works.rs rename to src/test/ui/run-pass/thinlto/weak-works.rs index 0a1b7307a46f..51516ae87abd 100644 --- a/src/test/run-pass/thinlto/weak-works.rs +++ b/src/test/ui/run-pass/thinlto/weak-works.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // compile-flags: -C codegen-units=8 -Z thinlto // ignore-windows diff --git a/src/test/run-pass/auxiliary/thread-local-extern-static.rs b/src/test/ui/run-pass/threads-sendsync/auxiliary/thread-local-extern-static.rs similarity index 100% rename from src/test/run-pass/auxiliary/thread-local-extern-static.rs rename to src/test/ui/run-pass/threads-sendsync/auxiliary/thread-local-extern-static.rs diff --git a/src/test/run-pass/comm.rs b/src/test/ui/run-pass/threads-sendsync/comm.rs similarity index 98% rename from src/test/run-pass/comm.rs rename to src/test/ui/run-pass/threads-sendsync/comm.rs index 7c78cbdce085..7a8e27ca20b3 100644 --- a/src/test/run-pass/comm.rs +++ b/src/test/ui/run-pass/threads-sendsync/comm.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/send-is-not-static-par-for.rs b/src/test/ui/run-pass/threads-sendsync/send-is-not-static-par-for.rs similarity index 98% rename from src/test/run-pass/send-is-not-static-par-for.rs rename to src/test/ui/run-pass/threads-sendsync/send-is-not-static-par-for.rs index 356a3be3927e..00a7acfa94fd 100644 --- a/src/test/run-pass/send-is-not-static-par-for.rs +++ b/src/test/ui/run-pass/threads-sendsync/send-is-not-static-par-for.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::thread; use std::sync::Mutex; diff --git a/src/test/run-pass/send-resource.rs b/src/test/ui/run-pass/threads-sendsync/send-resource.rs similarity index 95% rename from src/test/run-pass/send-resource.rs rename to src/test/ui/run-pass/threads-sendsync/send-resource.rs index 59332d6b65e8..be671084c84f 100644 --- a/src/test/run-pass/send-resource.rs +++ b/src/test/ui/run-pass/threads-sendsync/send-resource.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 // ignore-emscripten no threads support diff --git a/src/test/run-pass/send-type-inference.rs b/src/test/ui/run-pass/threads-sendsync/send-type-inference.rs similarity index 98% rename from src/test/run-pass/send-type-inference.rs rename to src/test/ui/run-pass/threads-sendsync/send-type-inference.rs index 84d491d05240..e1aaf6d220ee 100644 --- a/src/test/run-pass/send-type-inference.rs +++ b/src/test/ui/run-pass/threads-sendsync/send-type-inference.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::sync::mpsc::{channel, Sender}; diff --git a/src/test/run-pass/send_str_hashmap.rs b/src/test/ui/run-pass/threads-sendsync/send_str_hashmap.rs similarity index 99% rename from src/test/run-pass/send_str_hashmap.rs rename to src/test/ui/run-pass/threads-sendsync/send_str_hashmap.rs index 2ff2d5a8aa52..9c165a2b83da 100644 --- a/src/test/run-pass/send_str_hashmap.rs +++ b/src/test/ui/run-pass/threads-sendsync/send_str_hashmap.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::HashMap; use std::borrow::Cow; diff --git a/src/test/run-pass/send_str_treemap.rs b/src/test/ui/run-pass/threads-sendsync/send_str_treemap.rs similarity index 99% rename from src/test/run-pass/send_str_treemap.rs rename to src/test/ui/run-pass/threads-sendsync/send_str_treemap.rs index 3178dc945988..94fa7d94a187 100644 --- a/src/test/run-pass/send_str_treemap.rs +++ b/src/test/ui/run-pass/threads-sendsync/send_str_treemap.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::BTreeMap; use std::borrow::Cow; diff --git a/src/test/run-pass/sendable-class.rs b/src/test/ui/run-pass/threads-sendsync/sendable-class.rs similarity index 94% rename from src/test/run-pass/sendable-class.rs rename to src/test/ui/run-pass/threads-sendsync/sendable-class.rs index 4fb1c32952f8..2e82a278f3d3 100644 --- a/src/test/run-pass/sendable-class.rs +++ b/src/test/ui/run-pass/threads-sendsync/sendable-class.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // Test that a class with only sendable fields can be sent // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/sendfn-is-a-block.rs b/src/test/ui/run-pass/threads-sendsync/sendfn-is-a-block.rs similarity index 98% rename from src/test/run-pass/sendfn-is-a-block.rs rename to src/test/ui/run-pass/threads-sendsync/sendfn-is-a-block.rs index 162b05f0bb3f..55144a7d3866 100644 --- a/src/test/run-pass/sendfn-is-a-block.rs +++ b/src/test/ui/run-pass/threads-sendsync/sendfn-is-a-block.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass fn test(f: F) -> usize where F: FnOnce(usize) -> usize { diff --git a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs b/src/test/ui/run-pass/threads-sendsync/sendfn-spawn-with-fn-arg.rs similarity index 98% rename from src/test/run-pass/sendfn-spawn-with-fn-arg.rs rename to src/test/ui/run-pass/threads-sendsync/sendfn-spawn-with-fn-arg.rs index ecd0bfb14407..24d54b8a0b67 100644 --- a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs +++ b/src/test/ui/run-pass/threads-sendsync/sendfn-spawn-with-fn-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support #![feature(box_syntax)] diff --git a/src/test/run-pass/spawn-fn.rs b/src/test/ui/run-pass/threads-sendsync/spawn-fn.rs similarity index 98% rename from src/test/run-pass/spawn-fn.rs rename to src/test/ui/run-pass/threads-sendsync/spawn-fn.rs index 751d833ff9c8..39fbba043613 100644 --- a/src/test/run-pass/spawn-fn.rs +++ b/src/test/ui/run-pass/threads-sendsync/spawn-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/spawn-types.rs b/src/test/ui/run-pass/threads-sendsync/spawn-types.rs similarity index 95% rename from src/test/run-pass/spawn-types.rs rename to src/test/ui/run-pass/threads-sendsync/spawn-types.rs index cab190d025f8..f7abb984b68f 100644 --- a/src/test/run-pass/spawn-types.rs +++ b/src/test/ui/run-pass/threads-sendsync/spawn-types.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // ignore-emscripten no threads support /* diff --git a/src/test/run-pass/spawn.rs b/src/test/ui/run-pass/threads-sendsync/spawn.rs similarity index 98% rename from src/test/run-pass/spawn.rs rename to src/test/ui/run-pass/threads-sendsync/spawn.rs index c9a030cf053c..7aa459a895bb 100644 --- a/src/test/run-pass/spawn.rs +++ b/src/test/ui/run-pass/threads-sendsync/spawn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/spawn2.rs b/src/test/ui/run-pass/threads-sendsync/spawn2.rs similarity index 99% rename from src/test/run-pass/spawn2.rs rename to src/test/ui/run-pass/threads-sendsync/spawn2.rs index 2a5fab8a2092..549360b851cd 100644 --- a/src/test/run-pass/spawn2.rs +++ b/src/test/ui/run-pass/threads-sendsync/spawn2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/spawning-with-debug.rs b/src/test/ui/run-pass/threads-sendsync/spawning-with-debug.rs similarity index 98% rename from src/test/run-pass/spawning-with-debug.rs rename to src/test/ui/run-pass/threads-sendsync/spawning-with-debug.rs index c09ddf529666..e582cff43abf 100644 --- a/src/test/run-pass/spawning-with-debug.rs +++ b/src/test/ui/run-pass/threads-sendsync/spawning-with-debug.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-windows // exec-env:RUST_LOG=debug // ignore-emscripten no threads support diff --git a/src/test/run-pass/std-sync-right-kind-impls.rs b/src/test/ui/run-pass/threads-sendsync/std-sync-right-kind-impls.rs similarity index 98% rename from src/test/run-pass/std-sync-right-kind-impls.rs rename to src/test/ui/run-pass/threads-sendsync/std-sync-right-kind-impls.rs index 1ad04493528b..e5658683a8e5 100644 --- a/src/test/run-pass/std-sync-right-kind-impls.rs +++ b/src/test/ui/run-pass/threads-sendsync/std-sync-right-kind-impls.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 use std::sync; diff --git a/src/test/run-pass/sync-send-atomics.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-atomics.rs similarity index 98% rename from src/test/run-pass/sync-send-atomics.rs rename to src/test/ui/run-pass/threads-sendsync/sync-send-atomics.rs index 1ead6268d0c2..53b19db5d486 100644 --- a/src/test/run-pass/sync-send-atomics.rs +++ b/src/test/ui/run-pass/threads-sendsync/sync-send-atomics.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // pretty-expanded FIXME #23616 use std::sync::atomic::*; diff --git a/src/test/run-pass/sync-send-in-std.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs similarity index 98% rename from src/test/run-pass/sync-send-in-std.rs rename to src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs index 335a9c0d8bed..93f1bc48b0d4 100644 --- a/src/test/run-pass/sync-send-in-std.rs +++ b/src/test/ui/run-pass/threads-sendsync/sync-send-in-std.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // ignore-cloudabi networking not available // ignore-wasm32-bare networking not available diff --git a/src/test/run-pass/sync-send-iterators-in-libcollections.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs similarity index 99% rename from src/test/run-pass/sync-send-iterators-in-libcollections.rs rename to src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs index e9584e12b2e3..b62f6c4cc6d3 100644 --- a/src/test/run-pass/sync-send-iterators-in-libcollections.rs +++ b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcollections.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![allow(warnings)] #![feature(drain, collections_bound, btree_range)] diff --git a/src/test/run-pass/sync-send-iterators-in-libcore.rs b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs similarity index 99% rename from src/test/run-pass/sync-send-iterators-in-libcore.rs rename to src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs index 55269a286663..e95014d829df 100644 --- a/src/test/run-pass/sync-send-iterators-in-libcore.rs +++ b/src/test/ui/run-pass/threads-sendsync/sync-send-iterators-in-libcore.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(warnings)] diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-0.rs similarity index 98% rename from src/test/run-pass/task-comm-0.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-0.rs index 01e6d4cf7dee..1626b23fdc2f 100644 --- a/src/test/run-pass/task-comm-0.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-0.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-1.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-1.rs similarity index 98% rename from src/test/run-pass/task-comm-1.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-1.rs index 3295e68ac4e3..975789e8cd25 100644 --- a/src/test/run-pass/task-comm-1.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-10.rs similarity index 98% rename from src/test/run-pass/task-comm-10.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-10.rs index a69bba82ff0c..cbb225200934 100644 --- a/src/test/run-pass/task-comm-10.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-10.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-11.rs similarity index 98% rename from src/test/run-pass/task-comm-11.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-11.rs index c7beeb53850e..28710116dc32 100644 --- a/src/test/run-pass/task-comm-11.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-11.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 // ignore-emscripten no threads support diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-12.rs similarity index 98% rename from src/test/run-pass/task-comm-12.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-12.rs index 23594cebf318..e6195bf011b7 100644 --- a/src/test/run-pass/task-comm-12.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-12.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-13.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-13.rs similarity index 98% rename from src/test/run-pass/task-comm-13.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-13.rs index b48299703769..2276fd8031fc 100644 --- a/src/test/run-pass/task-comm-13.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-13.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::sync::mpsc::{channel, Sender}; diff --git a/src/test/run-pass/task-comm-14.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-14.rs similarity index 99% rename from src/test/run-pass/task-comm-14.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-14.rs index a03ff8719bba..f6a96a84eb69 100644 --- a/src/test/run-pass/task-comm-14.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-14.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::sync::mpsc::{channel, Sender}; diff --git a/src/test/run-pass/task-comm-15.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-15.rs similarity index 98% rename from src/test/run-pass/task-comm-15.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-15.rs index fc5a891d1d66..0398b55720d4 100644 --- a/src/test/run-pass/task-comm-15.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-15.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/task-comm-16.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-16.rs similarity index 98% rename from src/test/run-pass/task-comm-16.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-16.rs index 0caf21ead396..d98766f91941 100644 --- a/src/test/run-pass/task-comm-16.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-16.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + use std::sync::mpsc::channel; use std::cmp; diff --git a/src/test/run-pass/task-comm-17.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-17.rs similarity index 98% rename from src/test/run-pass/task-comm-17.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-17.rs index ca6f5c164ed3..53a233da820a 100644 --- a/src/test/run-pass/task-comm-17.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-17.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-3.rs similarity index 99% rename from src/test/run-pass/task-comm-3.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-3.rs index 8d2d3afc7877..d18ed1c567ca 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-4.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-4.rs similarity index 98% rename from src/test/run-pass/task-comm-4.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-4.rs index e70a00591d6c..47cbf8ec98a2 100644 --- a/src/test/run-pass/task-comm-4.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-4.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![allow(dead_assignment)] +// run-pass use std::sync::mpsc::channel; diff --git a/src/test/run-pass/task-comm-5.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-5.rs similarity index 98% rename from src/test/run-pass/task-comm-5.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-5.rs index cd5cb677d460..29f5a5d3f27a 100644 --- a/src/test/run-pass/task-comm-5.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-5.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::sync::mpsc::channel; diff --git a/src/test/run-pass/task-comm-6.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-6.rs similarity index 98% rename from src/test/run-pass/task-comm-6.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-6.rs index b8b5773ade54..83eb36728ef5 100644 --- a/src/test/run-pass/task-comm-6.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-6.rs @@ -8,8 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. - -#![allow(dead_assignment)] +// run-pass use std::sync::mpsc::channel; diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-7.rs similarity index 98% rename from src/test/run-pass/task-comm-7.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-7.rs index 7ab267ea66c1..6bf1bad07c1c 100644 --- a/src/test/run-pass/task-comm-7.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-7.rs @@ -8,10 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support -#![allow(dead_assignment)] - use std::sync::mpsc::{channel, Sender}; use std::thread; diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-9.rs similarity index 99% rename from src/test/run-pass/task-comm-9.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-9.rs index 1f0eebf1f715..f23a15945075 100644 --- a/src/test/run-pass/task-comm-9.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-9.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/task-comm-chan-nil.rs b/src/test/ui/run-pass/threads-sendsync/task-comm-chan-nil.rs similarity index 98% rename from src/test/run-pass/task-comm-chan-nil.rs rename to src/test/ui/run-pass/threads-sendsync/task-comm-chan-nil.rs index 3b9ec4216915..d13415a68cac 100644 --- a/src/test/run-pass/task-comm-chan-nil.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-comm-chan-nil.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::sync::mpsc::channel; diff --git a/src/test/run-pass/task-life-0.rs b/src/test/ui/run-pass/threads-sendsync/task-life-0.rs similarity index 98% rename from src/test/run-pass/task-life-0.rs rename to src/test/ui/run-pass/threads-sendsync/task-life-0.rs index 34ea43ca8279..8ec7c871c683 100644 --- a/src/test/run-pass/task-life-0.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-life-0.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/task-spawn-move-and-copy.rs b/src/test/ui/run-pass/threads-sendsync/task-spawn-move-and-copy.rs similarity index 98% rename from src/test/run-pass/task-spawn-move-and-copy.rs rename to src/test/ui/run-pass/threads-sendsync/task-spawn-move-and-copy.rs index 94b69a1c3e47..65e2236f2e11 100644 --- a/src/test/run-pass/task-spawn-move-and-copy.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-spawn-move-and-copy.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support #![feature(box_syntax)] diff --git a/src/test/run-pass/task-stderr.rs b/src/test/ui/run-pass/threads-sendsync/task-stderr.rs similarity index 99% rename from src/test/run-pass/task-stderr.rs rename to src/test/ui/run-pass/threads-sendsync/task-stderr.rs index 13d5cc989e94..e72809b68b07 100644 --- a/src/test/run-pass/task-stderr.rs +++ b/src/test/ui/run-pass/threads-sendsync/task-stderr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support #![feature(box_syntax, set_stdio)] diff --git a/src/test/run-pass/thread-local-extern-static.rs b/src/test/ui/run-pass/threads-sendsync/thread-local-extern-static.rs similarity index 98% rename from src/test/run-pass/thread-local-extern-static.rs rename to src/test/ui/run-pass/threads-sendsync/thread-local-extern-static.rs index 09c8b64776c7..01c0235c55d4 100644 --- a/src/test/run-pass/thread-local-extern-static.rs +++ b/src/test/ui/run-pass/threads-sendsync/thread-local-extern-static.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-windows // aux-build:thread-local-extern-static.rs diff --git a/src/test/run-pass/thread-local-syntax.rs b/src/test/ui/run-pass/threads-sendsync/thread-local-syntax.rs similarity index 98% rename from src/test/run-pass/thread-local-syntax.rs rename to src/test/ui/run-pass/threads-sendsync/thread-local-syntax.rs index 373824122fd5..522a736ce5ac 100644 --- a/src/test/run-pass/thread-local-syntax.rs +++ b/src/test/ui/run-pass/threads-sendsync/thread-local-syntax.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![deny(missing_docs)] //! this tests the syntax of `thread_local!` diff --git a/src/test/run-pass/threads.rs b/src/test/ui/run-pass/threads-sendsync/threads.rs similarity index 98% rename from src/test/run-pass/threads.rs rename to src/test/ui/run-pass/threads-sendsync/threads.rs index f193598975aa..7be239e29fb8 100644 --- a/src/test/run-pass/threads.rs +++ b/src/test/ui/run-pass/threads-sendsync/threads.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support use std::thread; diff --git a/src/test/run-pass/tls-dtors-are-run-in-a-static-binary.rs b/src/test/ui/run-pass/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs similarity index 98% rename from src/test/run-pass/tls-dtors-are-run-in-a-static-binary.rs rename to src/test/ui/run-pass/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs index 82e586196e37..e60a2c8a0119 100644 --- a/src/test/run-pass/tls-dtors-are-run-in-a-static-binary.rs +++ b/src/test/ui/run-pass/threads-sendsync/tls-dtors-are-run-in-a-static-binary.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // no-prefer-dynamic // ignore-emscripten no threads support diff --git a/src/test/run-pass/tls-init-on-init.rs b/src/test/ui/run-pass/threads-sendsync/tls-init-on-init.rs similarity index 97% rename from src/test/run-pass/tls-init-on-init.rs rename to src/test/ui/run-pass/threads-sendsync/tls-init-on-init.rs index 48a0d4a99ecc..5b6afe784827 100644 --- a/src/test/run-pass/tls-init-on-init.rs +++ b/src/test/ui/run-pass/threads-sendsync/tls-init-on-init.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // ignore-emscripten no threads support #![feature(thread_local_try_with)] diff --git a/src/test/run-pass/tls-try-with.rs b/src/test/ui/run-pass/threads-sendsync/tls-try-with.rs similarity index 96% rename from src/test/run-pass/tls-try-with.rs rename to src/test/ui/run-pass/threads-sendsync/tls-try-with.rs index 552f4c5e829e..f1fcef8e4b95 100644 --- a/src/test/run-pass/tls-try-with.rs +++ b/src/test/ui/run-pass/threads-sendsync/tls-try-with.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(stable_features)] + // ignore-emscripten no threads support #![feature(thread_local_try_with)] diff --git a/src/test/run-pass/anon-trait-static-method.rs b/src/test/ui/run-pass/traits/anon-trait-static-method.rs similarity index 98% rename from src/test/run-pass/anon-trait-static-method.rs rename to src/test/ui/run-pass/traits/anon-trait-static-method.rs index 5889bfce3c47..94779e7c5da7 100644 --- a/src/test/run-pass/anon-trait-static-method.rs +++ b/src/test/ui/run-pass/traits/anon-trait-static-method.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo { x: isize } diff --git a/src/test/run-pass/anon_trait_static_method_exe.rs b/src/test/ui/run-pass/traits/anon_trait_static_method_exe.rs similarity index 93% rename from src/test/run-pass/anon_trait_static_method_exe.rs rename to src/test/ui/run-pass/traits/anon_trait_static_method_exe.rs index f420460a4124..958c1094e4f7 100644 --- a/src/test/run-pass/anon_trait_static_method_exe.rs +++ b/src/test/ui/run-pass/traits/anon_trait_static_method_exe.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // aux-build:anon_trait_static_method_lib.rs extern crate anon_trait_static_method_lib; diff --git a/src/test/run-pass/assignability-trait.rs b/src/test/ui/run-pass/traits/assignability-trait.rs similarity index 97% rename from src/test/run-pass/assignability-trait.rs rename to src/test/ui/run-pass/traits/assignability-trait.rs index bc95d96a8cc9..f90c7b95dcf5 100644 --- a/src/test/run-pass/assignability-trait.rs +++ b/src/test/ui/run-pass/traits/assignability-trait.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // Tests that type assignability is used to search for instances when // making method calls, but only if there aren't any matches without // it. diff --git a/src/test/run-pass/astconv-cycle-between-trait-and-type.rs b/src/test/ui/run-pass/traits/astconv-cycle-between-trait-and-type.rs similarity index 98% rename from src/test/run-pass/astconv-cycle-between-trait-and-type.rs rename to src/test/ui/run-pass/traits/astconv-cycle-between-trait-and-type.rs index ef2dc48fe136..0eabded76277 100644 --- a/src/test/run-pass/astconv-cycle-between-trait-and-type.rs +++ b/src/test/ui/run-pass/traits/astconv-cycle-between-trait-and-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to successfully compile a setup where a trait // (`Trait1`) references a struct (`SomeType`) which in turn // carries a predicate that references the trait (`u32 : Trait1`, diff --git a/src/test/run-pass/augmented-assignments-trait.rs b/src/test/ui/run-pass/traits/augmented-assignments-trait.rs similarity index 98% rename from src/test/run-pass/augmented-assignments-trait.rs rename to src/test/ui/run-pass/traits/augmented-assignments-trait.rs index f1cb2c56dbcf..af308a6efed7 100644 --- a/src/test/run-pass/augmented-assignments-trait.rs +++ b/src/test/ui/run-pass/traits/augmented-assignments-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::AddAssign; struct Int(i32); diff --git a/src/test/run-pass/auto-traits.rs b/src/test/ui/run-pass/traits/auto-traits.rs similarity index 98% rename from src/test/run-pass/auto-traits.rs rename to src/test/ui/run-pass/traits/auto-traits.rs index 2a18b402bc64..79c2108ba833 100644 --- a/src/test/run-pass/auto-traits.rs +++ b/src/test/ui/run-pass/traits/auto-traits.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(optin_builtin_traits)] auto trait Auto {} diff --git a/src/test/ui/run-pass/traits/auxiliary/anon_trait_static_method_lib.rs b/src/test/ui/run-pass/traits/auxiliary/anon_trait_static_method_lib.rs new file mode 100644 index 000000000000..9d93d9689e73 --- /dev/null +++ b/src/test/ui/run-pass/traits/auxiliary/anon_trait_static_method_lib.rs @@ -0,0 +1,19 @@ +// Copyright 2012 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +pub struct Foo { + pub x: isize +} + +impl Foo { + pub fn new() -> Foo { + Foo { x: 3 } + } +} diff --git a/src/test/run-pass/specialization/auxiliary/go_trait.rs b/src/test/ui/run-pass/traits/auxiliary/go_trait.rs similarity index 100% rename from src/test/run-pass/specialization/auxiliary/go_trait.rs rename to src/test/ui/run-pass/traits/auxiliary/go_trait.rs diff --git a/src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs b/src/test/ui/run-pass/traits/auxiliary/trait_default_method_xc_aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/trait_default_method_xc_aux.rs rename to src/test/ui/run-pass/traits/auxiliary/trait_default_method_xc_aux.rs diff --git a/src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs b/src/test/ui/run-pass/traits/auxiliary/trait_default_method_xc_aux_2.rs similarity index 100% rename from src/test/run-pass/auxiliary/trait_default_method_xc_aux_2.rs rename to src/test/ui/run-pass/traits/auxiliary/trait_default_method_xc_aux_2.rs diff --git a/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs b/src/test/ui/run-pass/traits/auxiliary/trait_inheritance_auto_xc_2_aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/trait_inheritance_auto_xc_2_aux.rs rename to src/test/ui/run-pass/traits/auxiliary/trait_inheritance_auto_xc_2_aux.rs diff --git a/src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs b/src/test/ui/run-pass/traits/auxiliary/trait_inheritance_auto_xc_aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/trait_inheritance_auto_xc_aux.rs rename to src/test/ui/run-pass/traits/auxiliary/trait_inheritance_auto_xc_aux.rs diff --git a/src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs b/src/test/ui/run-pass/traits/auxiliary/trait_inheritance_overloading_xc.rs similarity index 100% rename from src/test/run-pass/auxiliary/trait_inheritance_overloading_xc.rs rename to src/test/ui/run-pass/traits/auxiliary/trait_inheritance_overloading_xc.rs diff --git a/src/test/run-pass/auxiliary/trait_safety_lib.rs b/src/test/ui/run-pass/traits/auxiliary/trait_safety_lib.rs similarity index 100% rename from src/test/run-pass/auxiliary/trait_safety_lib.rs rename to src/test/ui/run-pass/traits/auxiliary/trait_safety_lib.rs diff --git a/src/test/run-pass/auxiliary/trait_xc_call_aux.rs b/src/test/ui/run-pass/traits/auxiliary/trait_xc_call_aux.rs similarity index 100% rename from src/test/run-pass/auxiliary/trait_xc_call_aux.rs rename to src/test/ui/run-pass/traits/auxiliary/trait_xc_call_aux.rs diff --git a/src/test/run-pass/auxiliary/traitimpl.rs b/src/test/ui/run-pass/traits/auxiliary/traitimpl.rs similarity index 100% rename from src/test/run-pass/auxiliary/traitimpl.rs rename to src/test/ui/run-pass/traits/auxiliary/traitimpl.rs diff --git a/src/test/run-pass/conservative_impl_trait.rs b/src/test/ui/run-pass/traits/conservative_impl_trait.rs similarity index 97% rename from src/test/run-pass/conservative_impl_trait.rs rename to src/test/ui/run-pass/traits/conservative_impl_trait.rs index 14e1ca612c08..b6abeb916a9e 100644 --- a/src/test/run-pass/conservative_impl_trait.rs +++ b/src/test/ui/run-pass/traits/conservative_impl_trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // #39665 fn batches(n: &u32) -> impl Iterator { diff --git a/src/test/run-pass/cycle-trait-type-trait.rs b/src/test/ui/run-pass/traits/cycle-trait-type-trait.rs similarity index 98% rename from src/test/run-pass/cycle-trait-type-trait.rs rename to src/test/ui/run-pass/traits/cycle-trait-type-trait.rs index 4ae5c599b43d..c19583980054 100644 --- a/src/test/run-pass/cycle-trait-type-trait.rs +++ b/src/test/ui/run-pass/traits/cycle-trait-type-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test a case where a supertrait references a type that references // the original trait. This poses no problem at the moment. diff --git a/src/test/run-pass/default-method-supertrait-vtable.rs b/src/test/ui/run-pass/traits/default-method-supertrait-vtable.rs similarity index 98% rename from src/test/run-pass/default-method-supertrait-vtable.rs rename to src/test/ui/run-pass/traits/default-method-supertrait-vtable.rs index 0d45a5d52124..57eb410c9ad6 100644 --- a/src/test/run-pass/default-method-supertrait-vtable.rs +++ b/src/test/ui/run-pass/traits/default-method-supertrait-vtable.rs @@ -7,7 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass // Tests that we can call a function bounded over a supertrait from diff --git a/src/test/run-pass/dyn-trait.rs b/src/test/ui/run-pass/traits/dyn-trait.rs similarity index 98% rename from src/test/run-pass/dyn-trait.rs rename to src/test/ui/run-pass/traits/dyn-trait.rs index 010667942424..0ef6b9fd1479 100644 --- a/src/test/run-pass/dyn-trait.rs +++ b/src/test/ui/run-pass/traits/dyn-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-pretty `dyn ::foo` parses differently in the current edition use std::fmt::Display; diff --git a/src/test/run-pass/fmt-pointer-trait.rs b/src/test/ui/run-pass/traits/fmt-pointer-trait.rs similarity index 98% rename from src/test/run-pass/fmt-pointer-trait.rs rename to src/test/ui/run-pass/traits/fmt-pointer-trait.rs index 4ecb9da4eb9c..66ec8fc44a41 100644 --- a/src/test/run-pass/fmt-pointer-trait.rs +++ b/src/test/ui/run-pass/traits/fmt-pointer-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ptr; use std::rc::Rc; use std::sync::Arc; diff --git a/src/test/run-pass/impl-implicit-trait.rs b/src/test/ui/run-pass/traits/impl-implicit-trait.rs similarity index 94% rename from src/test/run-pass/impl-implicit-trait.rs rename to src/test/ui/run-pass/traits/impl-implicit-trait.rs index 7f1d576e0994..76cfaf2c68ef 100644 --- a/src/test/run-pass/impl-implicit-trait.rs +++ b/src/test/ui/run-pass/traits/impl-implicit-trait.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 enum option_ { diff --git a/src/test/run-pass/impl-inherent-prefer-over-trait.rs b/src/test/ui/run-pass/traits/impl-inherent-prefer-over-trait.rs similarity index 98% rename from src/test/run-pass/impl-inherent-prefer-over-trait.rs rename to src/test/ui/run-pass/traits/impl-inherent-prefer-over-trait.rs index f0195976aa83..505209ff3ae8 100644 --- a/src/test/run-pass/impl-inherent-prefer-over-trait.rs +++ b/src/test/ui/run-pass/traits/impl-inherent-prefer-over-trait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo; diff --git a/src/test/run-pass/infer-from-object-trait-issue-26952.rs b/src/test/ui/run-pass/traits/infer-from-object-trait-issue-26952.rs similarity index 98% rename from src/test/run-pass/infer-from-object-trait-issue-26952.rs rename to src/test/ui/run-pass/traits/infer-from-object-trait-issue-26952.rs index d5ca90c1a28c..d53619d0c9d0 100644 --- a/src/test/run-pass/infer-from-object-trait-issue-26952.rs +++ b/src/test/ui/run-pass/traits/infer-from-object-trait-issue-26952.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that when we match a trait reference like `Foo: Foo<_#0t>`, // we unify with `_#0t` with `A`. In this code, if we failed to do // that, then you get an unconstrained type-variable in `call`. diff --git a/src/test/run-pass/inherent-trait-method-order.rs b/src/test/ui/run-pass/traits/inherent-trait-method-order.rs similarity index 98% rename from src/test/run-pass/inherent-trait-method-order.rs rename to src/test/ui/run-pass/traits/inherent-trait-method-order.rs index 5489a61f7d0b..6b6dd5dcbbd2 100644 --- a/src/test/run-pass/inherent-trait-method-order.rs +++ b/src/test/ui/run-pass/traits/inherent-trait-method-order.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass struct Foo; diff --git a/src/test/run-pass/kindck-owned-trait-contains-1.rs b/src/test/ui/run-pass/traits/kindck-owned-trait-contains-1.rs similarity index 92% rename from src/test/run-pass/kindck-owned-trait-contains-1.rs rename to src/test/ui/run-pass/traits/kindck-owned-trait-contains-1.rs index 9b56666fd464..55cdeff8c9b2 100644 --- a/src/test/run-pass/kindck-owned-trait-contains-1.rs +++ b/src/test/ui/run-pass/traits/kindck-owned-trait-contains-1.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] +#![allow(non_camel_case_types)] + #![feature(box_syntax)] trait repeat { fn get(&self) -> A; } diff --git a/src/test/run-pass/multiple-trait-bounds.rs b/src/test/ui/run-pass/traits/multiple-trait-bounds.rs similarity index 97% rename from src/test/run-pass/multiple-trait-bounds.rs rename to src/test/ui/run-pass/traits/multiple-trait-bounds.rs index 2746205b637d..b49d24491674 100644 --- a/src/test/run-pass/multiple-trait-bounds.rs +++ b/src/test/ui/run-pass/traits/multiple-trait-bounds.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn f(_: T) { diff --git a/src/test/run-pass/object-one-type-two-traits.rs b/src/test/ui/run-pass/traits/object-one-type-two-traits.rs similarity index 98% rename from src/test/run-pass/object-one-type-two-traits.rs rename to src/test/ui/run-pass/traits/object-one-type-two-traits.rs index 284beccdb295..5a468e0d6449 100644 --- a/src/test/run-pass/object-one-type-two-traits.rs +++ b/src/test/ui/run-pass/traits/object-one-type-two-traits.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Testing creating two vtables with the same self type, but different // traits. diff --git a/src/test/run-pass/overlap-permitted-for-marker-traits-neg.rs b/src/test/ui/run-pass/traits/overlap-permitted-for-marker-traits-neg.rs similarity index 98% rename from src/test/run-pass/overlap-permitted-for-marker-traits-neg.rs rename to src/test/ui/run-pass/traits/overlap-permitted-for-marker-traits-neg.rs index 740d5d22ab50..d9a051ee02e0 100644 --- a/src/test/run-pass/overlap-permitted-for-marker-traits-neg.rs +++ b/src/test/ui/run-pass/traits/overlap-permitted-for-marker-traits-neg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(overlapping_marker_traits)] #![feature(optin_builtin_traits)] diff --git a/src/test/run-pass/overlap-permitted-for-marker-traits.rs b/src/test/ui/run-pass/traits/overlap-permitted-for-marker-traits.rs similarity index 98% rename from src/test/run-pass/overlap-permitted-for-marker-traits.rs rename to src/test/ui/run-pass/traits/overlap-permitted-for-marker-traits.rs index 11a46299d8c8..3f165daf65c4 100644 --- a/src/test/run-pass/overlap-permitted-for-marker-traits.rs +++ b/src/test/ui/run-pass/traits/overlap-permitted-for-marker-traits.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests for RFC 1268: we allow overlapping impls of marker traits, // that is, traits without items. In this case, a type `T` is // `MyMarker` if it is either `Debug` or `Display`. diff --git a/src/test/run-pass/parameterized-trait-with-bounds.rs b/src/test/ui/run-pass/traits/parameterized-trait-with-bounds.rs similarity index 98% rename from src/test/run-pass/parameterized-trait-with-bounds.rs rename to src/test/ui/run-pass/traits/parameterized-trait-with-bounds.rs index 3e74341d8198..d98f80066096 100644 --- a/src/test/run-pass/parameterized-trait-with-bounds.rs +++ b/src/test/ui/run-pass/traits/parameterized-trait-with-bounds.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![allow(dead_code)] diff --git a/src/test/run-pass/supertrait-default-generics.rs b/src/test/ui/run-pass/traits/supertrait-default-generics.rs similarity index 96% rename from src/test/run-pass/supertrait-default-generics.rs rename to src/test/ui/run-pass/traits/supertrait-default-generics.rs index 8351cc50fd82..c3c37d6b9c02 100644 --- a/src/test/run-pass/supertrait-default-generics.rs +++ b/src/test/ui/run-pass/traits/supertrait-default-generics.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // There is some other borrowck bug, so we make the stuff not mut. diff --git a/src/test/run-pass/syntax-trait-polarity.rs b/src/test/ui/run-pass/traits/syntax-trait-polarity.rs similarity index 98% rename from src/test/run-pass/syntax-trait-polarity.rs rename to src/test/ui/run-pass/traits/syntax-trait-polarity.rs index f69b857981d7..89b49b11f010 100644 --- a/src/test/run-pass/syntax-trait-polarity.rs +++ b/src/test/ui/run-pass/traits/syntax-trait-polarity.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(optin_builtin_traits)] diff --git a/src/test/run-pass/trait-bounds-basic.rs b/src/test/ui/run-pass/traits/trait-bounds-basic.rs similarity index 93% rename from src/test/run-pass/trait-bounds-basic.rs rename to src/test/ui/run-pass/traits/trait-bounds-basic.rs index 558e69664ecf..1a2621f76794 100644 --- a/src/test/run-pass/trait-bounds-basic.rs +++ b/src/test/ui/run-pass/traits/trait-bounds-basic.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(unconditional_recursion)] + // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/trait-bounds-impl-comparison-duplicates.rs b/src/test/ui/run-pass/traits/trait-bounds-impl-comparison-duplicates.rs similarity index 98% rename from src/test/run-pass/trait-bounds-impl-comparison-duplicates.rs rename to src/test/ui/run-pass/traits/trait-bounds-impl-comparison-duplicates.rs index 33bfbc396035..4ccb48915fc5 100644 --- a/src/test/run-pass/trait-bounds-impl-comparison-duplicates.rs +++ b/src/test/ui/run-pass/traits/trait-bounds-impl-comparison-duplicates.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that type parameter bounds on an implementation need not match the // trait exactly, as long as the implementation doesn't demand *more* bounds // than the trait. diff --git a/src/test/run-pass/trait-bounds-in-arc.rs b/src/test/ui/run-pass/traits/trait-bounds-in-arc.rs similarity index 99% rename from src/test/run-pass/trait-bounds-in-arc.rs rename to src/test/ui/run-pass/traits/trait-bounds-in-arc.rs index 7b57d66ef21f..35210be34781 100644 --- a/src/test/run-pass/trait-bounds-in-arc.rs +++ b/src/test/ui/run-pass/traits/trait-bounds-in-arc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that a heterogeneous list of existential types can be put inside an Arc // and shared between threads as long as all types fulfill Send. diff --git a/src/test/run-pass/trait-bounds-on-structs-and-enums.rs b/src/test/ui/run-pass/traits/trait-bounds-on-structs-and-enums.rs similarity index 98% rename from src/test/run-pass/trait-bounds-on-structs-and-enums.rs rename to src/test/ui/run-pass/traits/trait-bounds-on-structs-and-enums.rs index 6f088e15b353..1b32c51aa85d 100644 --- a/src/test/run-pass/trait-bounds-on-structs-and-enums.rs +++ b/src/test/ui/run-pass/traits/trait-bounds-on-structs-and-enums.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait U {} diff --git a/src/test/run-pass/trait-bounds-recursion.rs b/src/test/ui/run-pass/traits/trait-bounds-recursion.rs similarity index 98% rename from src/test/run-pass/trait-bounds-recursion.rs rename to src/test/ui/run-pass/traits/trait-bounds-recursion.rs index d984e9cdc990..3cdd7311332d 100644 --- a/src/test/run-pass/trait-bounds-recursion.rs +++ b/src/test/ui/run-pass/traits/trait-bounds-recursion.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait I { fn i(&self) -> Self; } diff --git a/src/test/run-pass/trait-bounds.rs b/src/test/ui/run-pass/traits/trait-bounds.rs similarity index 93% rename from src/test/run-pass/trait-bounds.rs rename to src/test/ui/run-pass/traits/trait-bounds.rs index d501fef122cc..3c433b58a3a9 100644 --- a/src/test/run-pass/trait-bounds.rs +++ b/src/test/ui/run-pass/traits/trait-bounds.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_snake_case)] trait connection { fn read(&self) -> isize; diff --git a/src/test/run-pass/trait-cache-issue-18209.rs b/src/test/ui/run-pass/traits/trait-cache-issue-18209.rs similarity index 98% rename from src/test/run-pass/trait-cache-issue-18209.rs rename to src/test/ui/run-pass/traits/trait-cache-issue-18209.rs index 9cc2b2fadc60..14452b009cf5 100644 --- a/src/test/run-pass/trait-cache-issue-18209.rs +++ b/src/test/ui/run-pass/traits/trait-cache-issue-18209.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the cache results from the default method do not pollute // the cache for the later call in `load()`. // diff --git a/src/test/run-pass/trait-coercion-generic.rs b/src/test/ui/run-pass/traits/trait-coercion-generic.rs similarity index 98% rename from src/test/run-pass/trait-coercion-generic.rs rename to src/test/ui/run-pass/traits/trait-coercion-generic.rs index 40453262ddf3..2b64bb005e92 100644 --- a/src/test/run-pass/trait-coercion-generic.rs +++ b/src/test/ui/run-pass/traits/trait-coercion-generic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Trait { fn f(&self, x: T); } diff --git a/src/test/run-pass/trait-coercion.rs b/src/test/ui/run-pass/traits/trait-coercion.rs similarity index 98% rename from src/test/run-pass/trait-coercion.rs rename to src/test/ui/run-pass/traits/trait-coercion.rs index 130c6ee7521b..18fc122439bc 100644 --- a/src/test/run-pass/trait-coercion.rs +++ b/src/test/ui/run-pass/traits/trait-coercion.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] use std::io::{self, Write}; diff --git a/src/test/run-pass/trait-composition-trivial.rs b/src/test/ui/run-pass/traits/trait-composition-trivial.rs similarity index 98% rename from src/test/run-pass/trait-composition-trivial.rs rename to src/test/ui/run-pass/traits/trait-composition-trivial.rs index 4138413c5b55..c491beda2700 100644 --- a/src/test/run-pass/trait-composition-trivial.rs +++ b/src/test/ui/run-pass/traits/trait-composition-trivial.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Foo { diff --git a/src/test/run-pass/trait-copy-guessing.rs b/src/test/ui/run-pass/traits/trait-copy-guessing.rs similarity index 99% rename from src/test/run-pass/trait-copy-guessing.rs rename to src/test/ui/run-pass/traits/trait-copy-guessing.rs index 71cd3c9441e1..2d2ea50a1fd5 100644 --- a/src/test/run-pass/trait-copy-guessing.rs +++ b/src/test/ui/run-pass/traits/trait-copy-guessing.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // "guessing" in trait selection can affect `copy_or_move`. Check that this // is correctly handled. I am not sure what is the "correct" behaviour, // but we should at least not ICE. diff --git a/src/test/run-pass/trait-default-method-bound-subst.rs b/src/test/ui/run-pass/traits/trait-default-method-bound-subst.rs similarity index 98% rename from src/test/run-pass/trait-default-method-bound-subst.rs rename to src/test/ui/run-pass/traits/trait-default-method-bound-subst.rs index b9936bcadd48..9a0e53340f6f 100644 --- a/src/test/run-pass/trait-default-method-bound-subst.rs +++ b/src/test/ui/run-pass/traits/trait-default-method-bound-subst.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait A { diff --git a/src/test/run-pass/trait-default-method-bound-subst2.rs b/src/test/ui/run-pass/traits/trait-default-method-bound-subst2.rs similarity index 98% rename from src/test/run-pass/trait-default-method-bound-subst2.rs rename to src/test/ui/run-pass/traits/trait-default-method-bound-subst2.rs index 92b9449461ba..9139a26d295f 100644 --- a/src/test/run-pass/trait-default-method-bound-subst2.rs +++ b/src/test/ui/run-pass/traits/trait-default-method-bound-subst2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait A { diff --git a/src/test/run-pass/trait-default-method-bound-subst3.rs b/src/test/ui/run-pass/traits/trait-default-method-bound-subst3.rs similarity index 98% rename from src/test/run-pass/trait-default-method-bound-subst3.rs rename to src/test/ui/run-pass/traits/trait-default-method-bound-subst3.rs index af7e8830332b..f7445372fbee 100644 --- a/src/test/run-pass/trait-default-method-bound-subst3.rs +++ b/src/test/ui/run-pass/traits/trait-default-method-bound-subst3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait A { diff --git a/src/test/run-pass/trait-default-method-bound-subst4.rs b/src/test/ui/run-pass/traits/trait-default-method-bound-subst4.rs similarity index 98% rename from src/test/run-pass/trait-default-method-bound-subst4.rs rename to src/test/ui/run-pass/traits/trait-default-method-bound-subst4.rs index 581a54e57f49..70c440c76658 100644 --- a/src/test/run-pass/trait-default-method-bound-subst4.rs +++ b/src/test/ui/run-pass/traits/trait-default-method-bound-subst4.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait A { diff --git a/src/test/run-pass/trait-default-method-bound.rs b/src/test/ui/run-pass/traits/trait-default-method-bound.rs similarity index 98% rename from src/test/run-pass/trait-default-method-bound.rs rename to src/test/ui/run-pass/traits/trait-default-method-bound.rs index e0ea9651f613..6291be02110d 100644 --- a/src/test/run-pass/trait-default-method-bound.rs +++ b/src/test/ui/run-pass/traits/trait-default-method-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait A { diff --git a/src/test/run-pass/trait-default-method-xc-2.rs b/src/test/ui/run-pass/traits/trait-default-method-xc-2.rs similarity index 98% rename from src/test/run-pass/trait-default-method-xc-2.rs rename to src/test/ui/run-pass/traits/trait-default-method-xc-2.rs index 833063d2a2d0..c0e27fa87571 100644 --- a/src/test/run-pass/trait-default-method-xc-2.rs +++ b/src/test/ui/run-pass/traits/trait-default-method-xc-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:trait_default_method_xc_aux.rs // aux-build:trait_default_method_xc_aux_2.rs diff --git a/src/test/run-pass/trait-default-method-xc.rs b/src/test/ui/run-pass/traits/trait-default-method-xc.rs similarity index 97% rename from src/test/run-pass/trait-default-method-xc.rs rename to src/test/ui/run-pass/traits/trait-default-method-xc.rs index 72e3fb256ca8..426b3e2ad794 100644 --- a/src/test/run-pass/trait-default-method-xc.rs +++ b/src/test/ui/run-pass/traits/trait-default-method-xc.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // aux-build:trait_default_method_xc_aux.rs diff --git a/src/test/run-pass/trait-false-ambiguity-where-clause-builtin-bound.rs b/src/test/ui/run-pass/traits/trait-false-ambiguity-where-clause-builtin-bound.rs similarity index 98% rename from src/test/run-pass/trait-false-ambiguity-where-clause-builtin-bound.rs rename to src/test/ui/run-pass/traits/trait-false-ambiguity-where-clause-builtin-bound.rs index b9ca8971d389..753141bcf21a 100644 --- a/src/test/run-pass/trait-false-ambiguity-where-clause-builtin-bound.rs +++ b/src/test/ui/run-pass/traits/trait-false-ambiguity-where-clause-builtin-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we do not error out because of a (False) ambiguity // between the builtin rules for Sized and the where clause. Issue // #20959. diff --git a/src/test/run-pass/trait-generic.rs b/src/test/ui/run-pass/traits/trait-generic.rs similarity index 97% rename from src/test/run-pass/trait-generic.rs rename to src/test/ui/run-pass/traits/trait-generic.rs index eadda5dfe299..a230ad03de8d 100644 --- a/src/test/run-pass/trait-generic.rs +++ b/src/test/ui/run-pass/traits/trait-generic.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] diff --git a/src/test/run-pass/trait-impl-2.rs b/src/test/ui/run-pass/traits/trait-impl-2.rs similarity index 94% rename from src/test/run-pass/trait-impl-2.rs rename to src/test/ui/run-pass/traits/trait-impl-2.rs index c94b517f6a7d..8fadb09377f8 100644 --- a/src/test/run-pass/trait-impl-2.rs +++ b/src/test/ui/run-pass/traits/trait-impl-2.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // pretty-expanded FIXME #23616 pub mod Foo { diff --git a/src/test/run-pass/trait-impl.rs b/src/test/ui/run-pass/traits/trait-impl.rs similarity index 98% rename from src/test/run-pass/trait-impl.rs rename to src/test/ui/run-pass/traits/trait-impl.rs index e940f6c2126f..1ba766760923 100644 --- a/src/test/run-pass/trait-impl.rs +++ b/src/test/ui/run-pass/traits/trait-impl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test calling methods on an impl for a bare trait. // aux-build:traitimpl.rs diff --git a/src/test/run-pass/trait-inheritance-auto-xc-2.rs b/src/test/ui/run-pass/traits/trait-inheritance-auto-xc-2.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-auto-xc-2.rs rename to src/test/ui/run-pass/traits/trait-inheritance-auto-xc-2.rs index 270cf652ed7c..273a3f483326 100644 --- a/src/test/run-pass/trait-inheritance-auto-xc-2.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-auto-xc-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:trait_inheritance_auto_xc_2_aux.rs diff --git a/src/test/run-pass/trait-inheritance-auto-xc.rs b/src/test/ui/run-pass/traits/trait-inheritance-auto-xc.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-auto-xc.rs rename to src/test/ui/run-pass/traits/trait-inheritance-auto-xc.rs index eaca60c935a6..d6b3d900a090 100644 --- a/src/test/run-pass/trait-inheritance-auto-xc.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-auto-xc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:trait_inheritance_auto_xc_aux.rs diff --git a/src/test/run-pass/trait-inheritance-auto.rs b/src/test/ui/run-pass/traits/trait-inheritance-auto.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-auto.rs rename to src/test/ui/run-pass/traits/trait-inheritance-auto.rs index 75c48d517127..698f8ac23dde 100644 --- a/src/test/run-pass/trait-inheritance-auto.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-auto.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Testing that this impl turns A into a Quux, because // A is already a Foo Bar Baz diff --git a/src/test/run-pass/trait-inheritance-call-bound-inherited.rs b/src/test/ui/run-pass/traits/trait-inheritance-call-bound-inherited.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-call-bound-inherited.rs rename to src/test/ui/run-pass/traits/trait-inheritance-call-bound-inherited.rs index 2fb2b9274c69..566d59f460e0 100644 --- a/src/test/run-pass/trait-inheritance-call-bound-inherited.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-call-bound-inherited.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { fn f(&self) -> isize; } trait Bar : Foo { fn g(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs b/src/test/ui/run-pass/traits/trait-inheritance-call-bound-inherited2.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-call-bound-inherited2.rs rename to src/test/ui/run-pass/traits/trait-inheritance-call-bound-inherited2.rs index 87dc04f1c667..a769da5e2cb5 100644 --- a/src/test/run-pass/trait-inheritance-call-bound-inherited2.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-call-bound-inherited2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { fn f(&self) -> isize; } trait Bar : Foo { fn g(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs b/src/test/ui/run-pass/traits/trait-inheritance-cast-without-call-to-supertrait.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs rename to src/test/ui/run-pass/traits/trait-inheritance-cast-without-call-to-supertrait.rs index dd61dc0f9fb8..00d74ca07810 100644 --- a/src/test/run-pass/trait-inheritance-cast-without-call-to-supertrait.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-cast-without-call-to-supertrait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Testing that we can cast to a subtrait and call subtrait // methods. Not testing supertrait methods diff --git a/src/test/run-pass/trait-inheritance-cast.rs b/src/test/ui/run-pass/traits/trait-inheritance-cast.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-cast.rs rename to src/test/ui/run-pass/traits/trait-inheritance-cast.rs index 0de2c586930e..f2d1cb0cb3d0 100644 --- a/src/test/run-pass/trait-inheritance-cast.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-cast.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Testing that supertrait methods can be called on subtrait object types diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs b/src/test/ui/run-pass/traits/trait-inheritance-cross-trait-call-xc.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs rename to src/test/ui/run-pass/traits/trait-inheritance-cross-trait-call-xc.rs index 3e68bea57c66..2d4756cf925c 100644 --- a/src/test/run-pass/trait-inheritance-cross-trait-call-xc.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-cross-trait-call-xc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:trait_xc_call_aux.rs diff --git a/src/test/run-pass/trait-inheritance-cross-trait-call.rs b/src/test/ui/run-pass/traits/trait-inheritance-cross-trait-call.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-cross-trait-call.rs rename to src/test/ui/run-pass/traits/trait-inheritance-cross-trait-call.rs index 27b0f66603f8..3a57fc525b26 100644 --- a/src/test/run-pass/trait-inheritance-cross-trait-call.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-cross-trait-call.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { fn f(&self) -> isize; } trait Bar : Foo { fn g(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-diamond.rs b/src/test/ui/run-pass/traits/trait-inheritance-diamond.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-diamond.rs rename to src/test/ui/run-pass/traits/trait-inheritance-diamond.rs index 43151bb0f992..bf66d50d1592 100644 --- a/src/test/run-pass/trait-inheritance-diamond.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-diamond.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // B and C both require A, so D does as well, twice, but that's just fine diff --git a/src/test/run-pass/trait-inheritance-multiple-inheritors.rs b/src/test/ui/run-pass/traits/trait-inheritance-multiple-inheritors.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-multiple-inheritors.rs rename to src/test/ui/run-pass/traits/trait-inheritance-multiple-inheritors.rs index 8125ce20912e..b9a9795c6c0d 100644 --- a/src/test/run-pass/trait-inheritance-multiple-inheritors.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-multiple-inheritors.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait A { fn a(&self) -> isize; } trait B: A { fn b(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-multiple-params.rs b/src/test/ui/run-pass/traits/trait-inheritance-multiple-params.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-multiple-params.rs rename to src/test/ui/run-pass/traits/trait-inheritance-multiple-params.rs index c0f7a9d9c254..5e6aa85498c7 100644 --- a/src/test/run-pass/trait-inheritance-multiple-params.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-multiple-params.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait A { fn a(&self) -> isize; } trait B: A { fn b(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-num.rs b/src/test/ui/run-pass/traits/trait-inheritance-num.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-num.rs rename to src/test/ui/run-pass/traits/trait-inheritance-num.rs index e5390ac8a625..9d4c9f431ddb 100644 --- a/src/test/run-pass/trait-inheritance-num.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-num.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub trait NumExt: PartialEq + PartialOrd {} diff --git a/src/test/run-pass/trait-inheritance-num0.rs b/src/test/ui/run-pass/traits/trait-inheritance-num0.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-num0.rs rename to src/test/ui/run-pass/traits/trait-inheritance-num0.rs index 9f5c7cf60360..0d57dee49a17 100644 --- a/src/test/run-pass/trait-inheritance-num0.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-num0.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Extending Num and using inherited static methods // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/trait-inheritance-num1.rs b/src/test/ui/run-pass/traits/trait-inheritance-num1.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-num1.rs rename to src/test/ui/run-pass/traits/trait-inheritance-num1.rs index e21abdae730b..e2a4f4154f9f 100644 --- a/src/test/run-pass/trait-inheritance-num1.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-num1.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub trait NumCast: Sized { diff --git a/src/test/run-pass/trait-inheritance-num2.rs b/src/test/ui/run-pass/traits/trait-inheritance-num2.rs similarity index 99% rename from src/test/run-pass/trait-inheritance-num2.rs rename to src/test/ui/run-pass/traits/trait-inheritance-num2.rs index 5f8541a6da1e..0b9e18c1d27c 100644 --- a/src/test/run-pass/trait-inheritance-num2.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-num2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A more complex example of numeric extensions pub trait TypeExt {} diff --git a/src/test/run-pass/trait-inheritance-num3.rs b/src/test/ui/run-pass/traits/trait-inheritance-num3.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-num3.rs rename to src/test/ui/run-pass/traits/trait-inheritance-num3.rs index fb56ae82b303..c86b2127a6d7 100644 --- a/src/test/run-pass/trait-inheritance-num3.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-num3.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait NumCast: Sized { fn from(i: i32) -> Option; } diff --git a/src/test/run-pass/trait-inheritance-num5.rs b/src/test/ui/run-pass/traits/trait-inheritance-num5.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-num5.rs rename to src/test/ui/run-pass/traits/trait-inheritance-num5.rs index bd442629243e..ff64f3933412 100644 --- a/src/test/run-pass/trait-inheritance-num5.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-num5.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 pub trait NumCast: Sized { diff --git a/src/test/run-pass/trait-inheritance-overloading-simple.rs b/src/test/ui/run-pass/traits/trait-inheritance-overloading-simple.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-overloading-simple.rs rename to src/test/ui/run-pass/traits/trait-inheritance-overloading-simple.rs index 9c1f585fe450..ff2f6b2d8250 100644 --- a/src/test/run-pass/trait-inheritance-overloading-simple.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-overloading-simple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::cmp::PartialEq; trait MyNum : PartialEq { } diff --git a/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs b/src/test/ui/run-pass/traits/trait-inheritance-overloading-xc-exe.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-overloading-xc-exe.rs rename to src/test/ui/run-pass/traits/trait-inheritance-overloading-xc-exe.rs index 21d6c53a465c..ff8009b1c781 100644 --- a/src/test/run-pass/trait-inheritance-overloading-xc-exe.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-overloading-xc-exe.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:trait_inheritance_overloading_xc.rs diff --git a/src/test/run-pass/trait-inheritance-overloading.rs b/src/test/ui/run-pass/traits/trait-inheritance-overloading.rs similarity index 99% rename from src/test/run-pass/trait-inheritance-overloading.rs rename to src/test/ui/run-pass/traits/trait-inheritance-overloading.rs index b7d0400dd892..5c15ff579e32 100644 --- a/src/test/run-pass/trait-inheritance-overloading.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-overloading.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::cmp::PartialEq; use std::ops::{Add, Sub, Mul}; diff --git a/src/test/run-pass/trait-inheritance-self-in-supertype.rs b/src/test/ui/run-pass/traits/trait-inheritance-self-in-supertype.rs similarity index 99% rename from src/test/run-pass/trait-inheritance-self-in-supertype.rs rename to src/test/ui/run-pass/traits/trait-inheritance-self-in-supertype.rs index e353be16b45e..4274b5484297 100644 --- a/src/test/run-pass/trait-inheritance-self-in-supertype.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-self-in-supertype.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test for issue #4183: use of Self in supertraits. pub static FUZZY_EPSILON: f64 = 0.1; diff --git a/src/test/run-pass/trait-inheritance-self.rs b/src/test/ui/run-pass/traits/trait-inheritance-self.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-self.rs rename to src/test/ui/run-pass/traits/trait-inheritance-self.rs index a025be5d651b..f66273dd9010 100644 --- a/src/test/run-pass/trait-inheritance-self.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-self.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { fn f(&self, x: &T); } diff --git a/src/test/run-pass/trait-inheritance-simple.rs b/src/test/ui/run-pass/traits/trait-inheritance-simple.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-simple.rs rename to src/test/ui/run-pass/traits/trait-inheritance-simple.rs index 917e520339af..379a98cdebe5 100644 --- a/src/test/run-pass/trait-inheritance-simple.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-simple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { fn f(&self) -> isize; } trait Bar : Foo { fn g(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance-static.rs b/src/test/ui/run-pass/traits/trait-inheritance-static.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-static.rs rename to src/test/ui/run-pass/traits/trait-inheritance-static.rs index aae6b76087fe..561c0582ebc1 100644 --- a/src/test/run-pass/trait-inheritance-static.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-static.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait MyNum { fn from_int(_: isize) -> Self; diff --git a/src/test/run-pass/trait-inheritance-static2.rs b/src/test/ui/run-pass/traits/trait-inheritance-static2.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-static2.rs rename to src/test/ui/run-pass/traits/trait-inheritance-static2.rs index dd942fbfa08c..b98b7a1e2d97 100644 --- a/src/test/run-pass/trait-inheritance-static2.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-static2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait MyEq {} pub trait MyNum { diff --git a/src/test/run-pass/trait-inheritance-subst.rs b/src/test/ui/run-pass/traits/trait-inheritance-subst.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-subst.rs rename to src/test/ui/run-pass/traits/trait-inheritance-subst.rs index 73bb4bacf64e..02f417eb8fc0 100644 --- a/src/test/run-pass/trait-inheritance-subst.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-subst.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub trait Add { fn add(&self, rhs: &RHS) -> Result; diff --git a/src/test/run-pass/trait-inheritance-subst2.rs b/src/test/ui/run-pass/traits/trait-inheritance-subst2.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-subst2.rs rename to src/test/ui/run-pass/traits/trait-inheritance-subst2.rs index 7d3ebc19e8f8..3efe3e64edf9 100644 --- a/src/test/run-pass/trait-inheritance-subst2.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-subst2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Panda { fn chomp(&self, bamboo: &T) -> T; diff --git a/src/test/run-pass/trait-inheritance-visibility.rs b/src/test/ui/run-pass/traits/trait-inheritance-visibility.rs similarity index 98% rename from src/test/run-pass/trait-inheritance-visibility.rs rename to src/test/ui/run-pass/traits/trait-inheritance-visibility.rs index f00a4f2ecb6a..ea3e88f2f9a0 100644 --- a/src/test/run-pass/trait-inheritance-visibility.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance-visibility.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod traits { pub trait Foo { fn f(&self) -> isize; } diff --git a/src/test/run-pass/trait-inheritance2.rs b/src/test/ui/run-pass/traits/trait-inheritance2.rs similarity index 98% rename from src/test/run-pass/trait-inheritance2.rs rename to src/test/ui/run-pass/traits/trait-inheritance2.rs index 2161c0f894f4..01088d655378 100644 --- a/src/test/run-pass/trait-inheritance2.rs +++ b/src/test/ui/run-pass/traits/trait-inheritance2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { fn f(&self) -> isize; } trait Bar { fn g(&self) -> isize; } diff --git a/src/test/run-pass/trait-item-inside-macro.rs b/src/test/ui/run-pass/traits/trait-item-inside-macro.rs similarity index 98% rename from src/test/run-pass/trait-item-inside-macro.rs rename to src/test/ui/run-pass/traits/trait-item-inside-macro.rs index 7c13576120b4..a61afbba55f5 100644 --- a/src/test/run-pass/trait-item-inside-macro.rs +++ b/src/test/ui/run-pass/traits/trait-item-inside-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #34183 macro_rules! foo { diff --git a/src/test/run-pass/trait-object-auto-dedup.rs b/src/test/ui/run-pass/traits/trait-object-auto-dedup.rs similarity index 99% rename from src/test/run-pass/trait-object-auto-dedup.rs rename to src/test/ui/run-pass/traits/trait-object-auto-dedup.rs index 9f5845f6d77b..c33482e8a710 100644 --- a/src/test/run-pass/trait-object-auto-dedup.rs +++ b/src/test/ui/run-pass/traits/trait-object-auto-dedup.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that duplicate auto trait bounds in trait objects don't create new types. #[allow(unused_assignments)] diff --git a/src/test/run-pass/trait-object-exclusion.rs b/src/test/ui/run-pass/traits/trait-object-exclusion.rs similarity index 98% rename from src/test/run-pass/trait-object-exclusion.rs rename to src/test/ui/run-pass/traits/trait-object-exclusion.rs index 13b725b7c9ef..a48c7876967d 100644 --- a/src/test/run-pass/trait-object-exclusion.rs +++ b/src/test/ui/run-pass/traits/trait-object-exclusion.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Future: 'static { // The requirement for Self: Sized must prevent instantiation of // Future::forget in vtables, otherwise there's an infinite type diff --git a/src/test/run-pass/trait-object-generics.rs b/src/test/ui/run-pass/traits/trait-object-generics.rs similarity index 99% rename from src/test/run-pass/trait-object-generics.rs rename to src/test/ui/run-pass/traits/trait-object-generics.rs index 4b14ac2f76f6..b76717a28ffe 100644 --- a/src/test/run-pass/trait-object-generics.rs +++ b/src/test/ui/run-pass/traits/trait-object-generics.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // test for #8664 #![feature(box_syntax)] diff --git a/src/test/run-pass/trait-object-lifetime-first.rs b/src/test/ui/run-pass/traits/trait-object-lifetime-first.rs similarity index 98% rename from src/test/run-pass/trait-object-lifetime-first.rs rename to src/test/ui/run-pass/traits/trait-object-lifetime-first.rs index f269fe90d4b4..20df809c4ff5 100644 --- a/src/test/run-pass/trait-object-lifetime-first.rs +++ b/src/test/ui/run-pass/traits/trait-object-lifetime-first.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::fmt::Display; static BYTE: u8 = 33; diff --git a/src/test/run-pass/trait-object-with-lifetime-bound.rs b/src/test/ui/run-pass/traits/trait-object-with-lifetime-bound.rs similarity index 98% rename from src/test/run-pass/trait-object-with-lifetime-bound.rs rename to src/test/ui/run-pass/traits/trait-object-with-lifetime-bound.rs index 21b84221d06e..ffe666064618 100644 --- a/src/test/run-pass/trait-object-with-lifetime-bound.rs +++ b/src/test/ui/run-pass/traits/trait-object-with-lifetime-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Uncovered during work on new scoping rules for safe destructors // as an important use case to support properly. diff --git a/src/test/run-pass/trait-region-pointer-simple.rs b/src/test/ui/run-pass/traits/trait-region-pointer-simple.rs similarity index 98% rename from src/test/run-pass/trait-region-pointer-simple.rs rename to src/test/ui/run-pass/traits/trait-region-pointer-simple.rs index 95311e62e634..8f021d5b25ab 100644 --- a/src/test/run-pass/trait-region-pointer-simple.rs +++ b/src/test/ui/run-pass/traits/trait-region-pointer-simple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { fn f(&self) -> isize; } diff --git a/src/test/run-pass/trait-safety-ok-cc.rs b/src/test/ui/run-pass/traits/trait-safety-ok-cc.rs similarity index 98% rename from src/test/run-pass/trait-safety-ok-cc.rs rename to src/test/ui/run-pass/traits/trait-safety-ok-cc.rs index abbc556f34e4..d1b3dfec45e7 100644 --- a/src/test/run-pass/trait-safety-ok-cc.rs +++ b/src/test/ui/run-pass/traits/trait-safety-ok-cc.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:trait_safety_lib.rs // Simple smoke test that unsafe traits can be compiled across crates. diff --git a/src/test/run-pass/trait-safety-ok.rs b/src/test/ui/run-pass/traits/trait-safety-ok.rs similarity index 98% rename from src/test/run-pass/trait-safety-ok.rs rename to src/test/ui/run-pass/traits/trait-safety-ok.rs index 0ccc6cd152df..2787d56164ab 100644 --- a/src/test/run-pass/trait-safety-ok.rs +++ b/src/test/ui/run-pass/traits/trait-safety-ok.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Simple smoke test that unsafe traits can be compiled etc. diff --git a/src/test/run-pass/trait-static-method-overwriting.rs b/src/test/ui/run-pass/traits/trait-static-method-overwriting.rs similarity index 98% rename from src/test/run-pass/trait-static-method-overwriting.rs rename to src/test/ui/run-pass/traits/trait-static-method-overwriting.rs index 31968da6ee31..25307e822ffd 100644 --- a/src/test/run-pass/trait-static-method-overwriting.rs +++ b/src/test/ui/run-pass/traits/trait-static-method-overwriting.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass mod base { pub trait HasNew { fn new() -> Self; diff --git a/src/test/run-pass/trait-to-str.rs b/src/test/ui/run-pass/traits/trait-to-str.rs similarity index 96% rename from src/test/run-pass/trait-to-str.rs rename to src/test/ui/run-pass/traits/trait-to-str.rs index 9671e31d7e48..3fbb7aadde4b 100644 --- a/src/test/run-pass/trait-to-str.rs +++ b/src/test/ui/run-pass/traits/trait-to-str.rs @@ -7,7 +7,9 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass +#![allow(non_camel_case_types)] trait to_str { diff --git a/src/test/run-pass/trait-where-clause-vs-impl.rs b/src/test/ui/run-pass/traits/trait-where-clause-vs-impl.rs similarity index 99% rename from src/test/run-pass/trait-where-clause-vs-impl.rs rename to src/test/ui/run-pass/traits/trait-where-clause-vs-impl.rs index f3dcb51f97a2..3a732aabbf74 100644 --- a/src/test/run-pass/trait-where-clause-vs-impl.rs +++ b/src/test/ui/run-pass/traits/trait-where-clause-vs-impl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that when there is a conditional (but blanket) impl and a // where clause, we don't get confused in trait resolution. // diff --git a/src/test/run-pass/trait-with-bounds-default.rs b/src/test/ui/run-pass/traits/trait-with-bounds-default.rs similarity index 98% rename from src/test/run-pass/trait-with-bounds-default.rs rename to src/test/ui/run-pass/traits/trait-with-bounds-default.rs index 6b0faa2207b2..97fc58d4e545 100644 --- a/src/test/run-pass/trait-with-bounds-default.rs +++ b/src/test/ui/run-pass/traits/trait-with-bounds-default.rs @@ -7,7 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass pub trait Clone2 { /// Returns a copy of the value. The contents of boxes diff --git a/src/test/run-pass/traits-assoc-type-in-supertrait.rs b/src/test/ui/run-pass/traits/traits-assoc-type-in-supertrait.rs similarity index 98% rename from src/test/run-pass/traits-assoc-type-in-supertrait.rs rename to src/test/ui/run-pass/traits/traits-assoc-type-in-supertrait.rs index 5cecacafc74b..2da403008187 100644 --- a/src/test/run-pass/traits-assoc-type-in-supertrait.rs +++ b/src/test/ui/run-pass/traits/traits-assoc-type-in-supertrait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test case where an associated type is referenced from within the // supertrait definition. Issue #20220. diff --git a/src/test/run-pass/traits-conditional-dispatch.rs b/src/test/ui/run-pass/traits/traits-conditional-dispatch.rs similarity index 99% rename from src/test/run-pass/traits-conditional-dispatch.rs rename to src/test/ui/run-pass/traits/traits-conditional-dispatch.rs index 53457d85e016..e24249ec1849 100644 --- a/src/test/run-pass/traits-conditional-dispatch.rs +++ b/src/test/ui/run-pass/traits/traits-conditional-dispatch.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to resolve conditional dispatch. Here, the // blanket impl for T:Copy coexists with an impl for Box, because // Box does not impl Copy. diff --git a/src/test/run-pass/traits-conditional-model-fn.rs b/src/test/ui/run-pass/traits/traits-conditional-model-fn.rs similarity index 99% rename from src/test/run-pass/traits-conditional-model-fn.rs rename to src/test/ui/run-pass/traits/traits-conditional-model-fn.rs index d19f7143ed22..cc5ce571a4e1 100644 --- a/src/test/run-pass/traits-conditional-model-fn.rs +++ b/src/test/ui/run-pass/traits/traits-conditional-model-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A model for how the `Fn` traits could work. You can implement at // most one of `Go`, `GoMut`, or `GoOnce`, and then the others follow // automatically. diff --git a/src/test/run-pass/traits-default-method-macro.rs b/src/test/ui/run-pass/traits/traits-default-method-macro.rs similarity index 98% rename from src/test/run-pass/traits-default-method-macro.rs rename to src/test/ui/run-pass/traits/traits-default-method-macro.rs index 193038d9e50f..12d057f207dc 100644 --- a/src/test/run-pass/traits-default-method-macro.rs +++ b/src/test/ui/run-pass/traits/traits-default-method-macro.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Foo { diff --git a/src/test/run-pass/traits-default-method-mut.rs b/src/test/ui/run-pass/traits/traits-default-method-mut.rs similarity index 95% rename from src/test/run-pass/traits-default-method-mut.rs rename to src/test/ui/run-pass/traits/traits-default-method-mut.rs index bcdadb1d90d3..7cfdae9e652b 100644 --- a/src/test/run-pass/traits-default-method-mut.rs +++ b/src/test/ui/run-pass/traits/traits-default-method-mut.rs @@ -8,9 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 -#![allow(dead_assignment)] #![allow(unused_variables)] trait Foo { diff --git a/src/test/run-pass/traits-default-method-self.rs b/src/test/ui/run-pass/traits/traits-default-method-self.rs similarity index 98% rename from src/test/run-pass/traits-default-method-self.rs rename to src/test/ui/run-pass/traits/traits-default-method-self.rs index 36b0eb527b64..e5cea5ca9a58 100644 --- a/src/test/run-pass/traits-default-method-self.rs +++ b/src/test/ui/run-pass/traits/traits-default-method-self.rs @@ -7,7 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass trait Cat { diff --git a/src/test/run-pass/traits-default-method-trivial.rs b/src/test/ui/run-pass/traits/traits-default-method-trivial.rs similarity index 98% rename from src/test/run-pass/traits-default-method-trivial.rs rename to src/test/ui/run-pass/traits/traits-default-method-trivial.rs index a2e7f54bba65..314fbcfb40eb 100644 --- a/src/test/run-pass/traits-default-method-trivial.rs +++ b/src/test/ui/run-pass/traits/traits-default-method-trivial.rs @@ -7,7 +7,8 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass trait Cat { diff --git a/src/test/run-pass/traits-elaborate-type-region.rs b/src/test/ui/run-pass/traits/traits-elaborate-type-region.rs similarity index 99% rename from src/test/run-pass/traits-elaborate-type-region.rs rename to src/test/ui/run-pass/traits/traits-elaborate-type-region.rs index 4621c2ca4be2..c2689794b2f2 100644 --- a/src/test/run-pass/traits-elaborate-type-region.rs +++ b/src/test/ui/run-pass/traits/traits-elaborate-type-region.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(dead_code)] // Test that we elaborate `Type: 'region` constraints and infer various important things. diff --git a/src/test/run-pass/traits-impl-object-overlap-issue-23853.rs b/src/test/ui/run-pass/traits/traits-impl-object-overlap-issue-23853.rs similarity index 98% rename from src/test/run-pass/traits-impl-object-overlap-issue-23853.rs rename to src/test/ui/run-pass/traits/traits-impl-object-overlap-issue-23853.rs index b9b2b5061375..f33b5841d855 100644 --- a/src/test/run-pass/traits-impl-object-overlap-issue-23853.rs +++ b/src/test/ui/run-pass/traits/traits-impl-object-overlap-issue-23853.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to compile the case where both a blanket impl // and the object type itself supply the required trait obligation. // In this case, the blanket impl for `Foo` applies to any type, diff --git a/src/test/run-pass/traits-issue-22019.rs b/src/test/ui/run-pass/traits/traits-issue-22019.rs similarity index 99% rename from src/test/run-pass/traits-issue-22019.rs rename to src/test/ui/run-pass/traits/traits-issue-22019.rs index 2f3e0c64f6c1..a5da604aeb14 100644 --- a/src/test/run-pass/traits-issue-22019.rs +++ b/src/test/ui/run-pass/traits/traits-issue-22019.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test an issue where global caching was causing free regions from // distinct scopes to be compared (`'g` and `'h`). The only important // thing is that compilation succeeds here. diff --git a/src/test/run-pass/traits-issue-22110.rs b/src/test/ui/run-pass/traits/traits-issue-22110.rs similarity index 98% rename from src/test/run-pass/traits-issue-22110.rs rename to src/test/ui/run-pass/traits/traits-issue-22110.rs index 3da8c2539783..02a2589a4e8b 100644 --- a/src/test/run-pass/traits-issue-22110.rs +++ b/src/test/ui/run-pass/traits/traits-issue-22110.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test an issue where we reported ambiguity between the where-clause // and the blanket impl. The only important thing is that compilation // succeeds here. Issue #22110. diff --git a/src/test/run-pass/traits-issue-22655.rs b/src/test/ui/run-pass/traits/traits-issue-22655.rs similarity index 98% rename from src/test/run-pass/traits-issue-22655.rs rename to src/test/ui/run-pass/traits/traits-issue-22655.rs index ded17422c498..0e80d20ad451 100644 --- a/src/test/run-pass/traits-issue-22655.rs +++ b/src/test/ui/run-pass/traits/traits-issue-22655.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Regression test for issue #22655: This test should not lead to // infinite recursion. diff --git a/src/test/run-pass/traits-issue-23003.rs b/src/test/ui/run-pass/traits/traits-issue-23003.rs similarity index 98% rename from src/test/run-pass/traits-issue-23003.rs rename to src/test/ui/run-pass/traits/traits-issue-23003.rs index 46cd22f22baa..e77b038fc475 100644 --- a/src/test/run-pass/traits-issue-23003.rs +++ b/src/test/ui/run-pass/traits/traits-issue-23003.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test stack overflow triggered by evaluating the implications. To be // WF, the type `Receipt` would require that `::Cancel` be WF. This normalizes to `Receipt` diff --git a/src/test/run-pass/traits-issue-26339.rs b/src/test/ui/run-pass/traits/traits-issue-26339.rs similarity index 98% rename from src/test/run-pass/traits-issue-26339.rs rename to src/test/ui/run-pass/traits/traits-issue-26339.rs index f2cf1779d624..3176b5cb7f92 100644 --- a/src/test/run-pass/traits-issue-26339.rs +++ b/src/test/ui/run-pass/traits/traits-issue-26339.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the right implementation is called through a trait // object when supertraits include multiple references to the // same trait, with different type parameters. diff --git a/src/test/run-pass/traits-multidispatch-infer-convert-target.rs b/src/test/ui/run-pass/traits/traits-multidispatch-infer-convert-target.rs similarity index 98% rename from src/test/run-pass/traits-multidispatch-infer-convert-target.rs rename to src/test/ui/run-pass/traits/traits-multidispatch-infer-convert-target.rs index 6634c1ad0a22..22404849be61 100644 --- a/src/test/run-pass/traits-multidispatch-infer-convert-target.rs +++ b/src/test/ui/run-pass/traits/traits-multidispatch-infer-convert-target.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can infer the Target based on the Self or vice versa. diff --git a/src/test/run-pass/traits-negative-impls.rs b/src/test/ui/run-pass/traits/traits-negative-impls.rs similarity index 98% rename from src/test/run-pass/traits-negative-impls.rs rename to src/test/ui/run-pass/traits/traits-negative-impls.rs index 09c7d077705b..96c86f147ce2 100644 --- a/src/test/run-pass/traits-negative-impls.rs +++ b/src/test/ui/run-pass/traits/traits-negative-impls.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(optin_builtin_traits)] use std::marker::Send; diff --git a/src/test/run-pass/traits-repeated-supertrait.rs b/src/test/ui/run-pass/traits/traits-repeated-supertrait.rs similarity index 99% rename from src/test/run-pass/traits-repeated-supertrait.rs rename to src/test/ui/run-pass/traits/traits-repeated-supertrait.rs index b059945ef74e..4e70669ec96f 100644 --- a/src/test/run-pass/traits-repeated-supertrait.rs +++ b/src/test/ui/run-pass/traits/traits-repeated-supertrait.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test a case of a trait which extends the same supertrait twice, but // with difference type parameters. Test that we can invoke the // various methods in various ways successfully. diff --git a/src/test/run-pass/ufcs-trait-object.rs b/src/test/ui/run-pass/traits/ufcs-trait-object.rs similarity index 98% rename from src/test/run-pass/ufcs-trait-object.rs rename to src/test/ui/run-pass/traits/ufcs-trait-object.rs index 457beeb3f37a..06d3c5e93294 100644 --- a/src/test/run-pass/ufcs-trait-object.rs +++ b/src/test/ui/run-pass/traits/ufcs-trait-object.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that when you use ufcs form to invoke a trait method (on a // trait object) everything works fine. diff --git a/src/test/run-pass/use-trait-before-def.rs b/src/test/ui/run-pass/traits/use-trait-before-def.rs similarity index 93% rename from src/test/run-pass/use-trait-before-def.rs rename to src/test/ui/run-pass/traits/use-trait-before-def.rs index 38952334e4d5..4f107fb82422 100644 --- a/src/test/run-pass/use-trait-before-def.rs +++ b/src/test/ui/run-pass/traits/use-trait-before-def.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // Issue #1761 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs b/src/test/ui/run-pass/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs similarity index 100% rename from src/test/run-pass/auxiliary/unboxed-closures-cross-crate.rs rename to src/test/ui/run-pass/unboxed-closures/auxiliary/unboxed-closures-cross-crate.rs diff --git a/src/test/run-pass/unboxed-closures-all-traits.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-all-traits.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-all-traits.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-all-traits.rs index 201500d0c628..f317b835d10f 100644 --- a/src/test/run-pass/unboxed-closures-all-traits.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-all-traits.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(lang_items)] fn a isize>(f: F) -> isize { diff --git a/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-blanket-fn-mut.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-blanket-fn-mut.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-blanket-fn-mut.rs index 23ec0cb5f60f..eebd30a01f9f 100644 --- a/src/test/run-pass/unboxed-closures-blanket-fn-mut.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-blanket-fn-mut.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that you can supply `&F` where `F: FnMut()`. #![feature(lang_items)] diff --git a/src/test/run-pass/unboxed-closures-blanket-fn.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-blanket-fn.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-blanket-fn.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-blanket-fn.rs index 2aa48e7d2add..52a10869610c 100644 --- a/src/test/run-pass/unboxed-closures-blanket-fn.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-blanket-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that you can supply `&F` where `F: Fn()`. #![feature(lang_items)] diff --git a/src/test/run-pass/unboxed-closures-boxed.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-boxed.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-boxed.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-boxed.rs index 72d5a1dc0433..b0c40700bb3b 100644 --- a/src/test/run-pass/unboxed-closures-boxed.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-boxed.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] use std::ops::FnMut; diff --git a/src/test/run-pass/unboxed-closures-by-ref.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-by-ref.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-by-ref.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-by-ref.rs index b251215909a4..564986bbbca2 100644 --- a/src/test/run-pass/unboxed-closures-by-ref.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-by-ref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test by-ref capture of environment in unboxed closure types fn call_fn(f: F) { diff --git a/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-fn-autoderef.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-call-fn-autoderef.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-fn-autoderef.rs index 56c53bcafced..b178f0af909a 100644 --- a/src/test/run-pass/unboxed-closures-call-fn-autoderef.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-fn-autoderef.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the call operator autoderefs when calling a bounded type parameter. use std::ops::FnMut; diff --git a/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs index 63667ec11d66..ef1187a3ffba 100644 --- a/src/test/run-pass/unboxed-closures-call-sugar-autoderef.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-autoderef.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the call operator autoderefs when calling a bounded type parameter. use std::ops::FnMut; diff --git a/src/test/run-pass/unboxed-closures-call-sugar-object-autoderef.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-call-sugar-object-autoderef.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs index f4453f1bb8ab..1e2495926b9e 100644 --- a/src/test/run-pass/unboxed-closures-call-sugar-object-autoderef.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-object-autoderef.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the call operator autoderefs when calling to an object type. use std::ops::FnMut; diff --git a/src/test/run-pass/unboxed-closures-call-sugar-object.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-object.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-call-sugar-object.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-object.rs index 2fdb9e9b346c..e40541a27545 100644 --- a/src/test/run-pass/unboxed-closures-call-sugar-object.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-call-sugar-object.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::FnMut; fn make_adder(x: isize) -> Boxisize + 'static> { diff --git a/src/test/run-pass/unboxed-closures-counter-not-moved.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-counter-not-moved.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-counter-not-moved.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-counter-not-moved.rs index 300a0ee63f81..dc6903db326c 100644 --- a/src/test/run-pass/unboxed-closures-counter-not-moved.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-counter-not-moved.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we mutate a counter on the stack only when we expect to. fn call(f: F) where F : FnOnce() { diff --git a/src/test/run-pass/unboxed-closures-cross-crate.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-cross-crate.rs similarity index 94% rename from src/test/run-pass/unboxed-closures-cross-crate.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-cross-crate.rs index 37dc760cedcf..620d935b3b82 100644 --- a/src/test/run-pass/unboxed-closures-cross-crate.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-cross-crate.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // Test that unboxed closures work with cross-crate inlining // Acts as a regression test for #16790, #18378 and #18543 diff --git a/src/test/run-pass/unboxed-closures-direct-sugary-call.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-direct-sugary-call.rs similarity index 97% rename from src/test/run-pass/unboxed-closures-direct-sugary-call.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-direct-sugary-call.rs index c8da4a6992a1..1f84db7f7205 100644 --- a/src/test/run-pass/unboxed-closures-direct-sugary-call.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-direct-sugary-call.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/unboxed-closures-drop.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-drop.rs similarity index 99% rename from src/test/run-pass/unboxed-closures-drop.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-drop.rs index 57f2f87e2469..02edd01ac187 100644 --- a/src/test/run-pass/unboxed-closures-drop.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-drop.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // A battery of tests to ensure destructors of unboxed closure environments // run at the right times. diff --git a/src/test/run-pass/unboxed-closures-extern-fn-hr.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-extern-fn-hr.rs similarity index 99% rename from src/test/run-pass/unboxed-closures-extern-fn-hr.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-extern-fn-hr.rs index 75cd61b9cf02..f6f83c33f157 100644 --- a/src/test/run-pass/unboxed-closures-extern-fn-hr.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-extern-fn-hr.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Checks that higher-ranked extern fn pointers implement the full range of Fn traits. fn square(x: &isize) -> isize { (*x) * (*x) } diff --git a/src/test/run-pass/unboxed-closures-extern-fn.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-extern-fn.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-extern-fn.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-extern-fn.rs index eddb6080d17b..480a6daac81f 100644 --- a/src/test/run-pass/unboxed-closures-extern-fn.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-extern-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Checks that extern fn pointers implement the full range of Fn traits. use std::ops::{Fn,FnMut,FnOnce}; diff --git a/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs similarity index 99% rename from src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs index f90aced3dbe3..5f2e05995ccb 100644 --- a/src/test/run-pass/unboxed-closures-fn-as-fnmut-and-fnonce.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-fn-as-fnmut-and-fnonce.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Checks that the Fn trait hierarchy rules permit // any Fn trait to be used where Fn is implemented. diff --git a/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs index 0a977cef442e..592994cae6e6 100644 --- a/src/test/run-pass/unboxed-closures-fnmut-as-fnonce.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-fnmut-as-fnonce.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Checks that the Fn trait hierarchy rules permit // FnMut or FnOnce to be used where FnMut is implemented. diff --git a/src/test/run-pass/unboxed-closures-generic.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-generic.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-generic.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-generic.rs index 01c81ef98d50..9120b71c6d7e 100644 --- a/src/test/run-pass/unboxed-closures-generic.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-generic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::FnMut; fn call_iti32>(y: i32, mut f: F) -> i32 { diff --git a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-bound.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-bound.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs index c4944548e17f..b9219404b46c 100644 --- a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-bound.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to infer that the type of `x` is `isize` based // on the expected type from the object. diff --git a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-object-type.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-object-type.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs index 9cad7d61e32c..08e41627a9b8 100644 --- a/src/test/run-pass/unboxed-closures-infer-arg-types-from-expected-object-type.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-from-expected-object-type.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to infer that the type of `x` is `isize` based // on the expected type from the object. diff --git a/src/test/run-pass/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs index bdd1932182bd..06c704dfda15 100644 --- a/src/test/run-pass/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-arg-types-w-bound-regs-from-expected-bound.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to infer that the type of `x` is `isize` based // on the expected type from the object. diff --git a/src/test/run-pass/unboxed-closures-infer-explicit-call-early.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs similarity index 97% rename from src/test/run-pass/unboxed-closures-infer-explicit-call-early.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs index 028f2e9375b3..2d0fd0466105 100644 --- a/src/test/run-pass/unboxed-closures-infer-explicit-call-early.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-explicit-call-early.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(fn_traits)] fn main() { diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs index 17833033492d..3ddde9a16afb 100644 --- a/src/test/run-pass/unboxed-closures-infer-fnmut-calling-fnmut.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-calling-fnmut.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to infer a suitable kind for this closure // that is just called (`FnMut`). diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-move.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-infer-fnmut-move.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-move.rs index 794527249bff..48645efce676 100644 --- a/src/test/run-pass/unboxed-closures-infer-fnmut-move.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut-move.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to infer a suitable kind for this `move` // closure that is just called (`FnMut`). diff --git a/src/test/run-pass/unboxed-closures-infer-fnmut.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-infer-fnmut.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut.rs index 67f36b9a9203..80ca969c5290 100644 --- a/src/test/run-pass/unboxed-closures-infer-fnmut.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnmut.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to infer a suitable kind for this closure // that is just called (`FnMut`). diff --git a/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnonce-move.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-infer-fnonce-move.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnonce-move.rs index 449f533103a8..ff8cd4a5effb 100644 --- a/src/test/run-pass/unboxed-closures-infer-fnonce-move.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnonce-move.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to infer a suitable kind for this `move` // closure that is just called (`FnOnce`). diff --git a/src/test/run-pass/unboxed-closures-infer-fnonce.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnonce.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-infer-fnonce.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnonce.rs index 79a1aff85352..698a389ef657 100644 --- a/src/test/run-pass/unboxed-closures-infer-fnonce.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-fnonce.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we are able to infer a suitable kind for this closure // that is just called (`FnOnce`). diff --git a/src/test/run-pass/unboxed-closures-infer-kind.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-kind.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-infer-kind.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-kind.rs index c04df7ed5f87..362d53126c22 100644 --- a/src/test/run-pass/unboxed-closures-infer-kind.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-kind.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that we can infer the "kind" of an unboxed closure based on // the expected type. diff --git a/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-recursive-fn.rs similarity index 99% rename from src/test/run-pass/unboxed-closures-infer-recursive-fn.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-recursive-fn.rs index ac303e3a090b..c150e8915c65 100644 --- a/src/test/run-pass/unboxed-closures-infer-recursive-fn.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-recursive-fn.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(fn_traits, unboxed_closures)] use std::marker::PhantomData; diff --git a/src/test/run-pass/unboxed-closures-infer-upvar.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-upvar.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-infer-upvar.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-upvar.rs index 1401fe7470b0..5bf634defda9 100644 --- a/src/test/run-pass/unboxed-closures-infer-upvar.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-infer-upvar.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that the type variable in the type(`Vec<_>`) of a closed over // variable does not interfere with type inference. diff --git a/src/test/run-pass/unboxed-closures-manual-impl.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-manual-impl.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-manual-impl.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-manual-impl.rs index e2d05884f3a5..e610e90fb978 100644 --- a/src/test/run-pass/unboxed-closures-manual-impl.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-manual-impl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(unboxed_closures, fn_traits)] struct S; diff --git a/src/test/run-pass/unboxed-closures-monomorphization.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-monomorphization.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-monomorphization.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-monomorphization.rs index d0d36d969b78..6f15133eaee5 100644 --- a/src/test/run-pass/unboxed-closures-monomorphization.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-monomorphization.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that unboxed closures in contexts with free type parameters // monomorphize correctly (issue #16791) diff --git a/src/test/run-pass/unboxed-closures-move-from-projection-issue-30046.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-move-from-projection-issue-30046.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs index d902ebc9dc9d..ef3114ff394e 100644 --- a/src/test/run-pass/unboxed-closures-move-from-projection-issue-30046.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-from-projection-issue-30046.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused)] fn foo(f: F) diff --git a/src/test/run-pass/unboxed-closures-move-mutable.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-mutable.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-move-mutable.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-mutable.rs index a55b0a0185e6..3b1e4a1d554e 100644 --- a/src/test/run-pass/unboxed-closures-move-mutable.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-mutable.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![deny(unused_mut)] diff --git a/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs index b9a16535c420..b20377ec94fe 100644 --- a/src/test/run-pass/unboxed-closures-move-some-upvars-in-by-ref-closure.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-move-some-upvars-in-by-ref-closure.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that in a by-ref once closure we move some variables even as // we capture others by mutable reference. diff --git a/src/test/run-pass/unboxed-closures-prelude.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-prelude.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-prelude.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-prelude.rs index f82b04f37c50..f6997da7c071 100644 --- a/src/test/run-pass/unboxed-closures-prelude.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-prelude.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Tests that the re-exports of `FnOnce` et al from the prelude work. // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/unboxed-closures-simple.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-simple.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-simple.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-simple.rs index 429afb95248c..b7230ed5d82a 100644 --- a/src/test/run-pass/unboxed-closures-simple.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-simple.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::ops::FnMut; pub fn main() { diff --git a/src/test/run-pass/unboxed-closures-single-word-env.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-single-word-env.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-single-word-env.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-single-word-env.rs index 3ed055a7884e..253a5354cddc 100644 --- a/src/test/run-pass/unboxed-closures-single-word-env.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-single-word-env.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Ensures that single-word environments work right in unboxed closures. // These take a different path in codegen. diff --git a/src/test/run-pass/unboxed-closures-static-call-fn-once.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-static-call-fn-once.rs similarity index 97% rename from src/test/run-pass/unboxed-closures-static-call-fn-once.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-static-call-fn-once.rs index c13e9513ce33..5526d372706c 100644 --- a/src/test/run-pass/unboxed-closures-static-call-fn-once.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-static-call-fn-once.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/unboxed-closures-sugar-object.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-sugar-object.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-sugar-object.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-sugar-object.rs index b7d367f23538..16f123d62fc2 100644 --- a/src/test/run-pass/unboxed-closures-sugar-object.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-sugar-object.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test unboxed closure sugar used in object types. #![allow(dead_code)] diff --git a/src/test/run-pass/unboxed-closures-unique-type-id.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-unique-type-id.rs similarity index 98% rename from src/test/run-pass/unboxed-closures-unique-type-id.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-unique-type-id.rs index c95885518ea2..dbf4a1c5f7e9 100644 --- a/src/test/run-pass/unboxed-closures-unique-type-id.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-unique-type-id.rs @@ -7,7 +7,9 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -// + +// run-pass + // This code used to produce the following ICE: // // error: internal compiler error: get_unique_type_id_of_type() - diff --git a/src/test/run-pass/unboxed-closures-zero-args.rs b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-zero-args.rs similarity index 97% rename from src/test/run-pass/unboxed-closures-zero-args.rs rename to src/test/ui/run-pass/unboxed-closures/unboxed-closures-zero-args.rs index 9e6a7cce1fd2..ae9124c9fc14 100644 --- a/src/test/run-pass/unboxed-closures-zero-args.rs +++ b/src/test/ui/run-pass/unboxed-closures/unboxed-closures-zero-args.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn main() { diff --git a/src/test/run-pass/uniform-paths/basic-nested.rs b/src/test/ui/run-pass/uniform-paths/basic-nested.rs similarity index 97% rename from src/test/run-pass/uniform-paths/basic-nested.rs rename to src/test/ui/run-pass/uniform-paths/basic-nested.rs index 954736dfd907..1fe5d8abbe2e 100644 --- a/src/test/run-pass/uniform-paths/basic-nested.rs +++ b/src/test/ui/run-pass/uniform-paths/basic-nested.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // edition:2018 #![feature(decl_macro, uniform_paths)] diff --git a/src/test/run-pass/uniform-paths/basic.rs b/src/test/ui/run-pass/uniform-paths/basic.rs similarity index 95% rename from src/test/run-pass/uniform-paths/basic.rs rename to src/test/ui/run-pass/uniform-paths/basic.rs index 59a0404e4c36..d8e68e9be972 100644 --- a/src/test/run-pass/uniform-paths/basic.rs +++ b/src/test/ui/run-pass/uniform-paths/basic.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/run-pass/uniform-paths/macros-nested.rs b/src/test/ui/run-pass/uniform-paths/macros-nested.rs similarity index 97% rename from src/test/run-pass/uniform-paths/macros-nested.rs rename to src/test/ui/run-pass/uniform-paths/macros-nested.rs index 9cf05cd95603..373734345fc3 100644 --- a/src/test/run-pass/uniform-paths/macros-nested.rs +++ b/src/test/ui/run-pass/uniform-paths/macros-nested.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/run-pass/uniform-paths/macros.rs b/src/test/ui/run-pass/uniform-paths/macros.rs similarity index 96% rename from src/test/run-pass/uniform-paths/macros.rs rename to src/test/ui/run-pass/uniform-paths/macros.rs index ad74f5d0876b..20984eb13dd4 100644 --- a/src/test/run-pass/uniform-paths/macros.rs +++ b/src/test/ui/run-pass/uniform-paths/macros.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/run-pass/uniform-paths/same-crate.rs b/src/test/ui/run-pass/uniform-paths/same-crate.rs similarity index 99% rename from src/test/run-pass/uniform-paths/same-crate.rs rename to src/test/ui/run-pass/uniform-paths/same-crate.rs index a3eefa7134c4..bb15d6d53ac7 100644 --- a/src/test/run-pass/uniform-paths/same-crate.rs +++ b/src/test/ui/run-pass/uniform-paths/same-crate.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // edition:2018 #![feature(uniform_paths)] diff --git a/src/test/run-pass/union/auxiliary/union.rs b/src/test/ui/run-pass/union/auxiliary/union.rs similarity index 100% rename from src/test/run-pass/union/auxiliary/union.rs rename to src/test/ui/run-pass/union/auxiliary/union.rs diff --git a/src/test/run-pass/union/union-align.rs b/src/test/ui/run-pass/union/union-align.rs similarity index 99% rename from src/test/run-pass/union/union-align.rs rename to src/test/ui/run-pass/union/union-align.rs index 54e4e12d24fa..02f447c626f8 100644 --- a/src/test/run-pass/union/union-align.rs +++ b/src/test/ui/run-pass/union/union-align.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(untagged_unions)] use std::mem::{size_of, size_of_val, align_of, align_of_val}; diff --git a/src/test/run-pass/union/union-backcomp.rs b/src/test/ui/run-pass/union/union-backcomp.rs similarity index 98% rename from src/test/run-pass/union/union-backcomp.rs rename to src/test/ui/run-pass/union/union-backcomp.rs index b706a81850ce..23d51d39c2ed 100644 --- a/src/test/run-pass/union/union-backcomp.rs +++ b/src/test/ui/run-pass/union/union-backcomp.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + macro_rules! union { () => (struct S;) } diff --git a/src/test/run-pass/union/union-basic.rs b/src/test/ui/run-pass/union/union-basic.rs similarity index 99% rename from src/test/run-pass/union/union-basic.rs rename to src/test/ui/run-pass/union/union-basic.rs index 079f6a6b641e..bfbac1a6bf20 100644 --- a/src/test/run-pass/union/union-basic.rs +++ b/src/test/ui/run-pass/union/union-basic.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + // aux-build:union.rs extern crate union; diff --git a/src/test/run-pass/union/union-c-interop.rs b/src/test/ui/run-pass/union/union-c-interop.rs similarity index 96% rename from src/test/run-pass/union/union-c-interop.rs rename to src/test/ui/run-pass/union/union-c-interop.rs index dd16bf2e4a38..976ab845cd19 100644 --- a/src/test/run-pass/union/union-c-interop.rs +++ b/src/test/ui/run-pass/union/union-c-interop.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + // ignore-wasm32-bare no libc to test ffi with #[derive(Clone, Copy)] diff --git a/src/test/run-pass/union/union-const-codegen.rs b/src/test/ui/run-pass/union/union-const-codegen.rs similarity index 98% rename from src/test/run-pass/union/union-const-codegen.rs rename to src/test/ui/run-pass/union/union-const-codegen.rs index 77270364bb5e..aa583e6cead9 100644 --- a/src/test/run-pass/union/union-const-codegen.rs +++ b/src/test/ui/run-pass/union/union-const-codegen.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + union U { a: u64, b: u64, diff --git a/src/test/run-pass/union/union-const-eval-field.rs b/src/test/ui/run-pass/union/union-const-eval-field.rs similarity index 99% rename from src/test/run-pass/union/union-const-eval-field.rs rename to src/test/ui/run-pass/union/union-const-eval-field.rs index a380b01dcc13..c8eda7545d92 100644 --- a/src/test/run-pass/union/union-const-eval-field.rs +++ b/src/test/ui/run-pass/union/union-const-eval-field.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(const_fn)] type Field1 = (i32, u32); diff --git a/src/test/run-pass/union/union-derive.rs b/src/test/ui/run-pass/union/union-derive.rs similarity index 95% rename from src/test/run-pass/union/union-derive.rs rename to src/test/ui/run-pass/union/union-derive.rs index 8ff6f17394f9..248595ee7ac0 100644 --- a/src/test/run-pass/union/union-derive.rs +++ b/src/test/ui/run-pass/union/union-derive.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(unions_with_drop_fields)] + // Some traits can be derived for unions. #![feature(untagged_unions)] diff --git a/src/test/run-pass/union/union-drop-assign.rs b/src/test/ui/run-pass/union/union-drop-assign.rs similarity index 95% rename from src/test/run-pass/union/union-drop-assign.rs rename to src/test/ui/run-pass/union/union-drop-assign.rs index 0da68e43f32a..2884cf16b967 100644 --- a/src/test/run-pass/union/union-drop-assign.rs +++ b/src/test/ui/run-pass/union/union-drop-assign.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(unions_with_drop_fields)] + // Drop works for union itself. #![feature(untagged_unions)] diff --git a/src/test/run-pass/union/union-drop.rs b/src/test/ui/run-pass/union/union-drop.rs similarity index 96% rename from src/test/run-pass/union/union-drop.rs rename to src/test/ui/run-pass/union/union-drop.rs index 2ca68dc3b6e3..ba5c20b6dc3c 100644 --- a/src/test/run-pass/union/union-drop.rs +++ b/src/test/ui/run-pass/union/union-drop.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(unions_with_drop_fields)] + // Drop works for union itself. #![feature(untagged_unions)] diff --git a/src/test/run-pass/union/union-generic.rs b/src/test/ui/run-pass/union/union-generic.rs similarity index 95% rename from src/test/run-pass/union/union-generic.rs rename to src/test/ui/run-pass/union/union-generic.rs index 9293805edbf8..dcea56c288f9 100644 --- a/src/test/run-pass/union/union-generic.rs +++ b/src/test/ui/run-pass/union/union-generic.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(unions_with_drop_fields)] + #![feature(untagged_unions)] union MaybeItem { diff --git a/src/test/run-pass/union/union-inherent-method.rs b/src/test/ui/run-pass/union/union-inherent-method.rs similarity index 97% rename from src/test/run-pass/union/union-inherent-method.rs rename to src/test/ui/run-pass/union/union-inherent-method.rs index a88fdc57a3ef..d9300b5b9f56 100644 --- a/src/test/run-pass/union/union-inherent-method.rs +++ b/src/test/ui/run-pass/union/union-inherent-method.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + union U { a: u8, } diff --git a/src/test/run-pass/union/union-macro.rs b/src/test/ui/run-pass/union/union-macro.rs similarity index 98% rename from src/test/run-pass/union/union-macro.rs rename to src/test/ui/run-pass/union/union-macro.rs index b6141ae82c37..f4ffa2edbde0 100644 --- a/src/test/run-pass/union/union-macro.rs +++ b/src/test/ui/run-pass/union/union-macro.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + macro_rules! duplicate { ($i: item) => { mod m1 { diff --git a/src/test/run-pass/union/union-nodrop.rs b/src/test/ui/run-pass/union/union-nodrop.rs similarity index 99% rename from src/test/run-pass/union/union-nodrop.rs rename to src/test/ui/run-pass/union/union-nodrop.rs index 6295c6120c5b..4f2456e43bad 100644 --- a/src/test/run-pass/union/union-nodrop.rs +++ b/src/test/ui/run-pass/union/union-nodrop.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(core_intrinsics)] #![feature(untagged_unions)] diff --git a/src/test/run-pass/union/union-overwrite.rs b/src/test/ui/run-pass/union/union-overwrite.rs similarity index 97% rename from src/test/run-pass/union/union-overwrite.rs rename to src/test/ui/run-pass/union/union-overwrite.rs index 9389a6237bca..b4d0850a5042 100644 --- a/src/test/run-pass/union/union-overwrite.rs +++ b/src/test/ui/run-pass/union/union-overwrite.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(unions_with_drop_fields)] + #![feature(untagged_unions)] #[repr(C)] diff --git a/src/test/run-pass/union/union-packed.rs b/src/test/ui/run-pass/union/union-packed.rs similarity index 99% rename from src/test/run-pass/union/union-packed.rs rename to src/test/ui/run-pass/union/union-packed.rs index 61bb04fece09..c167a40507a8 100644 --- a/src/test/run-pass/union/union-packed.rs +++ b/src/test/ui/run-pass/union/union-packed.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_snake_case)] + #![feature(untagged_unions)] #![feature(repr_packed)] diff --git a/src/test/run-pass/union/union-pat-refutability.rs b/src/test/ui/run-pass/union/union-pat-refutability.rs similarity index 95% rename from src/test/run-pass/union/union-pat-refutability.rs rename to src/test/ui/run-pass/union/union-pat-refutability.rs index 81607236c9ec..2c481160fdad 100644 --- a/src/test/run-pass/union/union-pat-refutability.rs +++ b/src/test/ui/run-pass/union/union-pat-refutability.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(illegal_floating_point_literal_pattern)] + #[repr(u32)] enum Tag { I, F } diff --git a/src/test/run-pass/union/union-trait-impl.rs b/src/test/ui/run-pass/union/union-trait-impl.rs similarity index 98% rename from src/test/run-pass/union/union-trait-impl.rs rename to src/test/ui/run-pass/union/union-trait-impl.rs index c1e408cc02ac..6e732f24b250 100644 --- a/src/test/run-pass/union/union-trait-impl.rs +++ b/src/test/ui/run-pass/union/union-trait-impl.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + use std::fmt; union U { diff --git a/src/test/run-pass/union/union-transmute.rs b/src/test/ui/run-pass/union/union-transmute.rs similarity index 98% rename from src/test/run-pass/union/union-transmute.rs rename to src/test/ui/run-pass/union/union-transmute.rs index 7233687aaab5..1fc20bef9e01 100644 --- a/src/test/run-pass/union/union-transmute.rs +++ b/src/test/ui/run-pass/union/union-transmute.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + extern crate core; use core::f32; diff --git a/src/test/run-pass/union/union-with-drop-fields-lint.rs b/src/test/ui/run-pass/union/union-with-drop-fields-lint.rs similarity index 98% rename from src/test/run-pass/union/union-with-drop-fields-lint.rs rename to src/test/ui/run-pass/union/union-with-drop-fields-lint.rs index 6cb7e82d6b74..5f1ac7b51eeb 100644 --- a/src/test/run-pass/union/union-with-drop-fields-lint.rs +++ b/src/test/ui/run-pass/union/union-with-drop-fields-lint.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(untagged_unions)] #![allow(dead_code)] #![allow(unions_with_drop_fields)] diff --git a/src/test/run-pass/unique-assign-copy.rs b/src/test/ui/run-pass/unique/unique-assign-copy.rs similarity index 98% rename from src/test/run-pass/unique-assign-copy.rs rename to src/test/ui/run-pass/unique/unique-assign-copy.rs index 1e36f5287a77..e25de1025fa9 100644 --- a/src/test/run-pass/unique-assign-copy.rs +++ b/src/test/ui/run-pass/unique/unique-assign-copy.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-assign-drop.rs b/src/test/ui/run-pass/unique/unique-assign-drop.rs similarity index 95% rename from src/test/run-pass/unique-assign-drop.rs rename to src/test/ui/run-pass/unique/unique-assign-drop.rs index 1227c14ec02f..dd9314801961 100644 --- a/src/test/run-pass/unique-assign-drop.rs +++ b/src/test/ui/run-pass/unique/unique-assign-drop.rs @@ -8,8 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass -#![allow(dead_assignment)] #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-assign-generic.rs b/src/test/ui/run-pass/unique/unique-assign-generic.rs similarity index 98% rename from src/test/run-pass/unique-assign-generic.rs rename to src/test/ui/run-pass/unique/unique-assign-generic.rs index 1abc8203305c..ebbe69272613 100644 --- a/src/test/run-pass/unique-assign-generic.rs +++ b/src/test/ui/run-pass/unique/unique-assign-generic.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn f(t: T) -> T { diff --git a/src/test/run-pass/unique-assign.rs b/src/test/ui/run-pass/unique/unique-assign.rs similarity index 97% rename from src/test/run-pass/unique-assign.rs rename to src/test/ui/run-pass/unique/unique-assign.rs index 66b78d27c59f..206503f87ce9 100644 --- a/src/test/run-pass/unique-assign.rs +++ b/src/test/ui/run-pass/unique/unique-assign.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-autoderef-field.rs b/src/test/ui/run-pass/unique/unique-autoderef-field.rs similarity index 98% rename from src/test/run-pass/unique-autoderef-field.rs rename to src/test/ui/run-pass/unique/unique-autoderef-field.rs index 4ad465abc48f..449bf4186512 100644 --- a/src/test/run-pass/unique-autoderef-field.rs +++ b/src/test/ui/run-pass/unique/unique-autoderef-field.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct J { j: isize } diff --git a/src/test/run-pass/unique-autoderef-index.rs b/src/test/ui/run-pass/unique/unique-autoderef-index.rs similarity index 97% rename from src/test/run-pass/unique-autoderef-index.rs rename to src/test/ui/run-pass/unique/unique-autoderef-index.rs index b0abcfab78ef..de7c2f7826e2 100644 --- a/src/test/run-pass/unique-autoderef-index.rs +++ b/src/test/ui/run-pass/unique/unique-autoderef-index.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-cmp.rs b/src/test/ui/run-pass/unique/unique-cmp.rs similarity index 98% rename from src/test/run-pass/unique-cmp.rs rename to src/test/ui/run-pass/unique/unique-cmp.rs index e949215396c6..b11b1a8cdbc8 100644 --- a/src/test/run-pass/unique-cmp.rs +++ b/src/test/ui/run-pass/unique/unique-cmp.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-containing-tag.rs b/src/test/ui/run-pass/unique/unique-containing-tag.rs similarity index 94% rename from src/test/run-pass/unique-containing-tag.rs rename to src/test/ui/run-pass/unique/unique-containing-tag.rs index 94f523eb3960..d849c1d32981 100644 --- a/src/test/run-pass/unique-containing-tag.rs +++ b/src/test/ui/run-pass/unique/unique-containing-tag.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-create.rs b/src/test/ui/run-pass/unique/unique-create.rs similarity index 98% rename from src/test/run-pass/unique-create.rs rename to src/test/ui/run-pass/unique/unique-create.rs index 5ebabf0c29a5..5c7488b1120d 100644 --- a/src/test/run-pass/unique-create.rs +++ b/src/test/ui/run-pass/unique/unique-create.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-decl-init-copy.rs b/src/test/ui/run-pass/unique/unique-decl-init-copy.rs similarity index 98% rename from src/test/run-pass/unique-decl-init-copy.rs rename to src/test/ui/run-pass/unique/unique-decl-init-copy.rs index 71197b9d02fb..1ec57a8b8b56 100644 --- a/src/test/run-pass/unique-decl-init-copy.rs +++ b/src/test/ui/run-pass/unique/unique-decl-init-copy.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-decl-init.rs b/src/test/ui/run-pass/unique/unique-decl-init.rs similarity index 97% rename from src/test/run-pass/unique-decl-init.rs rename to src/test/ui/run-pass/unique/unique-decl-init.rs index 2501caddb463..85190b5142f0 100644 --- a/src/test/run-pass/unique-decl-init.rs +++ b/src/test/ui/run-pass/unique/unique-decl-init.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-decl-move.rs b/src/test/ui/run-pass/unique/unique-decl-move.rs similarity index 97% rename from src/test/run-pass/unique-decl-move.rs rename to src/test/ui/run-pass/unique/unique-decl-move.rs index fc6421e2e088..8e08ae43baeb 100644 --- a/src/test/run-pass/unique-decl-move.rs +++ b/src/test/ui/run-pass/unique/unique-decl-move.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-decl.rs b/src/test/ui/run-pass/unique/unique-decl.rs similarity index 97% rename from src/test/run-pass/unique-decl.rs rename to src/test/ui/run-pass/unique/unique-decl.rs index bbf9b2f47a74..37b8b94b15a4 100644 --- a/src/test/run-pass/unique-decl.rs +++ b/src/test/ui/run-pass/unique/unique-decl.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass pub fn main() { diff --git a/src/test/run-pass/unique-deref.rs b/src/test/ui/run-pass/unique/unique-deref.rs similarity index 97% rename from src/test/run-pass/unique-deref.rs rename to src/test/ui/run-pass/unique/unique-deref.rs index 8c008683ef34..db2e5509c1aa 100644 --- a/src/test/run-pass/unique-deref.rs +++ b/src/test/ui/run-pass/unique/unique-deref.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-destructure.rs b/src/test/ui/run-pass/unique/unique-destructure.rs similarity index 98% rename from src/test/run-pass/unique-destructure.rs rename to src/test/ui/run-pass/unique/unique-destructure.rs index 70b4af1886fc..782f151459eb 100644 --- a/src/test/run-pass/unique-destructure.rs +++ b/src/test/ui/run-pass/unique/unique-destructure.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-drop-complex.rs b/src/test/ui/run-pass/unique/unique-drop-complex.rs similarity index 97% rename from src/test/run-pass/unique-drop-complex.rs rename to src/test/ui/run-pass/unique/unique-drop-complex.rs index bcfb65769da6..747b16626528 100644 --- a/src/test/run-pass/unique-drop-complex.rs +++ b/src/test/ui/run-pass/unique/unique-drop-complex.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-ffi-symbols.rs b/src/test/ui/run-pass/unique/unique-ffi-symbols.rs similarity index 98% rename from src/test/run-pass/unique-ffi-symbols.rs rename to src/test/ui/run-pass/unique/unique-ffi-symbols.rs index 81563f40e94b..761b2ffe30b1 100644 --- a/src/test/run-pass/unique-ffi-symbols.rs +++ b/src/test/ui/run-pass/unique/unique-ffi-symbols.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // We used to have a __rust_abi shim that resulted in duplicated symbols // whenever the item path wasn't enough to disambiguate between them. fn main() { diff --git a/src/test/run-pass/unique-fn-arg-move.rs b/src/test/ui/run-pass/unique/unique-fn-arg-move.rs similarity index 98% rename from src/test/run-pass/unique-fn-arg-move.rs rename to src/test/ui/run-pass/unique/unique-fn-arg-move.rs index 45cc530659f9..703c2bee84d2 100644 --- a/src/test/run-pass/unique-fn-arg-move.rs +++ b/src/test/ui/run-pass/unique/unique-fn-arg-move.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn f(i: Box) { diff --git a/src/test/run-pass/unique-fn-arg-mut.rs b/src/test/ui/run-pass/unique/unique-fn-arg-mut.rs similarity index 98% rename from src/test/run-pass/unique-fn-arg-mut.rs rename to src/test/ui/run-pass/unique/unique-fn-arg-mut.rs index 77c4fa29558e..b495fb30a9c8 100644 --- a/src/test/run-pass/unique-fn-arg-mut.rs +++ b/src/test/ui/run-pass/unique/unique-fn-arg-mut.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn f(i: &mut Box) { diff --git a/src/test/run-pass/unique-fn-arg.rs b/src/test/ui/run-pass/unique/unique-fn-arg.rs similarity index 98% rename from src/test/run-pass/unique-fn-arg.rs rename to src/test/ui/run-pass/unique/unique-fn-arg.rs index 20a0008ef56a..ef10e17d9d2c 100644 --- a/src/test/run-pass/unique-fn-arg.rs +++ b/src/test/ui/run-pass/unique/unique-fn-arg.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn f(i: Box) { diff --git a/src/test/run-pass/unique-fn-ret.rs b/src/test/ui/run-pass/unique/unique-fn-ret.rs similarity index 97% rename from src/test/run-pass/unique-fn-ret.rs rename to src/test/ui/run-pass/unique/unique-fn-ret.rs index 7d88176828e3..b4757a4b4d64 100644 --- a/src/test/run-pass/unique-fn-ret.rs +++ b/src/test/ui/run-pass/unique/unique-fn-ret.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] fn f() -> Box { diff --git a/src/test/run-pass/unique-generic-assign.rs b/src/test/ui/run-pass/unique/unique-generic-assign.rs similarity index 97% rename from src/test/run-pass/unique-generic-assign.rs rename to src/test/ui/run-pass/unique/unique-generic-assign.rs index 2da3b9f05f68..571a5620cd8d 100644 --- a/src/test/run-pass/unique-generic-assign.rs +++ b/src/test/ui/run-pass/unique/unique-generic-assign.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #976 diff --git a/src/test/run-pass/unique-in-tag.rs b/src/test/ui/run-pass/unique/unique-in-tag.rs similarity index 94% rename from src/test/run-pass/unique-in-tag.rs rename to src/test/ui/run-pass/unique/unique-in-tag.rs index 517cdd025356..31fe43dae998 100644 --- a/src/test/run-pass/unique-in-tag.rs +++ b/src/test/ui/run-pass/unique/unique-in-tag.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #![feature(box_syntax)] fn test1() { diff --git a/src/test/run-pass/unique-in-vec-copy.rs b/src/test/ui/run-pass/unique/unique-in-vec-copy.rs similarity index 98% rename from src/test/run-pass/unique-in-vec-copy.rs rename to src/test/ui/run-pass/unique/unique-in-vec-copy.rs index a460aa6ec102..62b183d62b41 100644 --- a/src/test/run-pass/unique-in-vec-copy.rs +++ b/src/test/ui/run-pass/unique/unique-in-vec-copy.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-in-vec.rs b/src/test/ui/run-pass/unique/unique-in-vec.rs similarity index 98% rename from src/test/run-pass/unique-in-vec.rs rename to src/test/ui/run-pass/unique/unique-in-vec.rs index a7edc9cc7104..681c0c190e4e 100644 --- a/src/test/run-pass/unique-in-vec.rs +++ b/src/test/ui/run-pass/unique/unique-in-vec.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-init.rs b/src/test/ui/run-pass/unique/unique-init.rs similarity index 97% rename from src/test/run-pass/unique-init.rs rename to src/test/ui/run-pass/unique/unique-init.rs index 768614b1e3c9..9b7c2a99c991 100644 --- a/src/test/run-pass/unique-init.rs +++ b/src/test/ui/run-pass/unique/unique-init.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-kinds.rs b/src/test/ui/run-pass/unique/unique-kinds.rs similarity index 99% rename from src/test/run-pass/unique-kinds.rs rename to src/test/ui/run-pass/unique/unique-kinds.rs index 80364114bce4..33b014db37b7 100644 --- a/src/test/run-pass/unique-kinds.rs +++ b/src/test/ui/run-pass/unique/unique-kinds.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] use std::cmp::PartialEq; diff --git a/src/test/run-pass/unique-log.rs b/src/test/ui/run-pass/unique/unique-log.rs similarity index 97% rename from src/test/run-pass/unique-log.rs rename to src/test/ui/run-pass/unique/unique-log.rs index 0c17acb3d898..f8b5f5562fc7 100644 --- a/src/test/run-pass/unique-log.rs +++ b/src/test/ui/run-pass/unique/unique-log.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-match-discrim.rs b/src/test/ui/run-pass/unique/unique-match-discrim.rs similarity index 98% rename from src/test/run-pass/unique-match-discrim.rs rename to src/test/ui/run-pass/unique/unique-match-discrim.rs index 1b0392341e72..43004e8673aa 100644 --- a/src/test/run-pass/unique-match-discrim.rs +++ b/src/test/ui/run-pass/unique/unique-match-discrim.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #961 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/unique-move-drop.rs b/src/test/ui/run-pass/unique/unique-move-drop.rs similarity index 98% rename from src/test/run-pass/unique-move-drop.rs rename to src/test/ui/run-pass/unique/unique-move-drop.rs index ba865abc3718..53f3c9b6c5ce 100644 --- a/src/test/run-pass/unique-move-drop.rs +++ b/src/test/ui/run-pass/unique/unique-move-drop.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused_variables)] #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-move-temp.rs b/src/test/ui/run-pass/unique/unique-move-temp.rs similarity index 97% rename from src/test/run-pass/unique-move-temp.rs rename to src/test/ui/run-pass/unique/unique-move-temp.rs index 8c1178b9a7e0..a68fe021d09c 100644 --- a/src/test/run-pass/unique-move-temp.rs +++ b/src/test/ui/run-pass/unique/unique-move-temp.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-move.rs b/src/test/ui/run-pass/unique/unique-move.rs similarity index 98% rename from src/test/run-pass/unique-move.rs rename to src/test/ui/run-pass/unique/unique-move.rs index e731ca818fe7..4dba48a5ea0a 100644 --- a/src/test/run-pass/unique-move.rs +++ b/src/test/ui/run-pass/unique/unique-move.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-mutable.rs b/src/test/ui/run-pass/unique/unique-mutable.rs similarity index 97% rename from src/test/run-pass/unique-mutable.rs rename to src/test/ui/run-pass/unique/unique-mutable.rs index 480060103003..fcae9323c386 100644 --- a/src/test/run-pass/unique-mutable.rs +++ b/src/test/ui/run-pass/unique/unique-mutable.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] pub fn main() { diff --git a/src/test/run-pass/unique-object-move.rs b/src/test/ui/run-pass/unique/unique-object-move.rs similarity index 98% rename from src/test/run-pass/unique-object-move.rs rename to src/test/ui/run-pass/unique/unique-object-move.rs index d93df4e96f99..d85b22f5dc97 100644 --- a/src/test/run-pass/unique-object-move.rs +++ b/src/test/ui/run-pass/unique/unique-object-move.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Issue #5192 // pretty-expanded FIXME #23616 diff --git a/src/test/run-pass/unique-pat-2.rs b/src/test/ui/run-pass/unique/unique-pat-2.rs similarity index 90% rename from src/test/run-pass/unique-pat-2.rs rename to src/test/ui/run-pass/unique/unique-pat-2.rs index 12e81a202e9f..3796be683695 100644 --- a/src/test/run-pass/unique-pat-2.rs +++ b/src/test/ui/run-pass/unique/unique-pat-2.rs @@ -8,6 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] +#![allow(non_shorthand_field_patterns)] + #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-pat-3.rs b/src/test/ui/run-pass/unique/unique-pat-3.rs similarity index 93% rename from src/test/run-pass/unique-pat-3.rs rename to src/test/ui/run-pass/unique/unique-pat-3.rs index 9f361d460e0e..2ed984c3a37b 100644 --- a/src/test/run-pass/unique-pat-3.rs +++ b/src/test/ui/run-pass/unique/unique-pat-3.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_camel_case_types)] + #![feature(box_syntax)] enum bar { u(Box), w(isize), } diff --git a/src/test/run-pass/unique-pat.rs b/src/test/ui/run-pass/unique/unique-pat.rs similarity index 98% rename from src/test/run-pass/unique-pat.rs rename to src/test/ui/run-pass/unique/unique-pat.rs index 8af160b1f56c..c83989def332 100644 --- a/src/test/run-pass/unique-pat.rs +++ b/src/test/ui/run-pass/unique/unique-pat.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_patterns)] #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-rec.rs b/src/test/ui/run-pass/unique/unique-rec.rs similarity index 98% rename from src/test/run-pass/unique-rec.rs rename to src/test/ui/run-pass/unique/unique-rec.rs index aa3fc8f5bb56..0169be9d1390 100644 --- a/src/test/run-pass/unique-rec.rs +++ b/src/test/ui/run-pass/unique/unique-rec.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] struct X { x: isize } diff --git a/src/test/run-pass/unique-send-2.rs b/src/test/ui/run-pass/unique/unique-send-2.rs similarity index 98% rename from src/test/run-pass/unique-send-2.rs rename to src/test/ui/run-pass/unique/unique-send-2.rs index 7a0e585e8b0a..285772b95411 100644 --- a/src/test/run-pass/unique-send-2.rs +++ b/src/test/ui/run-pass/unique/unique-send-2.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // ignore-emscripten no threads support #![feature(box_syntax)] diff --git a/src/test/run-pass/unique-send.rs b/src/test/ui/run-pass/unique/unique-send.rs similarity index 98% rename from src/test/run-pass/unique-send.rs rename to src/test/ui/run-pass/unique/unique-send.rs index 7644da08e4af..d7382749861c 100644 --- a/src/test/run-pass/unique-send.rs +++ b/src/test/ui/run-pass/unique/unique-send.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] use std::sync::mpsc::channel; diff --git a/src/test/run-pass/unique-swap.rs b/src/test/ui/run-pass/unique/unique-swap.rs similarity index 98% rename from src/test/run-pass/unique-swap.rs rename to src/test/ui/run-pass/unique/unique-swap.rs index 6e6fe4e420b2..16090fa1b287 100644 --- a/src/test/run-pass/unique-swap.rs +++ b/src/test/ui/run-pass/unique/unique-swap.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![feature(box_syntax)] use std::mem::swap; diff --git a/src/test/run-pass/unsized-locals/reference-unsized-locals.rs b/src/test/ui/run-pass/unsized-locals/reference-unsized-locals.rs similarity index 97% rename from src/test/run-pass/unsized-locals/reference-unsized-locals.rs rename to src/test/ui/run-pass/unsized-locals/reference-unsized-locals.rs index 6ed39a78648a..8b96c30940f0 100644 --- a/src/test/run-pass/unsized-locals/reference-unsized-locals.rs +++ b/src/test/ui/run-pass/unsized-locals/reference-unsized-locals.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(unsized_locals)] fn main() { diff --git a/src/test/run-pass/unsized-locals/simple-unsized-locals.rs b/src/test/ui/run-pass/unsized-locals/simple-unsized-locals.rs similarity index 97% rename from src/test/run-pass/unsized-locals/simple-unsized-locals.rs rename to src/test/ui/run-pass/unsized-locals/simple-unsized-locals.rs index 0b1aa6225eb5..9643afaee627 100644 --- a/src/test/run-pass/unsized-locals/simple-unsized-locals.rs +++ b/src/test/ui/run-pass/unsized-locals/simple-unsized-locals.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(unsized_locals)] fn main() { diff --git a/src/test/run-pass/unsized-locals/unsized-exprs.rs b/src/test/ui/run-pass/unsized-locals/unsized-exprs.rs similarity index 98% rename from src/test/run-pass/unsized-locals/unsized-exprs.rs rename to src/test/ui/run-pass/unsized-locals/unsized-exprs.rs index 9a5e534db25b..06919a07c756 100644 --- a/src/test/run-pass/unsized-locals/unsized-exprs.rs +++ b/src/test/ui/run-pass/unsized-locals/unsized-exprs.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(unsized_tuple_coercion, unsized_locals)] struct A(X); diff --git a/src/test/run-pass/unsized-locals/unsized-parameters.rs b/src/test/ui/run-pass/unsized-locals/unsized-parameters.rs similarity index 98% rename from src/test/run-pass/unsized-locals/unsized-parameters.rs rename to src/test/ui/run-pass/unsized-locals/unsized-parameters.rs index 0314fe1d6866..82036c5797d7 100644 --- a/src/test/run-pass/unsized-locals/unsized-parameters.rs +++ b/src/test/ui/run-pass/unsized-locals/unsized-parameters.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass + #![feature(unsized_locals)] pub fn f0(_f: dyn FnOnce()) {} diff --git a/src/test/run-pass/auxiliary/where_clauses_xc.rs b/src/test/ui/run-pass/where-clauses/auxiliary/where_clauses_xc.rs similarity index 100% rename from src/test/run-pass/auxiliary/where_clauses_xc.rs rename to src/test/ui/run-pass/where-clauses/auxiliary/where_clauses_xc.rs diff --git a/src/test/run-pass/where-clause-bounds-inconsistency.rs b/src/test/ui/run-pass/where-clauses/where-clause-bounds-inconsistency.rs similarity index 98% rename from src/test/run-pass/where-clause-bounds-inconsistency.rs rename to src/test/ui/run-pass/where-clauses/where-clause-bounds-inconsistency.rs index fa07861d7993..752f8f2252ea 100644 --- a/src/test/run-pass/where-clause-bounds-inconsistency.rs +++ b/src/test/ui/run-pass/where-clauses/where-clause-bounds-inconsistency.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Bound { diff --git a/src/test/run-pass/where-clause-early-bound-lifetimes.rs b/src/test/ui/run-pass/where-clauses/where-clause-early-bound-lifetimes.rs similarity index 94% rename from src/test/run-pass/where-clause-early-bound-lifetimes.rs rename to src/test/ui/run-pass/where-clauses/where-clause-early-bound-lifetimes.rs index b9f605ec548b..4d5a676943ab 100644 --- a/src/test/run-pass/where-clause-early-bound-lifetimes.rs +++ b/src/test/ui/run-pass/where-clauses/where-clause-early-bound-lifetimes.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + // pretty-expanded FIXME #23616 trait TheTrait { fn dummy(&self) { } } diff --git a/src/test/run-pass/where-clause-method-substituion.rs b/src/test/ui/run-pass/where-clauses/where-clause-method-substituion.rs similarity index 98% rename from src/test/run-pass/where-clause-method-substituion.rs rename to src/test/ui/run-pass/where-clauses/where-clause-method-substituion.rs index d7aaa0b2f9ca..3afccab07b73 100644 --- a/src/test/run-pass/where-clause-method-substituion.rs +++ b/src/test/ui/run-pass/where-clauses/where-clause-method-substituion.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 trait Foo { fn dummy(&self, arg: T) { } } diff --git a/src/test/run-pass/where-clause-region-outlives.rs b/src/test/ui/run-pass/where-clauses/where-clause-region-outlives.rs similarity index 98% rename from src/test/run-pass/where-clause-region-outlives.rs rename to src/test/ui/run-pass/where-clauses/where-clause-region-outlives.rs index 60df52bfeb92..445a090d6014 100644 --- a/src/test/run-pass/where-clause-region-outlives.rs +++ b/src/test/ui/run-pass/where-clauses/where-clause-region-outlives.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct A<'a, 'b> where 'a : 'b { x: &'a isize, y: &'b isize } diff --git a/src/test/run-pass/where-clauses-cross-crate.rs b/src/test/ui/run-pass/where-clauses/where-clauses-cross-crate.rs similarity index 98% rename from src/test/run-pass/where-clauses-cross-crate.rs rename to src/test/ui/run-pass/where-clauses/where-clauses-cross-crate.rs index 1b349b25ef3c..0343656061bc 100644 --- a/src/test/run-pass/where-clauses-cross-crate.rs +++ b/src/test/ui/run-pass/where-clauses/where-clauses-cross-crate.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // aux-build:where_clauses_xc.rs extern crate where_clauses_xc; diff --git a/src/test/run-pass/where-clauses-lifetimes.rs b/src/test/ui/run-pass/where-clauses/where-clauses-lifetimes.rs similarity index 98% rename from src/test/run-pass/where-clauses-lifetimes.rs rename to src/test/ui/run-pass/where-clauses/where-clauses-lifetimes.rs index bba20e8e92e6..22b1acb2a60b 100644 --- a/src/test/run-pass/where-clauses-lifetimes.rs +++ b/src/test/ui/run-pass/where-clauses/where-clauses-lifetimes.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 fn foo<'a, I>(mut it: I) where I: Iterator {} diff --git a/src/test/run-pass/where-clauses-method.rs b/src/test/ui/run-pass/where-clauses/where-clauses-method.rs similarity index 98% rename from src/test/run-pass/where-clauses-method.rs rename to src/test/ui/run-pass/where-clauses/where-clauses-method.rs index 29efe727276e..c9930128bbe6 100644 --- a/src/test/run-pass/where-clauses-method.rs +++ b/src/test/ui/run-pass/where-clauses/where-clauses-method.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // Test that a where clause attached to a method allows us to add // additional constraints to a parameter out of scope. diff --git a/src/test/run-pass/where-clauses-unboxed-closures.rs b/src/test/ui/run-pass/where-clauses/where-clauses-unboxed-closures.rs similarity index 98% rename from src/test/run-pass/where-clauses-unboxed-closures.rs rename to src/test/ui/run-pass/where-clauses/where-clauses-unboxed-closures.rs index 8a775caaac6d..c3cfbbda4ea6 100644 --- a/src/test/run-pass/where-clauses-unboxed-closures.rs +++ b/src/test/ui/run-pass/where-clauses/where-clauses-unboxed-closures.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass // pretty-expanded FIXME #23616 struct Bencher; diff --git a/src/test/run-pass/where-clauses.rs b/src/test/ui/run-pass/where-clauses/where-clauses.rs similarity index 98% rename from src/test/run-pass/where-clauses.rs rename to src/test/ui/run-pass/where-clauses/where-clauses.rs index ab1f30c3d142..8f1cf098c307 100644 --- a/src/test/run-pass/where-clauses.rs +++ b/src/test/ui/run-pass/where-clauses/where-clauses.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass trait Equal { fn equal(&self, other: &Self) -> bool; fn equals(&self, this: &T, that: &T, x: &U, y: &U) -> bool diff --git a/src/test/run-pass/zero-size-type-destructors.rs b/src/test/ui/run-pass/zero-sized/zero-size-type-destructors.rs similarity index 94% rename from src/test/run-pass/zero-size-type-destructors.rs rename to src/test/ui/run-pass/zero-sized/zero-size-type-destructors.rs index 18b6c372a5ec..02f8639e832d 100644 --- a/src/test/run-pass/zero-size-type-destructors.rs +++ b/src/test/ui/run-pass/zero-sized/zero-size-type-destructors.rs @@ -8,6 +8,9 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass +#![allow(non_upper_case_globals)] + static mut destructions : isize = 3; pub fn foo() { diff --git a/src/test/run-pass/zero-sized-binary-heap-push.rs b/src/test/ui/run-pass/zero-sized/zero-sized-binary-heap-push.rs similarity index 98% rename from src/test/run-pass/zero-sized-binary-heap-push.rs rename to src/test/ui/run-pass/zero-sized/zero-sized-binary-heap-push.rs index 0866a767934d..4ab329f166a2 100644 --- a/src/test/run-pass/zero-sized-binary-heap-push.rs +++ b/src/test/ui/run-pass/zero-sized/zero-sized-binary-heap-push.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::BinaryHeap; use std::iter::Iterator; diff --git a/src/test/run-pass/zero-sized-btreemap-insert.rs b/src/test/ui/run-pass/zero-sized/zero-sized-btreemap-insert.rs similarity index 98% rename from src/test/run-pass/zero-sized-btreemap-insert.rs rename to src/test/ui/run-pass/zero-sized/zero-sized-btreemap-insert.rs index aff124c30ec6..5e406152d935 100644 --- a/src/test/run-pass/zero-sized-btreemap-insert.rs +++ b/src/test/ui/run-pass/zero-sized/zero-sized-btreemap-insert.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::cmp::{Ord, Ordering, PartialOrd}; use std::collections::BTreeMap; use std::iter::Iterator; diff --git a/src/test/run-pass/zero-sized-linkedlist-push.rs b/src/test/ui/run-pass/zero-sized/zero-sized-linkedlist-push.rs similarity index 99% rename from src/test/run-pass/zero-sized-linkedlist-push.rs rename to src/test/ui/run-pass/zero-sized/zero-sized-linkedlist-push.rs index 9c424854d482..7b0b2f3c3c5d 100644 --- a/src/test/run-pass/zero-sized-linkedlist-push.rs +++ b/src/test/ui/run-pass/zero-sized/zero-sized-linkedlist-push.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::LinkedList; use std::iter::Iterator; diff --git a/src/test/run-pass/zero-sized-tuple-struct.rs b/src/test/ui/run-pass/zero-sized/zero-sized-tuple-struct.rs similarity index 98% rename from src/test/run-pass/zero-sized-tuple-struct.rs rename to src/test/ui/run-pass/zero-sized/zero-sized-tuple-struct.rs index 9625d6a88ac3..2ea517790631 100644 --- a/src/test/run-pass/zero-sized-tuple-struct.rs +++ b/src/test/ui/run-pass/zero-sized/zero-sized-tuple-struct.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass #![allow(unused_assignments)] // Make sure that the constructor args are codegened for zero-sized tuple structs diff --git a/src/test/run-pass/zero-sized-vec-deque-push.rs b/src/test/ui/run-pass/zero-sized/zero-sized-vec-deque-push.rs similarity index 99% rename from src/test/run-pass/zero-sized-vec-deque-push.rs rename to src/test/ui/run-pass/zero-sized/zero-sized-vec-deque-push.rs index d7c7cd28ee44..2fc51f3409f1 100644 --- a/src/test/run-pass/zero-sized-vec-deque-push.rs +++ b/src/test/ui/run-pass/zero-sized/zero-sized-vec-deque-push.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::collections::VecDeque; use std::iter::Iterator; diff --git a/src/test/run-pass/zero-sized-vec-push.rs b/src/test/ui/run-pass/zero-sized/zero-sized-vec-push.rs similarity index 98% rename from src/test/run-pass/zero-sized-vec-push.rs rename to src/test/ui/run-pass/zero-sized/zero-sized-vec-push.rs index e472e9380a36..dd8b717761b3 100644 --- a/src/test/run-pass/zero-sized-vec-push.rs +++ b/src/test/ui/run-pass/zero-sized/zero-sized-vec-push.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +// run-pass use std::iter::Iterator; use std::vec::Vec; diff --git a/src/tools/clippy b/src/tools/clippy index 131c8f86b2b7..cafef7b57620 160000 --- a/src/tools/clippy +++ b/src/tools/clippy @@ -1 +1 @@ -Subproject commit 131c8f86b2b712d4d9b00f486b6c67f97782228a +Subproject commit cafef7b576203f166add9ed143979d9775c25219 diff --git a/src/tools/tidy/src/cargo.rs b/src/tools/tidy/src/cargo.rs index f40fea60f40a..69f61bc248db 100644 --- a/src/tools/tidy/src/cargo.rs +++ b/src/tools/tidy/src/cargo.rs @@ -65,9 +65,8 @@ fn verify(tomlfile: &Path, libfile: &Path, bad: &mut bool) { Some(i) => &toml[i+1..], None => return, }; - let mut lines = deps.lines().peekable(); - while let Some(line) = lines.next() { - if line.starts_with("[") { + for line in deps.lines() { + if line.starts_with('[') { break } diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index d6a2c17d6f6f..f76c2d4e8cc5 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -18,7 +18,7 @@ use std::process::Command; use serde_json; -static LICENSES: &'static [&'static str] = &[ +const LICENSES: &[&str] = &[ "MIT/Apache-2.0", "MIT / Apache-2.0", "Apache-2.0/MIT", @@ -33,7 +33,7 @@ static LICENSES: &'static [&'static str] = &[ /// should be considered bugs. Exceptions are only allowed in Rust /// tooling. It is _crucial_ that no exception crates be dependencies /// of the Rust runtime (std / test). -static EXCEPTIONS: &'static [&'static str] = &[ +const EXCEPTIONS: &[&str] = &[ "mdbook", // MPL2, mdbook "openssl", // BSD+advertising clause, cargo, mdbook "pest", // MPL2, mdbook via handlebars @@ -54,13 +54,13 @@ static EXCEPTIONS: &'static [&'static str] = &[ ]; /// Which crates to check against the whitelist? -static WHITELIST_CRATES: &'static [CrateVersion] = &[ +const WHITELIST_CRATES: &[CrateVersion] = &[ CrateVersion("rustc", "0.0.0"), CrateVersion("rustc_codegen_llvm", "0.0.0"), ]; /// Whitelist of crates rustc is allowed to depend on. Avoid adding to the list if possible. -static WHITELIST: &'static [Crate] = &[ +const WHITELIST: &[Crate] = &[ Crate("aho-corasick"), Crate("arrayvec"), Crate("atty"), @@ -208,12 +208,13 @@ pub fn check(path: &Path, bad: &mut bool) { let dir = t!(dir); // skip our exceptions - if EXCEPTIONS.iter().any(|exception| { + let is_exception = EXCEPTIONS.iter().any(|exception| { dir.path() .to_str() .unwrap() .contains(&format!("src/vendor/{}", exception)) - }) { + }); + if is_exception { continue; } @@ -242,7 +243,7 @@ pub fn check_whitelist(path: &Path, cargo: &Path, bad: &mut bool) { unapproved.append(&mut bad); } - if unapproved.len() > 0 { + if !unapproved.is_empty() { println!("Dependencies not on the whitelist:"); for dep in unapproved { println!("* {}", dep.id_str()); diff --git a/src/tools/tidy/src/errors.rs b/src/tools/tidy/src/errors.rs index 3dccffddf938..9f55d6f9ad63 100644 --- a/src/tools/tidy/src/errors.rs +++ b/src/tools/tidy/src/errors.rs @@ -50,7 +50,7 @@ pub fn check(path: &Path, bad: &mut bool) { } let mut search = line; - while let Some(i) = search.find("E") { + while let Some(i) = search.find('E') { search = &search[i + 1..]; let code = if search.len() > 4 { search[..4].parse::() diff --git a/src/tools/tidy/src/extdeps.rs b/src/tools/tidy/src/extdeps.rs index 761803a45b8b..7f58b440a833 100644 --- a/src/tools/tidy/src/extdeps.rs +++ b/src/tools/tidy/src/extdeps.rs @@ -15,7 +15,7 @@ use std::io::Read; use std::path::Path; /// List of whitelisted sources for packages -static WHITELISTED_SOURCES: &'static [&'static str] = &[ +const WHITELISTED_SOURCES: &[&str] = &[ "\"registry+https://github.com/rust-lang/crates.io-index\"", ]; @@ -29,8 +29,7 @@ pub fn check(path: &Path, bad: &mut bool) { t!(t!(File::open(path)).read_to_string(&mut cargo_lock)); // process each line - let mut lines = cargo_lock.lines(); - while let Some(line) = lines.next() { + for line in cargo_lock.lines() { // consider only source entries if ! line.starts_with("source = ") { @@ -38,8 +37,7 @@ pub fn check(path: &Path, bad: &mut bool) { } // extract source value - let parts: Vec<&str> = line.splitn(2, "=").collect(); - let source = parts[1].trim(); + let source = line.splitn(2, '=').nth(1).unwrap().trim(); // ensure source is whitelisted if !WHITELISTED_SOURCES.contains(&&*source) { diff --git a/src/tools/tidy/src/features.rs b/src/tools/tidy/src/features.rs index 74f66c0a0516..85b123e4af51 100644 --- a/src/tools/tidy/src/features.rs +++ b/src/tools/tidy/src/features.rs @@ -75,7 +75,7 @@ pub fn check(path: &Path, bad: &mut bool, quiet: bool) { return; } - let filen_underscore = filename.replace("-","_").replace(".rs",""); + let filen_underscore = filename.replace('-',"_").replace(".rs",""); let filename_is_gate_test = test_filen_gate(&filen_underscore, &mut features); contents.truncate(0); @@ -88,13 +88,9 @@ pub fn check(path: &Path, bad: &mut bool, quiet: bool) { let gate_test_str = "gate-test-"; - if !line.contains(gate_test_str) { - continue; - } - let feature_name = match line.find(gate_test_str) { Some(i) => { - &line[i+gate_test_str.len()..line[i+1..].find(' ').unwrap_or(line.len())] + line[i+gate_test_str.len()..].splitn(2, ' ').next().unwrap() }, None => continue, }; @@ -133,7 +129,7 @@ pub fn check(path: &Path, bad: &mut bool, quiet: bool) { name); } - if gate_untested.len() > 0 { + if !gate_untested.is_empty() { tidy_error!(bad, "Found {} features without a gate test.", gate_untested.len()); } @@ -259,14 +255,11 @@ pub fn collect_lib_features(base_src_path: &Path) -> Features { map_lib_features(base_src_path, &mut |res, _, _| { - match res { - Ok((name, feature)) => { - if lib_features.get(name).is_some() { - return; - } - lib_features.insert(name.to_owned(), feature); - }, - Err(_) => (), + if let Ok((name, feature)) = res { + if lib_features.contains_key(name) { + return; + } + lib_features.insert(name.to_owned(), feature); } }); lib_features @@ -332,11 +325,11 @@ fn map_lib_features(base_src_path: &Path, f.tracking_issue = find_attr_val(line, "issue") .map(|s| s.parse().unwrap()); } - if line.ends_with("]") { + if line.ends_with(']') { mf(Ok((name, f.clone())), file, i + 1); - } else if !line.ends_with(",") && !line.ends_with("\\") { + } else if !line.ends_with(',') && !line.ends_with('\\') { // We need to bail here because we might have missed the - // end of a stability attribute above because the "]" + // end of a stability attribute above because the ']' // might not have been at the end of the line. // We could then get into the very unfortunate situation that // we continue parsing the file assuming the current stability @@ -394,7 +387,7 @@ fn map_lib_features(base_src_path: &Path, has_gate_test: false, tracking_issue, }; - if line.contains("]") { + if line.contains(']') { mf(Ok((feature_name, feature)), file, i + 1); } else { becoming_feature = Some((feature_name.to_owned(), feature)); diff --git a/src/tools/tidy/src/main.rs b/src/tools/tidy/src/main.rs index 4fe77f8b58fe..22fa954e5fa5 100644 --- a/src/tools/tidy/src/main.rs +++ b/src/tools/tidy/src/main.rs @@ -24,11 +24,8 @@ use std::path::PathBuf; use std::env; fn main() { - let path = env::args_os().skip(1).next().expect("need path to src"); - let path = PathBuf::from(path); - - let cargo = env::args_os().skip(2).next().expect("need path to cargo"); - let cargo = PathBuf::from(cargo); + let path: PathBuf = env::args_os().nth(1).expect("need path to src").into(); + let cargo: PathBuf = env::args_os().nth(2).expect("need path to cargo").into(); let args: Vec = env::args().skip(1).collect(); diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs index 8071f07d8119..69a4c09c2285 100644 --- a/src/tools/tidy/src/pal.rs +++ b/src/tools/tidy/src/pal.rs @@ -50,7 +50,7 @@ use std::path::Path; use std::iter::Iterator; // Paths that may contain platform-specific code -const EXCEPTION_PATHS: &'static [&'static str] = &[ +const EXCEPTION_PATHS: &[&str] = &[ // std crates "src/liballoc_jemalloc", "src/liballoc_system", @@ -88,10 +88,10 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[ ]; pub fn check(path: &Path, bad: &mut bool) { - let ref mut contents = String::new(); + let mut contents = String::new(); // Sanity check that the complex parsing here works - let ref mut saw_target_arch = false; - let ref mut saw_cfg_bang = false; + let mut saw_target_arch = false; + let mut saw_cfg_bang = false; super::walk(path, &mut super::filter_dirs, &mut |file| { let filestr = file.to_string_lossy().replace("\\", "/"); if !filestr.ends_with(".rs") { return } @@ -99,11 +99,11 @@ pub fn check(path: &Path, bad: &mut bool) { let is_exception_path = EXCEPTION_PATHS.iter().any(|s| filestr.contains(&**s)); if is_exception_path { return } - check_cfgs(contents, &file, bad, saw_target_arch, saw_cfg_bang); + check_cfgs(&mut contents, &file, bad, &mut saw_target_arch, &mut saw_cfg_bang); }); - assert!(*saw_target_arch); - assert!(*saw_cfg_bang); + assert!(saw_target_arch); + assert!(saw_cfg_bang); } fn check_cfgs(contents: &mut String, file: &Path, @@ -130,7 +130,7 @@ fn check_cfgs(contents: &mut String, file: &Path, tidy_error!(bad, "{}:{}: platform-specific cfg: {}", file.display(), line, cfg); }; - for (idx, cfg) in cfgs.into_iter() { + for (idx, cfg) in cfgs { // Sanity check that the parsing here works if !*saw_target_arch && cfg.contains("target_arch") { *saw_target_arch = true } if !*saw_cfg_bang && cfg.contains("cfg!") { *saw_cfg_bang = true } @@ -216,7 +216,7 @@ fn parse_cfgs<'a>(contents: &'a str) -> Vec<(usize, &'a str)> { b')' => { depth -= 1; if depth == 0 { - return (i, &contents_from[.. j + 1]); + return (i, &contents_from[..=j]); } } _ => { } diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs index 6b431ccda088..33cd8b5dcd9a 100644 --- a/src/tools/tidy/src/style.rs +++ b/src/tools/tidy/src/style.rs @@ -69,7 +69,7 @@ fn line_is_url(line: &str) -> bool { (EXP_COMMENT_START, "//!") => state = EXP_LINK_LABEL_OR_URL, (EXP_LINK_LABEL_OR_URL, w) - if w.len() >= 4 && w.starts_with("[") && w.ends_with("]:") + if w.len() >= 4 && w.starts_with('[') && w.ends_with("]:") => state = EXP_URL, (EXP_LINK_LABEL_OR_URL, w) @@ -128,13 +128,13 @@ pub fn check(path: &Path, bad: &mut bool) { && !long_line_is_ok(line) { err(&format!("line longer than {} chars", COLS)); } - if line.contains("\t") && !skip_tab { + if line.contains('\t') && !skip_tab { err("tab character"); } - if !skip_end_whitespace && (line.ends_with(" ") || line.ends_with("\t")) { + if !skip_end_whitespace && (line.ends_with(' ') || line.ends_with('\t')) { err("trailing whitespace"); } - if line.contains("\r") && !skip_cr { + if line.contains('\r') && !skip_cr { err("CR character"); } if filename != "style.rs" { diff --git a/src/tools/tidy/src/unstable_book.rs b/src/tools/tidy/src/unstable_book.rs index 62296f73f016..520879df620e 100644 --- a/src/tools/tidy/src/unstable_book.rs +++ b/src/tools/tidy/src/unstable_book.rs @@ -56,12 +56,11 @@ pub fn collect_unstable_feature_names(features: &Features) -> BTreeSet { pub fn collect_unstable_book_section_file_names(dir: &path::Path) -> BTreeSet { fs::read_dir(dir) .expect("could not read directory") - .into_iter() .map(|entry| entry.expect("could not read directory entry")) .filter(dir_entry_is_file) - .map(|entry| entry.file_name().into_string().unwrap()) - .filter(|n| n.ends_with(".md")) - .map(|n| n.trim_right_matches(".md").to_owned()) + .map(|entry| entry.path()) + .filter(|path| path.extension().map(|e| e.to_str().unwrap()) == Some("md")) + .map(|path| path.file_stem().unwrap().to_str().unwrap().into()) .collect() }