Rollup merge of #87346 - rylev:rename-force-warn, r=nikomatsakis

Rename force-warns to force-warn

The renames the `--force-warns` option to `--force-warn`. This mirrors other lint options like `--warn` and `--deny` which are in the singular.

r? `@nikomatsakis`

cc `@ehuss` - this option is being used by Cargo. How do we make sure the transition to using the new name is as smooth as possible?

Author: ehuss

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 renamed to 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 renamed to 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