diff options
| -rw-r--r-- | compiler/rustc_session/src/config.rs | 16 | ||||
| -rw-r--r-- | src/librustdoc/lib.rs | 17 |
2 files changed, 10 insertions, 23 deletions
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs index 123f47b430a..ca4ae238ae5 100644 --- a/compiler/rustc_session/src/config.rs +++ b/compiler/rustc_session/src/config.rs @@ -1089,10 +1089,11 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> { ), opt::flag_s("", "test", "Build a test harness"), opt::opt_s("", "target", "Target triple for which the code is compiled", "TARGET"), - opt::multi_s("W", "warn", "Set lint warnings", "OPT"), - opt::multi_s("A", "allow", "Set lint allowed", "OPT"), - opt::multi_s("D", "deny", "Set lint denied", "OPT"), - opt::multi_s("F", "forbid", "Set lint forbidden", "OPT"), + opt::multi_s("A", "allow", "Set lint allowed", "LINT"), + opt::multi_s("W", "warn", "Set lint warnings", "LINT"), + opt::multi_s("", "force-warn", "Set lint force-warn", "LINT"), + opt::multi_s("D", "deny", "Set lint denied", "LINT"), + opt::multi_s("F", "forbid", "Set lint forbidden", "LINT"), opt::multi_s( "", "cap-lints", @@ -1101,13 +1102,6 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> { level", "LEVEL", ), - opt::multi_s( - "", - "force-warn", - "Specifiy lints that should warn even if \ - they are allowed somewhere else", - "LINT", - ), opt::multi_s("C", "codegen", "Set a codegen option", "OPT[=VALUE]"), opt::flag_s("V", "version", "Print version info and exit"), opt::flag_s("v", "verbose", "Use verbose output"), diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 34fe808dae2..d745896e946 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -503,10 +503,11 @@ fn opts() -> Vec<RustcOptGroup> { unstable("disable-minification", |o| { o.optflagmulti("", "disable-minification", "Disable minification applied on JS files") }), - stable("warn", |o| o.optmulti("W", "warn", "Set lint warnings", "OPT")), - stable("allow", |o| o.optmulti("A", "allow", "Set lint allowed", "OPT")), - stable("deny", |o| o.optmulti("D", "deny", "Set lint denied", "OPT")), - stable("forbid", |o| o.optmulti("F", "forbid", "Set lint forbidden", "OPT")), + stable("allow", |o| o.optmulti("A", "allow", "Set lint allowed", "LINT")), + stable("warn", |o| o.optmulti("W", "warn", "Set lint warnings", "LINT")), + unstable("force-warn", |o| o.optmulti("", "force-warn", "Set lint force-warn", "LINT")), + stable("deny", |o| o.optmulti("D", "deny", "Set lint denied", "LINT")), + stable("forbid", |o| o.optmulti("F", "forbid", "Set lint forbidden", "LINT")), stable("cap-lints", |o| { o.optmulti( "", @@ -517,14 +518,6 @@ fn opts() -> Vec<RustcOptGroup> { "LEVEL", ) }), - unstable("force-warn", |o| { - o.optopt( - "", - "force-warn", - "Lints that will warn even if allowed somewhere else", - "LINTS", - ) - }), unstable("index-page", |o| { o.optopt("", "index-page", "Markdown file to be used as index page", "PATH") }), |