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;