Skip to content

Commit 1f3170c

Browse files
inquisitivecrystalMark-Simulacrum
authored andcommitted
Update tests
This updates tests to reflect that `force-warn` is now stable.
1 parent 228a5f4 commit 1f3170c

16 files changed

+14
-21
lines changed

src/test/run-make/unstable-flag-required/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,3 @@
22

33
all:
44
$(RUSTDOC) --output-format=json x.html 2>&1 | diff - output-format-json.stderr
5-
$(RUSTC) --force-warn dead_code x.rs 2>&1 | diff - force-warn.stderr

src/test/run-make/unstable-flag-required/force-warn.stderr

-2
This file was deleted.

src/test/ui/lint/cli-lint-override.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//
66
//[warn_deny] compile-flags: --warn missing_abi --deny missing_abi
77
//[forbid_warn] compile-flags: --warn missing_abi --forbid missing_abi
8-
//[force_warn_deny] compile-flags: -Z unstable-options --force-warn missing_abi --allow missing_abi
8+
//[force_warn_deny] compile-flags: --force-warn missing_abi --allow missing_abi
99
//[force_warn_deny] check-pass
1010

1111

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Checks that rustc correctly errors when passed an invalid lint with
22
// `--force-warn`. This is a regression test for issue #86958.
33
//
4-
// compile-flags: -Z unstable-options --force-warn foo-qux
4+
// compile-flags: --force-warn foo-qux
55
// error-pattern: unknown lint: `foo_qux`
66

77
fn main() {}

src/test/ui/lint/cli-unknown-force-warn.stderr

+1-5
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ error[E0602]: unknown lint: `foo_qux`
66
|
77
= note: requested on the command line with `--force-warn foo_qux`
88

9-
error[E0602]: unknown lint: `foo_qux`
10-
|
11-
= note: requested on the command line with `--force-warn foo_qux`
12-
13-
error: aborting due to 3 previous errors
9+
error: aborting due to 2 previous errors
1410

1511
For more information about this error, try `rustc --explain E0602`.

src/test/ui/lint/force-warn/allow-warnings.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT causes $LINT (which is warn-by-default) to warn
22
// despite allowing all warnings in module
3-
// compile-flags: --force-warn dead_code -Zunstable-options
3+
// compile-flags: --force-warn dead_code
44
// check-pass
55

66
#![allow(warnings)]

src/test/ui/lint/force-warn/allowed-by-default-lint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// --force-warn $LINT causes $LINT (which is allow-by-default) to warn
2-
// compile-flags: --force-warn elided_lifetimes_in_paths -Zunstable-options
2+
// compile-flags: --force-warn elided_lifetimes_in_paths
33
// check-pass
44

55
struct Foo<'a> {

src/test/ui/lint/force-warn/allowed-deny-by-default-lint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT causes $LINT (which is deny-by-default) to warn
22
// despite $LINT being allowed in module
3-
// compile-flags: --force-warn const_err -Zunstable-options
3+
// compile-flags: --force-warn const_err
44
// check-pass
55

66
#![allow(const_err)]

src/test/ui/lint/force-warn/allowed-group-warn-by-default-lint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT causes $LINT (which is warn-by-default) to warn
22
// despite $LINT_GROUP (which contains $LINT) being allowed
3-
// compile-flags: --force-warn bare_trait_objects -Zunstable-options
3+
// compile-flags: --force-warn bare_trait_objects
44
// check-pass
55

66
#![allow(rust_2018_idioms)]

src/test/ui/lint/force-warn/allowed-warn-by-default-lint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT causes $LINT (which is warn-by-default) to warn
22
// despite $LINT being allowed in module
3-
// compile-flags: --force-warn dead_code -Zunstable-options
3+
// compile-flags: --force-warn dead_code
44
// check-pass
55

66
#![allow(dead_code)]

src/test/ui/lint/force-warn/cap-lints-allow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT casuses $LINT to warn despite --cap-lints
22
// set to allow
3-
// compile-flags: --cap-lints allow --force-warn bare_trait_objects -Zunstable-options
3+
// compile-flags: --cap-lints allow --force-warn bare_trait_objects
44
// check-pass
55

66
pub trait SomeTrait {}

src/test/ui/lint/force-warn/cap-lints-warn-allowed-warn-by-default-lint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT_GROUP causes $LINT to warn despite $LINT being
22
// allowed in module and cap-lints set to warn
3-
// compile-flags: --cap-lints warn --force-warn rust-2021-compatibility -Zunstable-options
3+
// compile-flags: --cap-lints warn --force-warn rust-2021-compatibility
44
// check-pass
55
#![allow(ellipsis_inclusive_range_patterns)]
66

src/test/ui/lint/force-warn/deny-by-default-lint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// --force-warn $LINT causes $LINT (which is deny-by-default) to warn
2-
// compile-flags: --force-warn const_err -Zunstable-options
2+
// compile-flags: --force-warn const_err
33
// check-pass
44

55
const C: i32 = 1 / 0;

src/test/ui/lint/force-warn/lint-group-allow-warnings.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// --force-warn $LINT_GROUP causes $LINT in $LINT_GROUP to warn
22
// despite all warnings being allowed in module
33
// warn-by-default lint to warn
4-
// compile-flags: --force-warn nonstandard_style -Zunstable-options
4+
// compile-flags: --force-warn nonstandard_style
55
// check-pass
66

77
#![allow(warnings)]

src/test/ui/lint/force-warn/lint-group-allowed-lint-group.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT_GROUP causes $LINT to warn despite
22
// $LINT_GROUP being allowed in module
3-
// compile-flags: --force-warn rust_2018_idioms -Zunstable-options
3+
// compile-flags: --force-warn rust_2018_idioms
44
// check-pass
55

66
#![allow(rust_2018_idioms)]

src/test/ui/lint/force-warn/lint-group-allowed-warn-by-default-lint.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// --force-warn $LINT_GROUP causes $LINT (which is warn-by-default) to warn
22
// despite $LINT being allowed in module
3-
// compile-flags: --force-warn rust-2018-idioms -Zunstable-options
3+
// compile-flags: --force-warn rust-2018-idioms
44
// check-pass
55

66
#![allow(bare_trait_objects)]

0 commit comments

Comments
 (0)