Rollup of 5 pull requests

compiler/rustc_lint/src/context.rs

@@ -370,7 +370,7 @@ impl LintStore {
                 match level {
                     Level::Allow => "-A",
                     Level::Warn => "-W",
-                    Level::ForceWarn => "--force-warns",
+                    Level::ForceWarn => "--force-warn",
                     Level::Deny => "-D",
                     Level::Forbid => "-F",
                 },

compiler/rustc_lint_defs/src/lib.rs

@@ -64,7 +64,7 @@ impl Level {
         match self {
             Level::Allow => "allow",
             Level::Warn => "warn",
-            Level::ForceWarn => "force-warns",
+            Level::ForceWarn => "force-warn",
             Level::Deny => "deny",
             Level::Forbid => "forbid",
         }

compiler/rustc_middle/src/lint.rs

@@ -288,7 +288,7 @@ pub fn struct_lint_level<'s, 'd>(
                     Level::Deny => "-D",
                     Level::Forbid => "-F",
                     Level::Allow => "-A",
-                    Level::ForceWarn => "--force-warns",
+                    Level::ForceWarn => "--force-warn",
                 };
                 let hyphen_case_lint_name = name.replace("_", "-");
                 if lint_flag_val.as_str() == name {

compiler/rustc_session/src/config.rs

@@ -1101,7 +1101,7 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
         ),
         opt::multi_s(
             "",
-            "force-warns",
+            "force-warn",
             "Specifiy lints that should warn even if \
              they are allowed somewhere else",
             "LINT",
@@ -1175,11 +1175,11 @@ pub fn get_cmd_lint_options(
     let mut lint_opts_with_position = vec![];
     let mut describe_lints = false;
 
-    if !debugging_opts.unstable_options && matches.opt_present("force-warns") {
+    if !debugging_opts.unstable_options && matches.opt_present("force-warn") {
         early_error(
             error_format,
             "the `-Z unstable-options` flag must also be passed to enable \
-            the flag `--force-warns=lints`",
+            the flag `--force-warn=lints`",
         );
     }
 

src/doc/unstable-book/src/compiler-flags/force-warns.md → src/doc/unstable-book/src/compiler-flags/force-warn.md

@@ -1,10 +1,10 @@
-# `force-warns`
+# `force-warn`
 
 The tracking issue for this feature is: [#85512](https://github.com/rust-lang/rust/issues/85512).
 
 ------------------------
 
-This feature allows you to cause any lint to produce a warning even if the lint has a different level by default or another level is set somewhere else. For instance, the `force-warns` option can be used to make a lint (e.g., `dead_code`) produce a warning even if that lint is allowed in code with `#![allow(dead_code)]`.
+This feature allows you to cause any lint to produce a warning even if the lint has a different level by default or another level is set somewhere else. For instance, the `force-warn` option can be used to make a lint (e.g., `dead_code`) produce a warning even if that lint is allowed in code with `#![allow(dead_code)]`.
 
 ## Example
 
@@ -18,4 +18,4 @@ fn dead_function() {}
 fn main() {}
 ```
 
-We can force a warning to be produced by providing `--force-warns dead_code` to rustc.
+We can force a warning to be produced by providing `--force-warn dead_code` to rustc.

src/librustdoc/lib.rs

@@ -511,10 +511,10 @@ fn opts() -> Vec<RustcOptGroup> {
                 "LEVEL",
             )
         }),
-        unstable("force-warns", |o| {
+        unstable("force-warn", |o| {
             o.optopt(
                 "",
-                "force-warns",
+                "force-warn",
                 "Lints that will warn even if allowed somewhere else",
                 "LINTS",
             )

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

@@ -2,4 +2,4 @@
 
 all:
 	$(RUSTDOC) --output-format=json x.html 2>&1 | diff - output-format-json.stderr
-	$(RUSTC) --force-warns dead_code x.rs 2>&1 | diff - force-warns.stderr
+	$(RUSTC) --force-warn dead_code x.rs 2>&1 | diff - force-warn.stderr

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

@@ -1,2 +1,2 @@
-error: the `-Z unstable-options` flag must also be passed to enable the flag `--force-warns=lints`
+error: the `-Z unstable-options` flag must also be passed to enable the flag `--force-warn=lints`
 

src/test/ui/lint/cli-lint-override.force_warn_deny.stderr

@@ -4,7 +4,7 @@ warning: extern declarations without an explicit ABI are deprecated
 LL | extern fn foo() {}
    | ^^^^^^^^^^^^^^^ ABI should be specified here
    |
-   = note: requested on the command line with `--force-warns missing-abi`
+   = note: requested on the command line with `--force-warn missing-abi`
    = help: the default ABI is C
 
 warning: 1 warning emitted

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

@@ -5,7 +5,7 @@
 //
 //[warn_deny] compile-flags: --warn missing_abi --deny missing_abi
 //[forbid_warn] compile-flags: --warn missing_abi --forbid missing_abi
-//[force_warn_deny] compile-flags: -Z unstable-options --force-warns missing_abi --allow missing_abi
+//[force_warn_deny] compile-flags: -Z unstable-options --force-warn missing_abi --allow missing_abi
 //[force_warn_deny] check-pass
 
 

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

@@ -1,7 +1,7 @@
 // Checks that rustc correctly errors when passed an invalid lint with
-// `--force-warns`. This is a regression test for issue #86958.
+// `--force-warn`. This is a regression test for issue #86958.
 //
-// compile-flags: -Z unstable-options --force-warns foo-qux
+// compile-flags: -Z unstable-options --force-warn foo-qux
 // error-pattern: unknown lint: `foo_qux`
 
 fn main() {}

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

@@ -1,14 +1,14 @@
 error[E0602]: unknown lint: `foo_qux`
    |
-   = note: requested on the command line with `--force-warns foo_qux`
+   = note: requested on the command line with `--force-warn foo_qux`
 
 error[E0602]: unknown lint: `foo_qux`
    |
-   = note: requested on the command line with `--force-warns foo_qux`
+   = note: requested on the command line with `--force-warn foo_qux`
 
 error[E0602]: unknown lint: `foo_qux`
    |
-   = note: requested on the command line with `--force-warns foo_qux`
+   = note: requested on the command line with `--force-warn foo_qux`
 
 error: aborting due to 3 previous errors
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --force-warns elided_lifetimes_in_paths -Zunstable-options
+// compile-flags: --force-warn elided_lifetimes_in_paths -Zunstable-options
 // check-pass
 
 struct Foo<'a> {

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

@@ -4,7 +4,7 @@ warning: hidden lifetime parameters in types are deprecated
 LL | fn foo(x: &Foo) {}
    |            ^^^- help: indicate the anonymous lifetime: `<'_>`
    |
-   = note: requested on the command line with `--force-warns elided-lifetimes-in-paths`
+   = note: requested on the command line with `--force-warn elided-lifetimes-in-paths`
 
 warning: 1 warning emitted
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --force-warns const_err -Zunstable-options
+// compile-flags: --force-warn const_err -Zunstable-options
 // check-pass
 
 #![allow(const_err)]

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

@@ -6,7 +6,7 @@ LL | const C: i32 = 1 / 0;
    |                |
    |                attempt to divide `1_i32` by zero
    |
-   = note: requested on the command line with `--force-warns const-err`
+   = note: requested on the command line with `--force-warn const-err`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --force-warns dead_code -Zunstable-options
+// compile-flags: --force-warn dead_code -Zunstable-options
 // check-pass
 
 #![allow(dead_code)]

src/test/ui/lint/force-warn/force-allowed-warning.stderr

@@ -4,7 +4,7 @@ warning: function is never used: `dead_function`
 LL | fn dead_function() {}
    |    ^^^^^^^^^^^^^
    |
-   = note: requested on the command line with `--force-warns dead-code`
+   = note: requested on the command line with `--force-warn dead-code`
 
 warning: 1 warning emitted
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --force-warns const_err -Zunstable-options
+// compile-flags: --force-warn const_err -Zunstable-options
 // check-pass
 
 const C: i32 = 1 / 0;

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

@@ -6,7 +6,7 @@ LL | const C: i32 = 1 / 0;
    |                |
    |                attempt to divide `1_i32` by zero
    |
-   = note: requested on the command line with `--force-warns const-err`
+   = note: requested on the command line with `--force-warn const-err`
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #71800 <https://github.com/rust-lang/rust/issues/71800>
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --force-warns dead_code -Zunstable-options
+// compile-flags: --force-warn dead_code -Zunstable-options
 // check-pass
 
 #![allow(warnings)]

src/test/ui/lint/force-warn/force-lint-allow-all-warnings.stderr

@@ -4,7 +4,7 @@ warning: function is never used: `dead_function`
 LL | fn dead_function() {}
    |    ^^^^^^^^^^^^^
    |
-   = note: requested on the command line with `--force-warns dead-code`
+   = note: requested on the command line with `--force-warn dead-code`
 
 warning: 1 warning emitted
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --force-warns nonstandard_style -Zunstable-options
+// compile-flags: --force-warn nonstandard_style -Zunstable-options
 // check-pass
 
 #![allow(warnings)]

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

@@ -4,7 +4,7 @@ warning: function `FUNCTION` should have a snake case name
 LL | pub fn FUNCTION() {}
    |        ^^^^^^^^ help: convert the identifier to snake case: `function`
    |
-   = note: `--force-warns non-snake-case` implied by `--force-warns nonstandard-style`
+   = note: `--force-warn non-snake-case` implied by `--force-warn nonstandard-style`
 
 warning: 1 warning emitted
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --force-warns bare_trait_objects -Zunstable-options
+// compile-flags: --force-warn bare_trait_objects -Zunstable-options
 // check-pass
 
 #![allow(rust_2018_idioms)]

src/test/ui/lint/force-warn/force-lint-in-allowed-group.stderr

@@ -4,7 +4,7 @@ warning: trait objects without an explicit `dyn` are deprecated
 LL | pub fn function(_x: Box<SomeTrait>) {}
    |                         ^^^^^^^^^ help: use `dyn`: `dyn SomeTrait`
    |
-   = note: requested on the command line with `--force-warns bare-trait-objects`
+   = note: requested on the command line with `--force-warn bare-trait-objects`
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see issue #80165 <https://github.com/rust-lang/rust/issues/80165>
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --cap-lints allow  --force-warns bare_trait_objects -Zunstable-options
+// compile-flags: --cap-lints allow  --force-warn bare_trait_objects -Zunstable-options
 // check-pass
 
 pub trait SomeTrait {}

src/test/ui/lint/force-warn/force-warns-cap-lints-allow.stderr → src/test/ui/lint/force-warn/force-warn-cap-lints-allow.stderr

@@ -1,10 +1,10 @@
 warning: trait objects without an explicit `dyn` are deprecated
-  --> $DIR/force-warns-cap-lints-allow.rs:6:25
+  --> $DIR/force-warn-cap-lints-allow.rs:6:25
    |
 LL | pub fn function(_x: Box<SomeTrait>) {}
    |                         ^^^^^^^^^ help: use `dyn`: `dyn SomeTrait`
    |
-   = note: requested on the command line with `--force-warns bare-trait-objects`
+   = note: requested on the command line with `--force-warn bare-trait-objects`
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see issue #80165 <https://github.com/rust-lang/rust/issues/80165>
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --cap-lints warn  --force-warns rust-2021-compatibility -Zunstable-options
+// compile-flags: --cap-lints warn  --force-warn rust-2021-compatibility -Zunstable-options
 // check-pass
 #![allow(ellipsis_inclusive_range_patterns)]
 

src/test/ui/lint/force-warn/force-warn-cap-lints-warn.stderr

@@ -4,7 +4,7 @@ warning: `...` range patterns are deprecated
 LL |         0...100 => true,
    |          ^^^ help: use `..=` for an inclusive range
    |
-   = note: `--force-warns ellipsis-inclusive-range-patterns` implied by `--force-warns rust-2021-compatibility`
+   = note: `--force-warn ellipsis-inclusive-range-patterns` implied by `--force-warn rust-2021-compatibility`
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see issue #80165 <https://github.com/rust-lang/rust/issues/80165>
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --force-warns rust-2018-idioms -Zunstable-options
+// compile-flags: --force-warn rust-2018-idioms -Zunstable-options
 // check-pass
 
 #![allow(bare_trait_objects)]

src/test/ui/lint/force-warn/force-warn-group-allow-warning.stderr

@@ -4,7 +4,7 @@ warning: trait objects without an explicit `dyn` are deprecated
 LL | pub fn function(_x: Box<SomeTrait>) {}
    |                         ^^^^^^^^^ help: use `dyn`: `dyn SomeTrait`
    |
-   = note: `--force-warns bare-trait-objects` implied by `--force-warns rust-2018-idioms`
+   = note: `--force-warn bare-trait-objects` implied by `--force-warn rust-2018-idioms`
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see issue #80165 <https://github.com/rust-lang/rust/issues/80165>
 

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

@@ -1,4 +1,4 @@
-// compile-flags: --force-warns rust_2018_idioms -Zunstable-options
+// compile-flags: --force-warn rust_2018_idioms -Zunstable-options
 // check-pass
 
 #![allow(rust_2018_idioms)]

src/test/ui/lint/force-warn/force-warn-group.stderr

@@ -4,7 +4,7 @@ warning: trait objects without an explicit `dyn` are deprecated
 LL | pub fn function(_x: Box<SomeTrait>) {}
    |                         ^^^^^^^^^ help: use `dyn`: `dyn SomeTrait`
    |
-   = note: `--force-warns bare-trait-objects` implied by `--force-warns rust-2018-idioms`
+   = note: `--force-warn bare-trait-objects` implied by `--force-warn rust-2018-idioms`
    = warning: this is accepted in the current edition (Rust 2015) but is a hard error in Rust 2021!
    = note: for more information, see issue #80165 <https://github.com/rust-lang/rust/issues/80165>