Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cleanup: Rid the rmake test runners of extern crate run_make_support; #124622

Merged
merged 1 commit into from
May 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions tests/run-make/CURRENT_RUSTC_VERSION/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
// Check that the `CURRENT_RUSTC_VERSION` placeholder is correctly replaced by the current
// `rustc` version and the `since` property in feature stability gating is properly respected.

extern crate run_make_support;

use std::path::PathBuf;

use run_make_support::{rustc, aux_build};
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/a-b-a-linker-guard/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
// Test that if we build `b` against a version of `a` that has one set of types, it will not run
// with a dylib that has a different set of types.

extern crate run_make_support;

use run_make_support::{run, run_fail, rustc};

fn main() {
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/arguments-non-c-like-enum/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//! Check that non-trivial `repr(C)` enum in Rust has valid C layout.
//@ ignore-cross-compile

extern crate run_make_support;

use run_make_support::{cc, extra_c_flags, extra_cxx_flags, run, rustc, static_lib};

pub fn main() {
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/artifact-incr-cache-no-obj/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
//
// Fixes: rust-lang/rust#123234

extern crate run_make_support;

use run_make_support::{rustc, tmp_dir};

fn main() {
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/artifact-incr-cache/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
// Also see discussion at
// <https://internals.rust-lang.org/t/interaction-between-incremental-compilation-and-emit/20551>

extern crate run_make_support;

use run_make_support::{rustc, tmp_dir};

fn main() {
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/compiler-builtins/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@

#![deny(warnings)]

extern crate run_make_support;

use run_make_support::object;
use run_make_support::object::read::archive::ArchiveFile;
use run_make_support::object::read::Object;
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/core-no-fp-fmt-parse/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
// This test checks that the core library of Rust can be compiled without enabling
// support for formatting and parsing floating-point numbers.

extern crate run_make_support;

use run_make_support::rustc;
use std::path::PathBuf;

Expand Down
1 change: 0 additions & 1 deletion tests/run-make/cross-lang-lto-riscv-abi/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
//! which requires extra `target-abi` metadata to be emitted.
//@ needs-matching-clang
//@ needs-llvm-components riscv
extern crate run_make_support;

use run_make_support::{bin_name, clang, llvm_readobj, rustc, tmp_dir};
use std::{
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/exit-code/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
// Test that we exit with the correct exit code for successful / unsuccessful / ICE compilations

extern crate run_make_support;

use run_make_support::{rustc, rustdoc, tmp_dir};

fn main() {
Expand Down
1 change: 0 additions & 1 deletion tests/run-make/issue-107495-archive-permissions/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

#[cfg(unix)]
extern crate libc;
extern crate run_make_support;

use run_make_support::{aux_build, tmp_dir};
use std::fs;
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/no-input-file/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
extern crate run_make_support;

use run_make_support::{diff, rustc};

fn main() {
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/non-unicode-env/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
extern crate run_make_support;

use run_make_support::rustc;

fn main() {
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/non-unicode-in-incremental-dir/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
extern crate run_make_support;

use run_make_support::{rustc, tmp_dir};

fn main() {
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/print-cfg/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
//!
//! It also checks that some targets have the correct set cfgs.

extern crate run_make_support;

use std::collections::HashSet;
use std::ffi::OsString;
use std::io::BufRead;
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/print-native-static-libs/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
//@ ignore-cross-compile
//@ ignore-wasm

extern crate run_make_support;

use std::io::BufRead;

use run_make_support::{rustc, is_msvc};
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/print-to-output/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//! This checks the output of some `--print` options when
//! output to a file (instead of stdout)

extern crate run_make_support;

use std::ffi::OsString;

use run_make_support::{rustc, target, tmp_dir};
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/repr128-dwarf/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ ignore-windows
// This test should be replaced with one in tests/debuginfo once GDB or LLDB support 128-bit enums.

extern crate run_make_support;

use gimli::{AttributeValue, Dwarf, EndianRcSlice, Reader, RunTimeEndian};
use object::{Object, ObjectSection};
use run_make_support::{gimli, object, rustc, tmp_dir};
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/rust-lld-custom-target/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
//@ needs-rust-lld
//@ only-x86_64-unknown-linux-gnu

extern crate run_make_support;

use run_make_support::regex::Regex;
use run_make_support::rustc;
use std::process::Output;
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/rust-lld/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
//@ ignore-msvc
//@ ignore-s390x lld does not yet support s390x as target

extern crate run_make_support;

use run_make_support::regex::Regex;
use run_make_support::rustc;
use std::process::Output;
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/rustdoc-test-args/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
extern crate run_make_support;

use run_make_support::{rustdoc, tmp_dir};
use std::path::Path;
use std::{fs, iter};
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/wasm-abi/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ only-wasm32-wasip1
//@ needs-wasmtime

extern crate run_make_support;

use run_make_support::{rustc, tmp_dir};
use std::path::Path;
use std::process::Command;
Expand Down
1 change: 0 additions & 1 deletion tests/run-make/wasm-custom-section/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//@ only-wasm32-wasip1
extern crate run_make_support;

use run_make_support::{rustc, tmp_dir, wasmparser};
use std::collections::HashMap;
Expand Down
1 change: 0 additions & 1 deletion tests/run-make/wasm-custom-sections-opt/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//@ only-wasm32-wasip1
extern crate run_make_support;

use run_make_support::{tmp_dir, wasmparser, rustc};
use std::collections::HashMap;
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/wasm-export-all-symbols/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//@ only-wasm32-wasip1

extern crate run_make_support;

use run_make_support::{tmp_dir, wasmparser, rustc};
use std::collections::HashMap;
use std::path::Path;
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/wasm-import-module/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//@ only-wasm32-wasip1

extern crate run_make_support;

use run_make_support::{tmp_dir, wasmparser, rustc};
use std::collections::HashMap;
use wasmparser::TypeRef::Func;
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/wasm-panic-small/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ only-wasm32-wasip1
#![deny(warnings)]

extern crate run_make_support;

use run_make_support::{rustc, tmp_dir};

fn main() {
Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/wasm-spurious-import/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//@ only-wasm32-wasip1

extern crate run_make_support;

use run_make_support::{rustc, tmp_dir, wasmparser};
use std::collections::HashMap;

Expand Down
2 changes: 0 additions & 2 deletions tests/run-make/wasm-stringify-ints-small/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//@ only-wasm32-wasip1
#![deny(warnings)]

extern crate run_make_support;

use run_make_support::{rustc, tmp_dir};

fn main() {
Expand Down
1 change: 0 additions & 1 deletion tests/run-make/wasm-symbols-different-module/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//@ only-wasm32-wasip1
extern crate run_make_support;

use run_make_support::{rustc, tmp_dir, wasmparser};
use std::collections::{HashMap, HashSet};
Expand Down
1 change: 0 additions & 1 deletion tests/run-make/wasm-symbols-not-exported/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//@ only-wasm32-wasip1
extern crate run_make_support;

use run_make_support::{rustc, tmp_dir, wasmparser};
use std::path::Path;
Expand Down
1 change: 0 additions & 1 deletion tests/run-make/wasm-symbols-not-imported/rmake.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//@ only-wasm32-wasip1
extern crate run_make_support;

use run_make_support::{rustc, tmp_dir, wasmparser};
use std::path::Path;
Expand Down
Loading