Skip to content

Commit bb35b88

Browse files
Rollup merge of #128937 - lqd:clean-rmake-tests, r=jieyouxu
Fix warnings in rmake tests on `x86_64-unknown-linux-gnu` r? `@jieyouxu` This PR fixes some warnings I saw in rmake tests. I didn't deny more warnings in this PR until `@jieyouxu` gives their opinion, but maybe we should actually deny all warnings in `rmake.rs` files? I've also only looked at non-ignored tests on `x86_64-unknown-linux-gnu`, and denying warnings would require a try build for all targets 😓.
2 parents 5b6379a + dcd6170 commit bb35b88

File tree

33 files changed

+49
-83
lines changed

33 files changed

+49
-83
lines changed

tests/run-make/CURRENT_RUSTC_VERSION/rmake.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// Check that the `CURRENT_RUSTC_VERSION` placeholder is correctly replaced by the current
44
// `rustc` version and the `since` property in feature stability gating is properly respected.
55

6-
use std::path::PathBuf;
7-
86
use run_make_support::{aux_build, rfs, rustc, source_root};
97

108
fn main() {

tests/run-make/arguments-non-c-like-enum/rmake.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
use run_make_support::{cc, extra_c_flags, extra_cxx_flags, run, rustc, static_lib_name};
55

66
pub fn main() {
7-
use std::path::Path;
8-
97
rustc().input("nonclike.rs").crate_type("staticlib").run();
108
cc().input("test.c")
119
.input(static_lib_name("nonclike"))

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
//@ ignore-cross-compile
55

6-
use std::fs;
7-
86
use run_make_support::rfs::remove_file;
97
use run_make_support::{cc, extra_c_flags, run, rustc, static_lib_name};
108

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
// FIXME(jieyouxu): check cross-compile setup
88
//@ ignore-cross-compile
99

10-
use std::path::PathBuf;
11-
12-
use run_make_support::{cwd, env_var, llvm_readobj, rfs, run_in_tmpdir, rustc};
10+
use run_make_support::{cwd, env_var, llvm_readobj, rfs, rustc};
1311

1412
fn main() {
1513
let target = env_var("TARGET");

tests/run-make/compressed-debuginfo/rmake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// FIXME: This test isn't comprehensive and isn't covering all possible combinations.
77

8-
use run_make_support::{assert_contains, cmd, llvm_readobj, run_in_tmpdir, rustc};
8+
use run_make_support::{assert_contains, llvm_readobj, run_in_tmpdir, rustc};
99

1010
fn check_compression(compression: &str, to_find: &str) {
1111
run_in_tmpdir(|| {

tests/run-make/const_fn_mir/rmake.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
//@ needs-unwind
44

5-
use run_make_support::{cwd, diff, rustc};
5+
use run_make_support::{diff, rustc};
66

77
fn main() {
88
rustc().input("main.rs").emit("mir").output("dump-actual.mir").run();

tests/run-make/crate-loading/rmake.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
//@ ignore-wasm32
33
//@ ignore-wasm64
44

5-
use run_make_support::rfs::copy;
6-
use run_make_support::{assert_contains, rust_lib_name, rustc};
5+
use run_make_support::{rust_lib_name, rustc};
76

87
fn main() {
98
rustc().input("multiple-dep-versions-1.rs").run();
109
rustc().input("multiple-dep-versions-2.rs").extra_filename("2").metadata("2").run();
1110

12-
let out = rustc()
11+
rustc()
1312
.input("multiple-dep-versions.rs")
1413
.extern_("dependency", rust_lib_name("dependency"))
1514
.extern_("dep_2_reexport", rust_lib_name("dependency2"))

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//@ only-linux
55
//@ ignore-cross-compile
66

7-
use run_make_support::regex::Regex;
87
use run_make_support::{cmd, run_in_tmpdir, rustc};
98

109
fn main() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//@ ignore-cross-compile
22

3-
use run_make_support::{cwd, run, rustc};
3+
use run_make_support::{run, rustc};
44

55
// Attempt to build this dependency tree:
66
//

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// If we used `rustc` the additional '-L rmake_out' option would allow rustc to
1717
// actually find the crate.
1818

19-
use run_make_support::{bare_rustc, rfs, rust_lib_name, rustc};
19+
use run_make_support::{bare_rustc, rust_lib_name, rustc};
2020

2121
fn main() {
2222
rustc().crate_name("a").crate_type("rlib").input("a.rs").arg("--verbose").run();

0 commit comments

Comments
 (0)