Skip to content

Commit 6cc3959

Browse files
authored
Rollup merge of rust-lang#124622 - fmease:yeet-extern-crate-run_make_support, r=jieyouxu
Cleanup: Rid the `rmake` test runners of `extern crate run_make_support;` `run_make_support` is part of the *extern prelude* of `rmake` test runners rendering `extern crate run_make_support` redundant: https://github.com/rust-lang/rust/blob/80451a485b006bd32732c003a54ee7de457d8266/src/tools/compiletest/src/runtest.rs#L3826-L3827 ~~Contains some fmt'ing changes because I've enabled format-on-save in my editor and because we don't run `x fmt` for `rmake` test runners yet (this gets addressed by rust-lang#124613). I can revert those if you'd like me to.~~ (reverted) r? jieyouxu or testing-devex(?) or boostrap(?)
2 parents 490c0d6 + 09aa772 commit 6cc3959

File tree

31 files changed

+0
-55
lines changed

31 files changed

+0
-55
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-
extern crate run_make_support;
7-
86
use std::path::PathBuf;
97

108
use run_make_support::{rustc, aux_build};

tests/run-make/a-b-a-linker-guard/rmake.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// Test that if we build `b` against a version of `a` that has one set of types, it will not run
44
// with a dylib that has a different set of types.
55

6-
extern crate run_make_support;
7-
86
use run_make_support::{run, run_fail, rustc};
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
@@ -1,8 +1,6 @@
11
//! Check that non-trivial `repr(C)` enum in Rust has valid C layout.
22
//@ ignore-cross-compile
33

4-
extern crate run_make_support;
5-
64
use run_make_support::{cc, extra_c_flags, extra_cxx_flags, run, rustc, static_lib};
75

86
pub fn main() {

tests/run-make/artifact-incr-cache-no-obj/rmake.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
//
66
// Fixes: rust-lang/rust#123234
77

8-
extern crate run_make_support;
9-
108
use run_make_support::{rustc, tmp_dir};
119

1210
fn main() {

tests/run-make/artifact-incr-cache/rmake.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
// Also see discussion at
88
// <https://internals.rust-lang.org/t/interaction-between-incremental-compilation-and-emit/20551>
99

10-
extern crate run_make_support;
11-
1210
use run_make_support::{rustc, tmp_dir};
1311

1412
fn main() {

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

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

1515
#![deny(warnings)]
1616

17-
extern crate run_make_support;
18-
1917
use run_make_support::object;
2018
use run_make_support::object::read::archive::ArchiveFile;
2119
use run_make_support::object::read::Object;

tests/run-make/core-no-fp-fmt-parse/rmake.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// This test checks that the core library of Rust can be compiled without enabling
22
// support for formatting and parsing floating-point numbers.
33

4-
extern crate run_make_support;
5-
64
use run_make_support::rustc;
75
use std::path::PathBuf;
86

tests/run-make/cross-lang-lto-riscv-abi/rmake.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
//! which requires extra `target-abi` metadata to be emitted.
33
//@ needs-matching-clang
44
//@ needs-llvm-components riscv
5-
extern crate run_make_support;
65

76
use run_make_support::{bin_name, clang, llvm_readobj, rustc, tmp_dir};
87
use std::{

tests/run-make/exit-code/rmake.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Test that we exit with the correct exit code for successful / unsuccessful / ICE compilations
22

3-
extern crate run_make_support;
4-
53
use run_make_support::{rustc, rustdoc, tmp_dir};
64

75
fn main() {

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

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

33
#[cfg(unix)]
44
extern crate libc;
5-
extern crate run_make_support;
65

76
use run_make_support::{aux_build, tmp_dir};
87
use std::fs;

0 commit comments

Comments
 (0)