tests: update for rfs rename

Author: jieyouxu

tests/run-make/CURRENT_RUSTC_VERSION/rmake.rs

@@ -5,7 +5,7 @@
 
 use std::path::PathBuf;
 
-use run_make_support::{aux_build, fs as rfs, rustc, source_root};
+use run_make_support::{aux_build, rfs, rustc, source_root};
 
 fn main() {
     aux_build().input("stable.rs").emit("metadata").run();

tests/run-make/c-link-to-rust-dylib/rmake.rs

@@ -3,7 +3,7 @@
 
 //@ ignore-cross-compile
 
-use run_make_support::{cc, cwd, dynamic_lib_extension, fs as rfs, is_msvc, run, run_fail, rustc};
+use run_make_support::{cc, cwd, dynamic_lib_extension, is_msvc, rfs, run, run_fail, rustc};
 
 fn main() {
     rustc().input("foo.rs").run();

tests/run-make/c-link-to-rust-staticlib/rmake.rs

@@ -3,7 +3,7 @@
 
 //@ ignore-cross-compile
 
-use run_make_support::fs::remove_file;
+use run_make_support::rfs::remove_file;
 use run_make_support::{cc, extra_c_flags, run, rustc, static_lib_name};
 use std::fs;
 

tests/run-make/cdylib/rmake.rs

@@ -10,7 +10,7 @@
 
 //@ ignore-cross-compile
 
-use run_make_support::{cc, cwd, dynamic_lib_name, fs as rfs, is_msvc, run, rustc};
+use run_make_support::{cc, cwd, dynamic_lib_name, is_msvc, rfs, run, rustc};
 
 fn main() {
     rustc().input("bar.rs").run();

tests/run-make/comment-section/rmake.rs

@@ -9,8 +9,8 @@
 
 use std::path::PathBuf;
 
-use run_make_support::fs as rfs;
 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};
 

tests/run-make/compiler-builtins/rmake.rs

@@ -14,12 +14,12 @@
 
 #![deny(warnings)]
 
-use run_make_support::fs::{read, read_dir};
 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::rfs::{read, read_dir};
 use run_make_support::{cmd, env_var, object};
 use std::collections::HashSet;
 use std::path::PathBuf;

tests/run-make/compiler-lookup-paths/rmake.rs

@@ -9,7 +9,7 @@
 //@ ignore-wasm64
 // Reason: a C compiler is required for build_native_static_lib
 
-use run_make_support::{build_native_static_lib, fs as rfs, rustc, static_lib_name};
+use run_make_support::{build_native_static_lib, rfs, rustc, static_lib_name};
 
 fn main() {
     build_native_static_lib("native");

tests/run-make/const-prop-lint/rmake.rs

@@ -1,6 +1,6 @@
 // Tests that const prop lints interrupting codegen don't leave `.o` files around.
 
-use run_make_support::{cwd, fs as rfs, rustc};
+use run_make_support::{cwd, rfs, rustc};
 
 fn main() {
     rustc().input("input.rs").run_fail().assert_exit_code(1);

tests/run-make/crate-name-priority/rmake.rs

@@ -4,7 +4,7 @@
 // and the compiler flags, and checks that the flag is favoured each time.
 // See https://github.com/rust-lang/rust/pull/15518
 
-use run_make_support::{bin_name, fs as rfs, rustc};
+use run_make_support::{bin_name, rfs, rustc};
 
 fn main() {
     rustc().input("foo.rs").run();

tests/run-make/doctests-keep-binaries/rmake.rs

@@ -1,7 +1,7 @@
 // Check that valid binaries are persisted by running them, regardless of whether the
 // --run or --no-run option is used.
 
-use run_make_support::fs::{create_dir, remove_dir_all};
+use run_make_support::rfs::{create_dir, remove_dir_all};
 use run_make_support::{run, rustc, rustdoc};
 use std::path::Path;
 

tests/run-make/doctests-runtool/rmake.rs

@@ -1,6 +1,6 @@
 // Tests behavior of rustdoc `--runtool`.
 
-use run_make_support::fs::{create_dir, remove_dir_all};
+use run_make_support::rfs::{create_dir, remove_dir_all};
 use run_make_support::{rustc, rustdoc};
 use std::path::PathBuf;
 

tests/run-make/dump-mono-stats/rmake.rs

@@ -4,7 +4,7 @@
 // a specific expected string.
 // See https://github.com/rust-lang/rust/pull/105481
 
-use run_make_support::{cwd, fs as rfs, rustc};
+use run_make_support::{cwd, rfs, rustc};
 
 fn main() {
     rustc()

tests/run-make/dylib-chain/rmake.rs

@@ -8,7 +8,7 @@
 //@ ignore-cross-compile
 // Reason: the compiled binary is executed
 
-use run_make_support::{dynamic_lib_name, fs as rfs, run, run_fail, rustc};
+use run_make_support::{dynamic_lib_name, rfs, run, run_fail, rustc};
 
 fn main() {
     rustc().input("m1.rs").arg("-Cprefer-dynamic").run();

tests/run-make/emit-named-files/rmake.rs

@@ -1,6 +1,6 @@
 use std::path::Path;
 
-use run_make_support::{fs as rfs, rustc};
+use run_make_support::{rfs, rustc};
 
 fn emit_and_check(out_dir: &Path, out_file: &str, format: &str) {
     let out_file = out_dir.join(out_file);

tests/run-make/emit-path-unhashed/rmake.rs

@@ -6,7 +6,7 @@
 // adding a new output type (in this test, metadata).
 // See https://github.com/rust-lang/rust/issues/86044
 
-use run_make_support::{diff, fs as rfs, rustc};
+use run_make_support::{diff, rfs, rustc};
 
 fn main() {
     rfs::create_dir("emit");

tests/run-make/extern-flag-pathless/rmake.rs

@@ -8,7 +8,7 @@
 //@ ignore-cross-compile
 // Reason: the compiled binary is executed
 
-use run_make_support::{dynamic_lib_name, fs as rfs, run, run_fail, rust_lib_name, rustc};
+use run_make_support::{dynamic_lib_name, rfs, run, run_fail, rust_lib_name, rustc};
 
 fn main() {
     rustc().input("bar.rs").crate_type("rlib").crate_type("dylib").arg("-Cprefer-dynamic").run();

tests/run-make/extra-filename-with-temp-outputs/rmake.rs

@@ -6,9 +6,7 @@
 // are named as expected.
 // See https://github.com/rust-lang/rust/pull/15686
 
-use run_make_support::{
-    bin_name, cwd, fs as rfs, has_prefix, has_suffix, rustc, shallow_find_files,
-};
+use run_make_support::{bin_name, cwd, has_prefix, has_suffix, rfs, rustc, shallow_find_files};
 
 fn main() {
     rustc().extra_filename("bar").input("foo.rs").arg("-Csave-temps").run();

tests/run-make/ice-dep-cannot-find-dep/rmake.rs

@@ -16,7 +16,7 @@
 //       If we used `rustc` the additional '-L rmake_out' option would allow rustc to
 //       actually find the crate.
 
-use run_make_support::{bare_rustc, fs as rfs, rust_lib_name, rustc};
+use run_make_support::{bare_rustc, rfs, rust_lib_name, rustc};
 
 fn main() {
     rustc().crate_name("a").crate_type("rlib").input("a.rs").arg("--verbose").run();

tests/run-make/inaccessible-temp-dir/rmake.rs

@@ -24,7 +24,7 @@
 // Reason: `set_readonly` has no effect on directories
 // and does not prevent modification.
 
-use run_make_support::{fs as rfs, rustc, test_while_readonly};
+use run_make_support::{rfs, rustc, test_while_readonly};
 
 fn main() {
     // Create an inaccessible directory.

tests/run-make/incr-prev-body-beyond-eof/rmake.rs

@@ -13,7 +13,7 @@
 //@ ignore-nvptx64-nvidia-cuda
 // FIXME: can't find crate for `std`
 
-use run_make_support::fs as rfs;
+use run_make_support::rfs;
 use run_make_support::rustc;
 
 fn main() {

tests/run-make/incr-test-moved-file/rmake.rs

@@ -14,7 +14,7 @@
 //@ ignore-nvptx64-nvidia-cuda
 // FIXME: can't find crate for 'std'
 
-use run_make_support::{fs as rfs, rust_lib_name, rustc};
+use run_make_support::{rfs, rust_lib_name, rustc};
 
 fn main() {
     rfs::create_dir("incr");

tests/run-make/incremental-debugger-visualizer/rmake.rs

@@ -2,7 +2,7 @@
 // (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::{fs as rfs, invalid_utf8_contains, invalid_utf8_not_contains, rustc};
+use run_make_support::{invalid_utf8_contains, invalid_utf8_not_contains, rfs, rustc};
 use std::io::Read;
 
 fn main() {

tests/run-make/incremental-session-fail/rmake.rs

@@ -4,7 +4,7 @@
 // the ensuing compilation failure is not an ICE.
 // See https://github.com/rust-lang/rust/pull/85698
 
-use run_make_support::{fs as rfs, rustc};
+use run_make_support::{rfs, rustc};
 
 fn main() {
     rfs::create_file("session");

tests/run-make/inline-always-many-cgu/rmake.rs

@@ -1,5 +1,5 @@
-use run_make_support::fs as rfs;
 use run_make_support::regex::Regex;
+use run_make_support::rfs;
 use run_make_support::rustc;
 
 use std::ffi::OsStr;

tests/run-make/intrinsic-unreachable/rmake.rs

@@ -8,7 +8,7 @@
 //@ ignore-windows
 // Reason: Because of Windows exception handling, the code is not necessarily any shorter.
 
-use run_make_support::{fs as rfs, rustc};
+use run_make_support::{rfs, rustc};
 
 fn main() {
     rustc().opt().emit("asm").input("exit-ret.rs").run();

tests/run-make/invalid-library/rmake.rs

@@ -4,7 +4,7 @@
 // one appearing in stderr in this scenario.
 // See https://github.com/rust-lang/rust/pull/12645
 
-use run_make_support::fs as rfs;
+use run_make_support::rfs;
 use run_make_support::{llvm_ar, rustc};
 
 fn main() {

tests/run-make/invalid-so/rmake.rs

@@ -4,7 +4,7 @@
 // explains that the file exists, but that its metadata is incorrect.
 // See https://github.com/rust-lang/rust/pull/88368
 
-use run_make_support::{dynamic_lib_name, fs as rfs, rustc};
+use run_make_support::{dynamic_lib_name, rfs, rustc};
 
 fn main() {
     rfs::create_file(dynamic_lib_name("foo"));

tests/run-make/invalid-staticlib/rmake.rs

@@ -4,7 +4,7 @@
 // an internal compiler error (ICE).
 // See https://github.com/rust-lang/rust/pull/28673
 
-use run_make_support::{fs as rfs, rustc, static_lib_name};
+use run_make_support::{rfs, rustc, static_lib_name};
 
 fn main() {
     rfs::create_file(static_lib_name("foo"));

tests/run-make/issue-107495-archive-permissions/rmake.rs

@@ -3,7 +3,7 @@
 #[cfg(unix)]
 extern crate libc;
 
-use run_make_support::{aux_build, fs as rfs};
+use run_make_support::{aux_build, rfs};
 
 #[cfg(unix)]
 use std::os::unix::fs::PermissionsExt;

tests/run-make/ls-metadata/rmake.rs

@@ -6,7 +6,7 @@
 
 //@ ignore-cross-compile
 
-use run_make_support::fs as rfs;
+use run_make_support::rfs;
 use run_make_support::rustc;
 
 fn main() {

tests/run-make/lto-readonly-lib/rmake.rs

@@ -7,7 +7,7 @@
 
 //@ ignore-cross-compile
 
-use run_make_support::fs as rfs;
+use run_make_support::rfs;
 use run_make_support::{run, rust_lib_name, rustc, test_while_readonly};
 
 fn main() {

tests/run-make/many-crates-but-no-match/rmake.rs

@@ -4,7 +4,7 @@
 // what should be done to fix the issue.
 // See https://github.com/rust-lang/rust/issues/13266
 
-use run_make_support::{fs as rfs, rustc};
+use run_make_support::{rfs, rustc};
 
 fn main() {
     rfs::create_dir("a1");

tests/run-make/mixing-libs/rmake.rs

@@ -6,7 +6,7 @@
 
 //@ ignore-cross-compile
 
-use run_make_support::{dynamic_lib_name, fs as rfs, rustc};
+use run_make_support::{dynamic_lib_name, rfs, rustc};
 
 fn main() {
     rustc().input("rlib.rs").crate_type("rlib").crate_type("dylib").run();

tests/run-make/moved-src-dir-fingerprint-ice/rmake.rs

@@ -17,7 +17,7 @@
 //@ ignore-nvptx64-nvidia-cuda
 // FIXME: can't find crate for 'std'
 
-use run_make_support::{fs as rfs, rust_lib_name, rustc};
+use run_make_support::{rfs, rust_lib_name, rustc};
 
 fn main() {
     rfs::create_dir("incr");

tests/run-make/non-unicode-env/rmake.rs

@@ -1,4 +1,4 @@
-use run_make_support::fs as rfs;
+use run_make_support::rfs;
 use run_make_support::rustc;
 
 fn main() {

tests/run-make/non-unicode-in-incremental-dir/rmake.rs

@@ -1,4 +1,4 @@
-use run_make_support::{fs as rfs, rustc};
+use run_make_support::{rfs, rustc};
 
 fn main() {
     #[cfg(unix)]

tests/run-make/obey-crate-type-flag/rmake.rs

@@ -6,7 +6,7 @@
 //@ ignore-cross-compile
 
 use run_make_support::{
-    cwd, dynamic_lib_name, fs as rfs, has_extension, rust_lib_name, rustc, shallow_find_files,
+    cwd, dynamic_lib_name, has_extension, rfs, rust_lib_name, rustc, shallow_find_files,
 };
 use std::path::Path;
 

tests/run-make/output-filename-conflicts-with-directory/rmake.rs

@@ -4,7 +4,7 @@
 // potentially-confusing linker error.
 // See https://github.com/rust-lang/rust/pull/47203
 
-use run_make_support::{fs as rfs, rustc};
+use run_make_support::{rfs, rustc};
 
 fn main() {
     rfs::create_dir("foo");

tests/run-make/output-filename-overwrites-input/rmake.rs

@@ -4,7 +4,7 @@
 
 //@ ignore-cross-compile
 
-use run_make_support::{fs as rfs, rustc};
+use run_make_support::{rfs, rustc};
 
 fn main() {
     rfs::copy("foo.rs", "foo");

tests/run-make/output-type-permutations/rmake.rs

@@ -5,7 +5,7 @@
 // See https://github.com/rust-lang/rust/pull/12020
 
 use run_make_support::{
-    bin_name, dynamic_lib_name, filename_not_in_denylist, fs as rfs, rust_lib_name, rustc,
+    bin_name, dynamic_lib_name, filename_not_in_denylist, rfs, rust_lib_name, rustc,
     shallow_find_files, static_lib_name,
 };
 use std::path::PathBuf;

tests/run-make/parallel-rustc-no-overwrite/rmake.rs

@@ -5,7 +5,7 @@
 // conflicts. This test uses this flag and checks for successful compilation.
 // See https://github.com/rust-lang/rust/pull/83846
 
-use run_make_support::{fs as rfs, rustc};
+use run_make_support::{rfs, rustc};
 use std::sync::{Arc, Barrier};
 use std::thread;
 

tests/run-make/pgo-branch-weights/rmake.rs

@@ -10,7 +10,7 @@
 //@ needs-profiler-support
 //@ ignore-cross-compile
 
-use run_make_support::{fs as rfs, llvm_filecheck, llvm_profdata, run_with_args, rustc};
+use run_make_support::{llvm_filecheck, llvm_profdata, rfs, run_with_args, rustc};
 use std::path::Path;
 
 fn main() {

tests/run-make/pgo-use/rmake.rs

@@ -9,7 +9,7 @@
 //@ ignore-cross-compile
 
 use run_make_support::{
-    cwd, fs as rfs, has_extension, has_prefix, llvm_filecheck, llvm_profdata, run_with_args, rustc,
+    cwd, has_extension, has_prefix, llvm_filecheck, llvm_profdata, rfs, run_with_args, rustc,
     shallow_find_files,
 };
 

tests/run-make/prefer-dylib/rmake.rs

@@ -1,6 +1,6 @@
 //@ ignore-cross-compile
 
-use run_make_support::{dynamic_lib_name, fs as rfs, run, run_fail, rustc};
+use run_make_support::{dynamic_lib_name, rfs, run, run_fail, rustc};
 
 fn main() {
     rustc().input("bar.rs").crate_type("dylib").crate_type("rlib").arg("-Cprefer-dynamic").run();