Auto merge of rust-lang#86117 - ehuss:force-warns-underscore, r=rylev

bors · bors · commit 304441960e70 · 2021-06-14T17:21:28.000Z
Fix force-warns to allow dashes.

The `--force-warns` flag was not allowing lint names with dashes, only supporting underscores.  This changes it to allow dashes to match the behavior of the A/W/D/F flags.
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
@@ -1207,7 +1207,8 @@ pub fn get_cmd_lint_options(
         );
     }
 
-    let force_warns = matches.opt_strs("force-warns");
+    let force_warns =
+        matches.opt_strs("force-warns").into_iter().map(|name| name.replace('-', "_")).collect();
 
     (lint_opts, describe_lints, lint_cap, force_warns)
 }
diff --git a/src/test/ui/lint/force-warn/force-warn-group-allow-warning.rs b/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-warns rust-2018-idioms -Zunstable-options
 // check-pass
 
 #![allow(bare_trait_objects)]

Original file line number	Diff line number	Diff line change
`@@ -1207,7 +1207,8 @@ pub fn get_cmd_lint_options(`
`1207`	`1207`	`);`
`1208`	`1208`	`}`
`1209`	`1209`
`1210`		`- let force_warns = matches.opt_strs("force-warns");`
	`1210`	`+ let force_warns =`
	`1211`	`+ matches.opt_strs("force-warns").into_iter().map(\|name\| name.replace('-', "_")).collect();`
`1211`	`1212`
`1212`	`1213`	`(lint_opts, describe_lints, lint_cap, force_warns)`
`1213`	`1214`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// compile-flags: --force-warns rust_2018_idioms -Zunstable-options`
	`1`	`+// compile-flags: --force-warns rust-2018-idioms -Zunstable-options`
`2`	`2`	`// check-pass`
`3`	`3`
`4`	`4`	`#![allow(bare_trait_objects)]`