squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

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

Browse source 
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?
This commit is contained in:
Eric Huss 2021-07-21 10:12:30 -07:00 committed by GitHub
parent b9e3f3d5a2 800c5f9202
commit 43e25751ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
34 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_lint/src/context.rs
View file

@ -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",
},

2
compiler/rustc_lint_defs/src/lib.rs
View file

@ -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",
}

2
compiler/rustc_middle/src/lint.rs
View file

@ -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 {

6
compiler/rustc_session/src/config.rs
View file

@ -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`",
);
}

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

@ -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.

4
src/librustdoc/lib.rs
View file

@ -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",
)

2
src/test/run-make/unstable-flag-required/Makefile
View file

@ -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

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

@ -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`

2
src/test/ui/lint/cli-lint-override.force_warn_deny.stderr
View file

@ -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

2
src/test/ui/lint/cli-lint-override.rs
View file

@ -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

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

@ -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() {}

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

@ -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

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

@ -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> {

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

@ -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

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

@ -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)]

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

@ -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>

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

@ -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)]

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

@ -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

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

@ -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;

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

@ -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>

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

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

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

@ -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

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

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

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

@ -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

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

@ -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)]

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

@ -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>

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

@ -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 {}

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

@ -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>

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

@ -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)]

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

@ -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>

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

@ -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)]

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

@ -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>

2
src/test/ui/lint/force-warn/force-warn-group.rs
View file

@ -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)]

2
src/test/ui/lint/force-warn/force-warn-group.stderr
View file

@ -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>