Skip to content

Commit

Permalink
Unrolled build for rust-lang#125573
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#125573 - GuillaumeGomez:migrate-allow-warnings-cmdline-stability, r=jieyouxu

Migrate `run-make/allow-warnings-cmdline-stability` to `rmake.rs`

Part of rust-lang#121876.

r? ``@jieyouxu``
  • Loading branch information
rust-timer committed May 28, 2024
2 parents 8c4db85 + 404d47e commit bc4f3d2
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 17 deletions.
11 changes: 11 additions & 0 deletions src/tools/run-make-support/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,17 @@ pub fn recursive_diff(dir1: impl AsRef<Path>, dir2: impl AsRef<Path>) {
}
}

/// Check that `haystack` does not contain `needle`. Panic otherwise.
pub fn assert_not_contains(haystack: &str, needle: &str) {
if haystack.contains(needle) {
eprintln!("=== HAYSTACK ===");
eprintln!("{}", haystack);
eprintln!("=== NEEDLE ===");
eprintln!("{}", needle);
panic!("needle was unexpectedly found in haystack");
}
}

/// Implement common helpers for command wrappers. This assumes that the command wrapper is a struct
/// containing a `cmd: Command` field and a `output` function. The provided helpers are:
///
Expand Down
1 change: 0 additions & 1 deletion src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
run-make/allocator-shim-circular-deps/Makefile
run-make/allow-non-lint-warnings-cmdline/Makefile
run-make/allow-warnings-cmdline-stability/Makefile
run-make/archive-duplicate-names/Makefile
run-make/atomic-lock-free/Makefile
run-make/bare-outfile/Makefile
Expand Down
16 changes: 0 additions & 16 deletions tests/run-make/allow-warnings-cmdline-stability/Makefile

This file was deleted.

11 changes: 11 additions & 0 deletions tests/run-make/allow-warnings-cmdline-stability/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Test that `-Awarnings` suppresses warnings for unstable APIs.

use run_make_support::{assert_not_contains, rustc};

fn main() {
rustc().input("bar.rs").run();
let output = rustc().input("foo.rs").arg("-Awarnings").run();

assert_not_contains(&String::from_utf8(output.stdout).unwrap(), "warning");
assert_not_contains(&String::from_utf8(output.stderr).unwrap(), "warning");
}

0 comments on commit bc4f3d2

Please sign in to comment.