diff options
Diffstat (limited to 'tests')
67 files changed, 122 insertions, 111 deletions
diff --git a/tests/assembly/asm/aarch64-outline-atomics.rs b/tests/assembly/asm/aarch64-outline-atomics.rs index bcf0964b722..46586f0f31c 100644 --- a/tests/assembly/asm/aarch64-outline-atomics.rs +++ b/tests/assembly/asm/aarch64-outline-atomics.rs @@ -7,7 +7,8 @@ #![crate_type = "rlib"] -use std::sync::atomic::{AtomicI32, Ordering::*}; +use std::sync::atomic::AtomicI32; +use std::sync::atomic::Ordering::*; pub fn compare_exchange(a: &AtomicI32) { // On AArch64 LLVM should outline atomic operations. diff --git a/tests/codegen/atomic-operations.rs b/tests/codegen/atomic-operations.rs index b1350273542..8a70c94e480 100644 --- a/tests/codegen/atomic-operations.rs +++ b/tests/codegen/atomic-operations.rs @@ -2,7 +2,8 @@ //@ compile-flags: -O #![crate_type = "lib"] -use std::sync::atomic::{AtomicI32, Ordering::*}; +use std::sync::atomic::AtomicI32; +use std::sync::atomic::Ordering::*; // CHECK-LABEL: @compare_exchange #[no_mangle] diff --git a/tests/codegen/intrinsics/transmute.rs b/tests/codegen/intrinsics/transmute.rs index 04a91bb87f7..8c8e975d327 100644 --- a/tests/codegen/intrinsics/transmute.rs +++ b/tests/codegen/intrinsics/transmute.rs @@ -6,11 +6,10 @@ #![feature(custom_mir)] #![allow(unreachable_code)] -use std::intrinsics::{transmute, transmute_unchecked}; -use std::mem::MaybeUninit; - // Some of these need custom MIR to not get removed by MIR optimizations. use std::intrinsics::mir::*; +use std::intrinsics::{transmute, transmute_unchecked}; +use std::mem::MaybeUninit; pub enum ZstNever {} diff --git a/tests/mir-opt/dont_inline_type_id.rs b/tests/mir-opt/dont_inline_type_id.rs index ab748940ac4..d389733457b 100644 --- a/tests/mir-opt/dont_inline_type_id.rs +++ b/tests/mir-opt/dont_inline_type_id.rs @@ -2,8 +2,7 @@ //@ test-mir-pass: Inline //@ compile-flags: --crate-type=lib -C panic=abort -use std::any::Any; -use std::any::TypeId; +use std::any::{Any, TypeId}; struct A<T: ?Sized + 'static> { a: i32, diff --git a/tests/run-make/branch-protection-check-IBT/_rmake.rs b/tests/run-make/branch-protection-check-IBT/_rmake.rs index d66ecf9c005..91151408785 100644 --- a/tests/run-make/branch-protection-check-IBT/_rmake.rs +++ b/tests/run-make/branch-protection-check-IBT/_rmake.rs @@ -8,9 +8,7 @@ //@ ignore-test // FIXME(jieyouxu): see the FIXME in the Makefile -use run_make_support::llvm_readobj; -use run_make_support::rustc; -use run_make_support::{cwd, env_var}; +use run_make_support::{cwd, env_var, llvm_readobj, rustc}; fn main() { let llvm_components = env_var("LLVM_COMPONENTS"); diff --git a/tests/run-make/c-link-to-rust-staticlib/rmake.rs b/tests/run-make/c-link-to-rust-staticlib/rmake.rs index ee35350da66..e21b976035b 100644 --- a/tests/run-make/c-link-to-rust-staticlib/rmake.rs +++ b/tests/run-make/c-link-to-rust-staticlib/rmake.rs @@ -3,9 +3,10 @@ //@ ignore-cross-compile +use std::fs; + use run_make_support::rfs::remove_file; use run_make_support::{cc, extra_c_flags, run, rustc, static_lib_name}; -use std::fs; fn main() { rustc().input("foo.rs").run(); diff --git a/tests/run-make/c-link-to-rust-va-list-fn/checkrust.rs b/tests/run-make/c-link-to-rust-va-list-fn/checkrust.rs index 196c6440747..0a959c3bd88 100644 --- a/tests/run-make/c-link-to-rust-va-list-fn/checkrust.rs +++ b/tests/run-make/c-link-to-rust-va-list-fn/checkrust.rs @@ -1,9 +1,7 @@ #![crate_type = "staticlib"] #![feature(c_variadic)] -use std::ffi::VaList; -use std::ffi::{c_char, c_double, c_int, c_long, c_longlong}; -use std::ffi::{CStr, CString}; +use std::ffi::{c_char, c_double, c_int, c_long, c_longlong, CStr, CString, VaList}; macro_rules! continue_if { ($cond:expr) => { diff --git a/tests/run-make/comment-section/rmake.rs b/tests/run-make/comment-section/rmake.rs index a16adea7162..ecee441b35f 100644 --- a/tests/run-make/comment-section/rmake.rs +++ b/tests/run-make/comment-section/rmake.rs @@ -9,10 +9,7 @@ use std::path::PathBuf; -use run_make_support::llvm_readobj; -use run_make_support::rfs; -use run_make_support::rustc; -use run_make_support::{cwd, env_var, run_in_tmpdir}; +use run_make_support::{cwd, env_var, llvm_readobj, rfs, run_in_tmpdir, rustc}; fn main() { let target = env_var("TARGET"); diff --git a/tests/run-make/compiler-builtins/rmake.rs b/tests/run-make/compiler-builtins/rmake.rs index 43d1d69b245..42ed07d9daf 100644 --- a/tests/run-make/compiler-builtins/rmake.rs +++ b/tests/run-make/compiler-builtins/rmake.rs @@ -14,15 +14,14 @@ #![deny(warnings)] +use std::collections::HashSet; +use std::path::PathBuf; + use run_make_support::object::read::archive::ArchiveFile; use run_make_support::object::read::Object; -use run_make_support::object::ObjectSection; -use run_make_support::object::ObjectSymbol; -use run_make_support::object::RelocationTarget; +use run_make_support::object::{ObjectSection, ObjectSymbol, RelocationTarget}; use run_make_support::rfs::{read, read_dir}; use run_make_support::{cmd, env_var, object}; -use std::collections::HashSet; -use std::path::PathBuf; fn main() { let target_dir = PathBuf::from("target"); diff --git a/tests/run-make/crate-hash-rustc-version/rmake.rs b/tests/run-make/crate-hash-rustc-version/rmake.rs index 97b3dd3931e..c7c36cfdf11 100644 --- a/tests/run-make/crate-hash-rustc-version/rmake.rs +++ b/tests/run-make/crate-hash-rustc-version/rmake.rs @@ -4,8 +4,7 @@ //@ ignore-cross-compile //@ only-unix -use run_make_support::llvm; -use run_make_support::{diff, dynamic_lib_name, is_darwin, run, run_fail, rustc}; +use run_make_support::{diff, dynamic_lib_name, is_darwin, llvm, run, run_fail, rustc}; fn llvm_readobj() -> llvm::LlvmReadobj { let mut cmd = llvm::llvm_readobj(); diff --git a/tests/run-make/cross-lang-lto-riscv-abi/rmake.rs b/tests/run-make/cross-lang-lto-riscv-abi/rmake.rs index f40da662128..391759ec5f6 100644 --- a/tests/run-make/cross-lang-lto-riscv-abi/rmake.rs +++ b/tests/run-make/cross-lang-lto-riscv-abi/rmake.rs @@ -6,13 +6,11 @@ // FIXME(#126180): This test doesn't actually run anywhere, because the only // CI job that sets RUSTBUILD_FORCE_CLANG_BASED_TESTS runs very few tests. +use std::path::PathBuf; +use std::process::{Command, Output}; +use std::{env, str}; + use run_make_support::{bin_name, clang, llvm_readobj, rustc}; -use std::{ - env, - path::PathBuf, - process::{Command, Output}, - str, -}; fn check_target(target: &str, clang_target: &str, carch: &str, is_double_float: bool) { eprintln!("Checking target {target}"); diff --git a/tests/run-make/doctests-keep-binaries/rmake.rs b/tests/run-make/doctests-keep-binaries/rmake.rs index 6bff5c0c8d0..246539bcf82 100644 --- a/tests/run-make/doctests-keep-binaries/rmake.rs +++ b/tests/run-make/doctests-keep-binaries/rmake.rs @@ -1,9 +1,10 @@ // Check that valid binaries are persisted by running them, regardless of whether the // --run or --no-run option is used. +use std::path::Path; + use run_make_support::rfs::{create_dir, remove_dir_all}; use run_make_support::{run, rustc, rustdoc}; -use std::path::Path; fn setup_test_env<F: FnOnce(&Path, &Path)>(callback: F) { let out_dir = Path::new("doctests"); diff --git a/tests/run-make/doctests-runtool/rmake.rs b/tests/run-make/doctests-runtool/rmake.rs index 5d829b9e88b..c7be829c215 100644 --- a/tests/run-make/doctests-runtool/rmake.rs +++ b/tests/run-make/doctests-runtool/rmake.rs @@ -1,8 +1,9 @@ // Tests behavior of rustdoc `--runtool`. +use std::path::PathBuf; + use run_make_support::rfs::{create_dir, remove_dir_all}; use run_make_support::{rustc, rustdoc}; -use std::path::PathBuf; fn mkdir(name: &str) -> PathBuf { let dir = PathBuf::from(name); diff --git a/tests/run-make/emit-shared-files/rmake.rs b/tests/run-make/emit-shared-files/rmake.rs index 33c12310246..8ac9073e993 100644 --- a/tests/run-make/emit-shared-files/rmake.rs +++ b/tests/run-make/emit-shared-files/rmake.rs @@ -5,9 +5,10 @@ // `all-shared` should only emit files that can be shared between crates. // See https://github.com/rust-lang/rust/pull/83478 -use run_make_support::{has_extension, has_prefix, rustdoc, shallow_find_files}; use std::path::Path; +use run_make_support::{has_extension, has_prefix, rustdoc, shallow_find_files}; + fn main() { rustdoc() .arg("-Zunstable-options") diff --git a/tests/run-make/incr-prev-body-beyond-eof/rmake.rs b/tests/run-make/incr-prev-body-beyond-eof/rmake.rs index 14e75671df8..47dce85248a 100644 --- a/tests/run-make/incr-prev-body-beyond-eof/rmake.rs +++ b/tests/run-make/incr-prev-body-beyond-eof/rmake.rs @@ -13,8 +13,7 @@ //@ ignore-nvptx64-nvidia-cuda // FIXME: can't find crate for `std` -use run_make_support::rfs; -use run_make_support::rustc; +use run_make_support::{rfs, rustc}; fn main() { rfs::create_dir("src"); diff --git a/tests/run-make/incremental-debugger-visualizer/rmake.rs b/tests/run-make/incremental-debugger-visualizer/rmake.rs index 985816ff5d7..58a7e415bc5 100644 --- a/tests/run-make/incremental-debugger-visualizer/rmake.rs +++ b/tests/run-make/incremental-debugger-visualizer/rmake.rs @@ -2,9 +2,10 @@ // (in this case, foo.py and foo.natvis) are picked up when compiling incrementally. // See https://github.com/rust-lang/rust/pull/111641 -use run_make_support::{invalid_utf8_contains, invalid_utf8_not_contains, rfs, rustc}; use std::io::Read; +use run_make_support::{invalid_utf8_contains, invalid_utf8_not_contains, rfs, rustc}; + fn main() { rfs::create_file("foo.py"); rfs::write("foo.py", "GDB script v1"); diff --git a/tests/run-make/inline-always-many-cgu/rmake.rs b/tests/run-make/inline-always-many-cgu/rmake.rs index 5a6929c855b..678b949bc70 100644 --- a/tests/run-make/inline-always-many-cgu/rmake.rs +++ b/tests/run-make/inline-always-many-cgu/rmake.rs @@ -1,9 +1,8 @@ -use run_make_support::regex::Regex; -use run_make_support::rfs; -use run_make_support::rustc; - use std::ffi::OsStr; +use run_make_support::regex::Regex; +use run_make_support::{rfs, rustc}; + fn main() { rustc().input("foo.rs").emit("llvm-ir").codegen_units(2).run(); let re = Regex::new(r"\bcall\b").unwrap(); diff --git a/tests/run-make/intrinsic-unreachable/exit-unreachable.rs b/tests/run-make/intrinsic-unreachable/exit-unreachable.rs index d0f193d49ee..4309767e05c 100644 --- a/tests/run-make/intrinsic-unreachable/exit-unreachable.rs +++ b/tests/run-make/intrinsic-unreachable/exit-unreachable.rs @@ -1,7 +1,6 @@ #![feature(core_intrinsics)] #![crate_type = "lib"] use std::arch::asm; - use std::intrinsics; #[allow(unreachable_code)] diff --git a/tests/run-make/invalid-library/rmake.rs b/tests/run-make/invalid-library/rmake.rs index 42afb74a59e..6b3ae1d485a 100644 --- a/tests/run-make/invalid-library/rmake.rs +++ b/tests/run-make/invalid-library/rmake.rs @@ -4,8 +4,7 @@ // one appearing in stderr in this scenario. // See https://github.com/rust-lang/rust/pull/12645 -use run_make_support::rfs; -use run_make_support::{llvm_ar, rustc}; +use run_make_support::{llvm_ar, rfs, rustc}; fn main() { rfs::create_file("lib.rmeta"); diff --git a/tests/run-make/issue-107495-archive-permissions/rmake.rs b/tests/run-make/issue-107495-archive-permissions/rmake.rs index f47b8d7190f..f210b7c737b 100644 --- a/tests/run-make/issue-107495-archive-permissions/rmake.rs +++ b/tests/run-make/issue-107495-archive-permissions/rmake.rs @@ -3,12 +3,12 @@ #[cfg(unix)] extern crate libc; -use run_make_support::{aux_build, rfs}; - #[cfg(unix)] use std::os::unix::fs::PermissionsExt; use std::path::Path; +use run_make_support::{aux_build, rfs}; + fn main() { #[cfg(unix)] unsafe { diff --git a/tests/run-make/lib-trait-for-trait-no-ice/rmake.rs b/tests/run-make/lib-trait-for-trait-no-ice/rmake.rs index 766acfc00da..0c5e12055e8 100644 --- a/tests/run-make/lib-trait-for-trait-no-ice/rmake.rs +++ b/tests/run-make/lib-trait-for-trait-no-ice/rmake.rs @@ -5,9 +5,10 @@ // the lib crate-type flag was actually followed. // See https://github.com/rust-lang/rust/issues/18943 -use run_make_support::{rust_lib_name, rustc}; use std::path::Path; +use run_make_support::{rust_lib_name, rustc}; + fn main() { rustc().input("foo.rs").crate_type("lib").run(); assert!(Path::new(&rust_lib_name("foo")).exists()); diff --git a/tests/run-make/libtest-thread-limit/test.rs b/tests/run-make/libtest-thread-limit/test.rs index 88e8a498ae9..87e1d519171 100644 --- a/tests/run-make/libtest-thread-limit/test.rs +++ b/tests/run-make/libtest-thread-limit/test.rs @@ -1,8 +1,6 @@ -use std::{ - io::ErrorKind, - sync::OnceLock, - thread::{self, Builder, ThreadId}, -}; +use std::io::ErrorKind; +use std::sync::OnceLock; +use std::thread::{self, Builder, ThreadId}; static THREAD_ID: OnceLock<ThreadId> = OnceLock::new(); diff --git a/tests/run-make/llvm-outputs/rmake.rs b/tests/run-make/llvm-outputs/rmake.rs index 2dc3030ca91..b8ac21c98a0 100644 --- a/tests/run-make/llvm-outputs/rmake.rs +++ b/tests/run-make/llvm-outputs/rmake.rs @@ -1,8 +1,9 @@ // test that directories get created when emitting llvm bitcode and IR -use run_make_support::{cwd, run_in_tmpdir, rustc}; use std::path::PathBuf; +use run_make_support::{cwd, run_in_tmpdir, rustc}; + fn main() { let mut path_bc = PathBuf::new(); let mut path_ir = PathBuf::new(); diff --git a/tests/run-make/ls-metadata/rmake.rs b/tests/run-make/ls-metadata/rmake.rs index 45299a48c11..42db97a292b 100644 --- a/tests/run-make/ls-metadata/rmake.rs +++ b/tests/run-make/ls-metadata/rmake.rs @@ -6,8 +6,7 @@ //@ ignore-cross-compile -use run_make_support::rfs; -use run_make_support::rustc; +use run_make_support::{rfs, rustc}; fn main() { rustc().input("foo.rs").run(); diff --git a/tests/run-make/lto-readonly-lib/rmake.rs b/tests/run-make/lto-readonly-lib/rmake.rs index d0ba3fb37a2..b9f0dc21daf 100644 --- a/tests/run-make/lto-readonly-lib/rmake.rs +++ b/tests/run-make/lto-readonly-lib/rmake.rs @@ -7,8 +7,7 @@ //@ ignore-cross-compile -use run_make_support::rfs; -use run_make_support::{run, rust_lib_name, rustc, test_while_readonly}; +use run_make_support::{rfs, run, rust_lib_name, rustc, test_while_readonly}; fn main() { rustc().input("lib.rs").run(); diff --git a/tests/run-make/manual-crate-name/rmake.rs b/tests/run-make/manual-crate-name/rmake.rs index f171f78087c..9085b6c7bc2 100644 --- a/tests/run-make/manual-crate-name/rmake.rs +++ b/tests/run-make/manual-crate-name/rmake.rs @@ -1,6 +1,7 @@ -use run_make_support::rustc; use std::path::Path; +use run_make_support::rustc; + fn main() { rustc().input("bar.rs").crate_name("foo").run(); assert!(Path::new("libfoo.rlib").is_file()); diff --git a/tests/run-make/no-intermediate-extras/rmake.rs b/tests/run-make/no-intermediate-extras/rmake.rs index 0641417504e..0b12da6a01d 100644 --- a/tests/run-make/no-intermediate-extras/rmake.rs +++ b/tests/run-make/no-intermediate-extras/rmake.rs @@ -5,9 +5,10 @@ //@ ignore-cross-compile -use run_make_support::rustc; use std::fs; +use run_make_support::rustc; + fn main() { rustc().crate_type("rlib").arg("--test").input("foo.rs").run(); assert!( diff --git a/tests/run-make/non-unicode-env/rmake.rs b/tests/run-make/non-unicode-env/rmake.rs index 0042e4d1e17..d708192908c 100644 --- a/tests/run-make/non-unicode-env/rmake.rs +++ b/tests/run-make/non-unicode-env/rmake.rs @@ -1,5 +1,4 @@ -use run_make_support::rfs; -use run_make_support::rustc; +use run_make_support::{rfs, rustc}; fn main() { #[cfg(unix)] diff --git a/tests/run-make/obey-crate-type-flag/rmake.rs b/tests/run-make/obey-crate-type-flag/rmake.rs index 8d6eb237982..3fef4b7e65b 100644 --- a/tests/run-make/obey-crate-type-flag/rmake.rs +++ b/tests/run-make/obey-crate-type-flag/rmake.rs @@ -5,10 +5,11 @@ //@ ignore-cross-compile +use std::path::Path; + use run_make_support::{ cwd, dynamic_lib_name, has_extension, rfs, rust_lib_name, rustc, shallow_find_files, }; -use std::path::Path; fn main() { rustc().input("test.rs").run(); diff --git a/tests/run-make/output-type-permutations/rmake.rs b/tests/run-make/output-type-permutations/rmake.rs index c51b2153945..76fd8c1c260 100644 --- a/tests/run-make/output-type-permutations/rmake.rs +++ b/tests/run-make/output-type-permutations/rmake.rs @@ -4,11 +4,12 @@ // files are exactly what is expected, no more, no less. // See https://github.com/rust-lang/rust/pull/12020 +use std::path::PathBuf; + use run_make_support::{ bin_name, dynamic_lib_name, filename_not_in_denylist, rfs, rust_lib_name, rustc, shallow_find_files, static_lib_name, }; -use std::path::PathBuf; // Each test takes 4 arguments: // `must_exist`: output files which must be found - if any are absent, the test fails diff --git a/tests/run-make/parallel-rustc-no-overwrite/rmake.rs b/tests/run-make/parallel-rustc-no-overwrite/rmake.rs index 3f412bfefc8..aa38eb664cf 100644 --- a/tests/run-make/parallel-rustc-no-overwrite/rmake.rs +++ b/tests/run-make/parallel-rustc-no-overwrite/rmake.rs @@ -5,10 +5,11 @@ // conflicts. This test uses this flag and checks for successful compilation. // See https://github.com/rust-lang/rust/pull/83846 -use run_make_support::{rfs, rustc}; use std::sync::{Arc, Barrier}; use std::thread; +use run_make_support::{rfs, rustc}; + fn main() { rfs::create_file("lib.rs"); let barrier = Arc::new(Barrier::new(2)); diff --git a/tests/run-make/pgo-branch-weights/rmake.rs b/tests/run-make/pgo-branch-weights/rmake.rs index 588c5c6dc31..ef33d009dbb 100644 --- a/tests/run-make/pgo-branch-weights/rmake.rs +++ b/tests/run-make/pgo-branch-weights/rmake.rs @@ -10,9 +10,10 @@ //@ needs-profiler-support //@ ignore-cross-compile -use run_make_support::{llvm_filecheck, llvm_profdata, rfs, run_with_args, rustc}; use std::path::Path; +use run_make_support::{llvm_filecheck, llvm_profdata, rfs, run_with_args, rustc}; + fn main() { let path_prof_data_dir = Path::new("prof_data_dir"); let path_merged_profdata = path_prof_data_dir.join("merged.profdata"); diff --git a/tests/run-make/pretty-print-with-dep-file/rmake.rs b/tests/run-make/pretty-print-with-dep-file/rmake.rs index d7a29ff7d19..5d422085834 100644 --- a/tests/run-make/pretty-print-with-dep-file/rmake.rs +++ b/tests/run-make/pretty-print-with-dep-file/rmake.rs @@ -5,9 +5,10 @@ // does not get an unexpected dep-info file. // See https://github.com/rust-lang/rust/issues/112898 -use run_make_support::{invalid_utf8_contains, rfs, rustc}; use std::path::Path; +use run_make_support::{invalid_utf8_contains, rfs, rustc}; + fn main() { rustc().emit("dep-info").arg("-Zunpretty=expanded").input("with-dep.rs").run(); invalid_utf8_contains("with-dep.d", "with-dep.rs"); diff --git a/tests/run-make/profile/rmake.rs b/tests/run-make/profile/rmake.rs index 8d41978baec..4c6f9c19091 100644 --- a/tests/run-make/profile/rmake.rs +++ b/tests/run-make/profile/rmake.rs @@ -8,9 +8,10 @@ //@ ignore-cross-compile //@ needs-profiler-support -use run_make_support::{run, rustc}; use std::path::Path; +use run_make_support::{run, rustc}; + fn main() { rustc().arg("-g").arg("-Zprofile").input("test.rs").run(); run("test"); diff --git a/tests/run-make/relro-levels/rmake.rs b/tests/run-make/relro-levels/rmake.rs index 56545ebc5aa..91d106a03e4 100644 --- a/tests/run-make/relro-levels/rmake.rs +++ b/tests/run-make/relro-levels/rmake.rs @@ -2,8 +2,7 @@ //@ only-linux -use run_make_support::llvm_readobj; -use run_make_support::rustc; +use run_make_support::{llvm_readobj, rustc}; fn compile(relro_level: &str) { rustc().arg(format!("-Crelro-level={relro_level}")).input("hello.rs").run(); diff --git a/tests/run-make/repr128-dwarf/rmake.rs b/tests/run-make/repr128-dwarf/rmake.rs index 824ca6e1876..2fd54c186b9 100644 --- a/tests/run-make/repr128-dwarf/rmake.rs +++ b/tests/run-make/repr128-dwarf/rmake.rs @@ -1,13 +1,14 @@ //@ ignore-windows // This test should be replaced with one in tests/debuginfo once GDB or LLDB support 128-bit enums. -use gimli::{AttributeValue, EndianRcSlice, Reader, RunTimeEndian}; -use object::{Object, ObjectSection}; -use run_make_support::{gimli, object, rfs, rustc}; use std::collections::HashMap; use std::path::PathBuf; use std::rc::Rc; +use gimli::{AttributeValue, EndianRcSlice, Reader, RunTimeEndian}; +use object::{Object, ObjectSection}; +use run_make_support::{gimli, object, rfs, rustc}; + fn main() { let output = PathBuf::from("repr128"); rustc().input("main.rs").output(&output).arg("-Cdebuginfo=2").run(); diff --git a/tests/run-make/reset-codegen-1/rmake.rs b/tests/run-make/reset-codegen-1/rmake.rs index cc6bb7d5e39..d19907a675e 100644 --- a/tests/run-make/reset-codegen-1/rmake.rs +++ b/tests/run-make/reset-codegen-1/rmake.rs @@ -7,9 +7,10 @@ //@ ignore-cross-compile -use run_make_support::{bin_name, rfs, rustc}; use std::path::Path; +use run_make_support::{bin_name, rfs, rustc}; + fn compile(output_file: &str, emit: Option<&str>) { let mut rustc = rustc(); let rustc = rustc.codegen_units(4).output(output_file).input("foo.rs"); diff --git a/tests/run-make/resolve-rename/rmake.rs b/tests/run-make/resolve-rename/rmake.rs index 16ee7b02885..21ec7f85274 100644 --- a/tests/run-make/resolve-rename/rmake.rs +++ b/tests/run-make/resolve-rename/rmake.rs @@ -5,8 +5,7 @@ // the renamed library. // See https://github.com/rust-lang/rust/pull/49253 -use run_make_support::rfs; -use run_make_support::rustc; +use run_make_support::{rfs, rustc}; fn main() { rustc().extra_filename("-hash").input("foo.rs").run(); diff --git a/tests/run-make/rust-lld-by-default-beta-stable/rmake.rs b/tests/run-make/rust-lld-by-default-beta-stable/rmake.rs index fc3dffdbaf4..2417a4274e4 100644 --- a/tests/run-make/rust-lld-by-default-beta-stable/rmake.rs +++ b/tests/run-make/rust-lld-by-default-beta-stable/rmake.rs @@ -4,9 +4,10 @@ //@ ignore-nightly //@ only-x86_64-unknown-linux-gnu +use std::process::Output; + use run_make_support::regex::Regex; use run_make_support::rustc; -use std::process::Output; fn main() { // A regular compilation should not use rust-lld by default. We'll check that by asking the diff --git a/tests/run-make/rust-lld-by-default-nightly/rmake.rs b/tests/run-make/rust-lld-by-default-nightly/rmake.rs index f3ce9ada157..79424984c21 100644 --- a/tests/run-make/rust-lld-by-default-nightly/rmake.rs +++ b/tests/run-make/rust-lld-by-default-nightly/rmake.rs @@ -6,9 +6,10 @@ //@ ignore-stable //@ only-x86_64-unknown-linux-gnu +use std::process::Output; + use run_make_support::regex::Regex; use run_make_support::rustc; -use std::process::Output; fn main() { // A regular compilation should use rust-lld by default. We'll check that by asking the linker diff --git a/tests/run-make/rust-lld-custom-target/rmake.rs b/tests/run-make/rust-lld-custom-target/rmake.rs index f3dc2275f62..17247125521 100644 --- a/tests/run-make/rust-lld-custom-target/rmake.rs +++ b/tests/run-make/rust-lld-custom-target/rmake.rs @@ -8,9 +8,10 @@ //@ needs-rust-lld //@ only-x86_64-unknown-linux-gnu +use std::process::Output; + use run_make_support::regex::Regex; use run_make_support::rustc; -use std::process::Output; fn main() { // Compile to a custom target spec with rust-lld enabled by default. We'll check that by asking diff --git a/tests/run-make/rust-lld/rmake.rs b/tests/run-make/rust-lld/rmake.rs index 3eb60367c7f..87477c12230 100644 --- a/tests/run-make/rust-lld/rmake.rs +++ b/tests/run-make/rust-lld/rmake.rs @@ -5,9 +5,10 @@ //@ ignore-msvc //@ ignore-s390x lld does not yet support s390x as target +use std::process::Output; + use run_make_support::regex::Regex; use run_make_support::rustc; -use std::process::Output; fn main() { // Opt-in to lld and the self-contained linker, to link with rust-lld. We'll check that by diff --git a/tests/run-make/rustdoc-determinism/rmake.rs b/tests/run-make/rustdoc-determinism/rmake.rs index 2d4f357d681..aa8090174d9 100644 --- a/tests/run-make/rustdoc-determinism/rmake.rs +++ b/tests/run-make/rustdoc-determinism/rmake.rs @@ -1,9 +1,10 @@ // Assert that the search index is generated deterministically, regardless of the // order that crates are documented in. -use run_make_support::{diff, rustdoc}; use std::path::Path; +use run_make_support::{diff, rustdoc}; + fn main() { let foo_first = Path::new("foo_first"); rustdoc().input("foo.rs").output(&foo_first).run(); diff --git a/tests/run-make/rustdoc-io-error/rmake.rs b/tests/run-make/rustdoc-io-error/rmake.rs index 69afea40162..d64c5106ffb 100644 --- a/tests/run-make/rustdoc-io-error/rmake.rs +++ b/tests/run-make/rustdoc-io-error/rmake.rs @@ -14,9 +14,10 @@ // `mkfs.ext4 -d`, as well as mounting a loop device for the rootfs. //@ ignore-windows - the `set_readonly` functions doesn't work on folders. -use run_make_support::{path, rustdoc}; use std::fs; +use run_make_support::{path, rustdoc}; + fn main() { let out_dir = path("rustdoc-io-error"); let output = fs::create_dir(&out_dir).unwrap(); diff --git a/tests/run-make/rustdoc-output-path/rmake.rs b/tests/run-make/rustdoc-output-path/rmake.rs index 28e0fd98f93..3c1ccd3a069 100644 --- a/tests/run-make/rustdoc-output-path/rmake.rs +++ b/tests/run-make/rustdoc-output-path/rmake.rs @@ -1,8 +1,9 @@ // Checks that if the output folder doesn't exist, rustdoc will create it. -use run_make_support::rustdoc; use std::path::Path; +use run_make_support::rustdoc; + fn main() { let out_dir = Path::new("foo/bar/doc"); rustdoc().input("foo.rs").output(&out_dir).run(); diff --git a/tests/run-make/rustdoc-scrape-examples-remap/scrape.rs b/tests/run-make/rustdoc-scrape-examples-remap/scrape.rs index 3feee78f2e1..4badc68845e 100644 --- a/tests/run-make/rustdoc-scrape-examples-remap/scrape.rs +++ b/tests/run-make/rustdoc-scrape-examples-remap/scrape.rs @@ -1,6 +1,7 @@ -use run_make_support::{htmldocck, rfs, rustc, rustdoc, source_root}; use std::path::Path; +use run_make_support::{htmldocck, rfs, rustc, rustdoc, source_root}; + pub fn scrape(extra_args: &[&str]) { let out_dir = Path::new("rustdoc"); let crate_name = "foobar"; diff --git a/tests/run-make/rustdoc-test-args/rmake.rs b/tests/run-make/rustdoc-test-args/rmake.rs index 69dea83de4f..fddb3795402 100644 --- a/tests/run-make/rustdoc-test-args/rmake.rs +++ b/tests/run-make/rustdoc-test-args/rmake.rs @@ -1,7 +1,8 @@ -use run_make_support::{rfs, rustdoc}; use std::iter; use std::path::Path; +use run_make_support::{rfs, rustdoc}; + fn generate_a_lot_of_cfgs(path: &Path) { let content = iter::repeat("--cfg=a\n").take(100_000).collect::<String>(); rfs::write(path, content.as_bytes()); diff --git a/tests/run-make/rustdoc-themes/rmake.rs b/tests/run-make/rustdoc-themes/rmake.rs index 981db358f29..8a961beb9f7 100644 --- a/tests/run-make/rustdoc-themes/rmake.rs +++ b/tests/run-make/rustdoc-themes/rmake.rs @@ -1,8 +1,9 @@ // Test that rustdoc will properly load in a theme file and display it in the theme selector. -use run_make_support::{htmldocck, rfs, rustdoc, source_root}; use std::path::Path; +use run_make_support::{htmldocck, rfs, rustdoc, source_root}; + fn main() { let out_dir = Path::new("rustdoc-themes"); let test_css = "test.css"; diff --git a/tests/run-make/rustdoc-verify-output-files/rmake.rs b/tests/run-make/rustdoc-verify-output-files/rmake.rs index d1ff2e330f5..a4d4050b745 100644 --- a/tests/run-make/rustdoc-verify-output-files/rmake.rs +++ b/tests/run-make/rustdoc-verify-output-files/rmake.rs @@ -1,7 +1,6 @@ -use run_make_support::rfs; use std::path::{Path, PathBuf}; -use run_make_support::{assert_dirs_are_equal, rustdoc}; +use run_make_support::{assert_dirs_are_equal, rfs, rustdoc}; #[derive(PartialEq)] enum JsonOutput { diff --git a/tests/run-make/static-pie/rmake.rs b/tests/run-make/static-pie/rmake.rs index 6a92f92328e..74f86bb8163 100644 --- a/tests/run-make/static-pie/rmake.rs +++ b/tests/run-make/static-pie/rmake.rs @@ -7,10 +7,8 @@ use std::process::Command; -use run_make_support::llvm_readobj; use run_make_support::regex::Regex; -use run_make_support::rustc; -use run_make_support::{cmd, run_with_args, target}; +use run_make_support::{cmd, llvm_readobj, run_with_args, rustc, target}; // Minimum major versions supporting -static-pie const GCC_VERSION: u32 = 8; diff --git a/tests/run-make/stdin-rustc/rmake.rs b/tests/run-make/stdin-rustc/rmake.rs index d599f813563..68e9cf2fbd8 100644 --- a/tests/run-make/stdin-rustc/rmake.rs +++ b/tests/run-make/stdin-rustc/rmake.rs @@ -1,8 +1,9 @@ //! This test checks rustc `-` (stdin) support -use run_make_support::{is_windows, rustc}; use std::path::PathBuf; +use run_make_support::{is_windows, rustc}; + const HELLO_WORLD: &str = r#" fn main() { println!("Hello world!"); diff --git a/tests/run-make/stdin-rustdoc/rmake.rs b/tests/run-make/stdin-rustdoc/rmake.rs index a72fe1bc7da..de47a24fbdd 100644 --- a/tests/run-make/stdin-rustdoc/rmake.rs +++ b/tests/run-make/stdin-rustdoc/rmake.rs @@ -1,8 +1,9 @@ //! This test checks rustdoc `-` (stdin) handling -use run_make_support::rustdoc; use std::path::PathBuf; +use run_make_support::rustdoc; + static INPUT: &str = r#" //! ``` //! dbg!(()); diff --git a/tests/run-make/suspicious-library/rmake.rs b/tests/run-make/suspicious-library/rmake.rs index e789607482b..1dc9bc53b67 100644 --- a/tests/run-make/suspicious-library/rmake.rs +++ b/tests/run-make/suspicious-library/rmake.rs @@ -3,9 +3,10 @@ //@ ignore-cross-compile -use run_make_support::{dynamic_lib_name, rustc}; use std::fs::File; +use run_make_support::{dynamic_lib_name, rustc}; + fn main() { rustc().input("foo.rs").arg("-Cprefer-dynamic").run(); File::create(dynamic_lib_name("foo-something-special")).unwrap(); diff --git a/tests/run-make/thumb-none-qemu/example/src/main.rs b/tests/run-make/thumb-none-qemu/example/src/main.rs index 2abfde8e75f..4b8162c4120 100644 --- a/tests/run-make/thumb-none-qemu/example/src/main.rs +++ b/tests/run-make/thumb-none-qemu/example/src/main.rs @@ -1,11 +1,10 @@ #![no_main] #![no_std] use core::fmt::Write; + use cortex_m::asm; use cortex_m_rt::entry; -use cortex_m_semihosting as semihosting; - -use panic_halt as _; +use {cortex_m_semihosting as semihosting, panic_halt as _}; #[entry] fn main() -> ! { diff --git a/tests/run-make/volatile-intrinsics/rmake.rs b/tests/run-make/volatile-intrinsics/rmake.rs index 66bc6f953c2..1d19b652143 100644 --- a/tests/run-make/volatile-intrinsics/rmake.rs +++ b/tests/run-make/volatile-intrinsics/rmake.rs @@ -1,7 +1,6 @@ //@ ignore-cross-compile -use run_make_support::rfs; -use run_make_support::{assert_contains, run, rustc}; +use run_make_support::{assert_contains, rfs, run, rustc}; fn main() { // The tests must pass... diff --git a/tests/run-make/wasm-custom-section/rmake.rs b/tests/run-make/wasm-custom-section/rmake.rs index 756a72f11b1..ff4c29a9d30 100644 --- a/tests/run-make/wasm-custom-section/rmake.rs +++ b/tests/run-make/wasm-custom-section/rmake.rs @@ -1,8 +1,9 @@ //@ only-wasm32-wasip1 -use run_make_support::{rfs, rustc, wasmparser}; use std::collections::HashMap; +use run_make_support::{rfs, rustc, wasmparser}; + fn main() { rustc().input("foo.rs").target("wasm32-wasip1").run(); rustc().input("bar.rs").target("wasm32-wasip1").arg("-Clto").opt().run(); diff --git a/tests/run-make/wasm-custom-sections-opt/rmake.rs b/tests/run-make/wasm-custom-sections-opt/rmake.rs index 0be863fdb6e..063a4f2257c 100644 --- a/tests/run-make/wasm-custom-sections-opt/rmake.rs +++ b/tests/run-make/wasm-custom-sections-opt/rmake.rs @@ -1,9 +1,10 @@ //@ only-wasm32-wasip1 -use run_make_support::{rfs, rustc, wasmparser}; use std::collections::HashMap; use std::path::Path; +use run_make_support::{rfs, rustc, wasmparser}; + fn main() { rustc().input("foo.rs").target("wasm32-wasip1").opt().run(); diff --git a/tests/run-make/wasm-export-all-symbols/rmake.rs b/tests/run-make/wasm-export-all-symbols/rmake.rs index 9ea541a1752..4148cc29ec2 100644 --- a/tests/run-make/wasm-export-all-symbols/rmake.rs +++ b/tests/run-make/wasm-export-all-symbols/rmake.rs @@ -1,8 +1,9 @@ //@ only-wasm32-wasip1 -use run_make_support::{rfs, rustc, wasmparser}; use std::collections::HashMap; use std::path::Path; + +use run_make_support::{rfs, rustc, wasmparser}; use wasmparser::ExternalKind::*; fn main() { diff --git a/tests/run-make/wasm-import-module/rmake.rs b/tests/run-make/wasm-import-module/rmake.rs index c240d4780b2..3b74cb20558 100644 --- a/tests/run-make/wasm-import-module/rmake.rs +++ b/tests/run-make/wasm-import-module/rmake.rs @@ -1,7 +1,8 @@ //@ only-wasm32-wasip1 -use run_make_support::{rfs, rustc, wasmparser}; use std::collections::HashMap; + +use run_make_support::{rfs, rustc, wasmparser}; use wasmparser::TypeRef::Func; fn main() { diff --git a/tests/run-make/wasm-spurious-import/rmake.rs b/tests/run-make/wasm-spurious-import/rmake.rs index 9cfd202eae1..8fde8d295c7 100644 --- a/tests/run-make/wasm-spurious-import/rmake.rs +++ b/tests/run-make/wasm-spurious-import/rmake.rs @@ -1,8 +1,9 @@ //@ only-wasm32-wasip1 -use run_make_support::{rfs, rustc, wasmparser}; use std::collections::HashMap; +use run_make_support::{rfs, rustc, wasmparser}; + fn main() { rustc() .input("main.rs") diff --git a/tests/run-make/wasm-symbols-different-module/rmake.rs b/tests/run-make/wasm-symbols-different-module/rmake.rs index 6b69f76ee17..3cd459db02f 100644 --- a/tests/run-make/wasm-symbols-different-module/rmake.rs +++ b/tests/run-make/wasm-symbols-different-module/rmake.rs @@ -1,9 +1,10 @@ //@ only-wasm32-wasip1 -use run_make_support::{rfs, rustc, wasmparser}; use std::collections::{HashMap, HashSet}; use std::path::Path; +use run_make_support::{rfs, rustc, wasmparser}; + fn main() { test_file("foo.rs", &[("a", &["foo"]), ("b", &["foo"])]); test_file("bar.rs", &[("m1", &["f", "g"]), ("m2", &["f"])]); diff --git a/tests/run-make/wasm-symbols-not-exported/rmake.rs b/tests/run-make/wasm-symbols-not-exported/rmake.rs index ad31351ba95..0b9c9c6822e 100644 --- a/tests/run-make/wasm-symbols-not-exported/rmake.rs +++ b/tests/run-make/wasm-symbols-not-exported/rmake.rs @@ -1,8 +1,9 @@ //@ only-wasm32-wasip1 -use run_make_support::{rfs, rustc, wasmparser}; use std::path::Path; +use run_make_support::{rfs, rustc, wasmparser}; + fn main() { rustc().input("foo.rs").target("wasm32-wasip1").run(); verify_symbols(Path::new("foo.wasm")); diff --git a/tests/run-make/wasm-symbols-not-imported/rmake.rs b/tests/run-make/wasm-symbols-not-imported/rmake.rs index 36c600c49f5..fc22e31356a 100644 --- a/tests/run-make/wasm-symbols-not-imported/rmake.rs +++ b/tests/run-make/wasm-symbols-not-imported/rmake.rs @@ -1,8 +1,9 @@ //@ only-wasm32-wasip1 -use run_make_support::{rfs, rustc, wasmparser}; use std::path::Path; +use run_make_support::{rfs, rustc, wasmparser}; + fn main() { rustc().input("foo.rs").target("wasm32-wasip1").run(); verify_symbols(Path::new("foo.wasm")); diff --git a/tests/run-make/weird-output-filenames/rmake.rs b/tests/run-make/weird-output-filenames/rmake.rs index 3d1b5f4007c..9e451f7d7eb 100644 --- a/tests/run-make/weird-output-filenames/rmake.rs +++ b/tests/run-make/weird-output-filenames/rmake.rs @@ -1,6 +1,5 @@ use run_make_support::regex::Regex; -use run_make_support::rfs; -use run_make_support::{cwd, rustc}; +use run_make_support::{cwd, rfs, rustc}; fn main() { let invalid_characters = [".foo.rs", ".foo.bar", "+foo+bar.rs"]; diff --git a/tests/run-make/windows-binary-no-external-deps/rmake.rs b/tests/run-make/windows-binary-no-external-deps/rmake.rs index 61fdb202221..1706d757c3a 100644 --- a/tests/run-make/windows-binary-no-external-deps/rmake.rs +++ b/tests/run-make/windows-binary-no-external-deps/rmake.rs @@ -2,10 +2,11 @@ //! a "hello world" application by setting `PATH` to `C:\Windows\System32`. //@ only-windows -use run_make_support::{cwd, env_var, rustc}; use std::path::PathBuf; use std::process::Command; +use run_make_support::{cwd, env_var, rustc}; + fn main() { rustc().input("hello.rs").run(); diff --git a/tests/run-make/windows-ws2_32/rmake.rs b/tests/run-make/windows-ws2_32/rmake.rs index 6457d74f97e..1e426a8bffa 100644 --- a/tests/run-make/windows-ws2_32/rmake.rs +++ b/tests/run-make/windows-ws2_32/rmake.rs @@ -2,7 +2,8 @@ // Tests that WS2_32.dll is not unnecessarily linked, see issue #85441 -use run_make_support::object::{self, read::Object}; +use run_make_support::object::read::Object; +use run_make_support::object::{self}; use run_make_support::{rfs, rustc}; fn main() { diff --git a/tests/rustdoc-json/primitives/use_primitive.rs b/tests/rustdoc-json/primitives/use_primitive.rs index e97db42705f..27394a688c4 100644 --- a/tests/rustdoc-json/primitives/use_primitive.rs +++ b/tests/rustdoc-json/primitives/use_primitive.rs @@ -15,6 +15,5 @@ mod usize {} //@ is "$.index[*].inner.import[?(@.name=='my_i32')].id" null pub use i32 as my_i32; - //@ is "$.index[*].inner.import[?(@.name=='u32')].id" null pub use u32; |