OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #78864 - Mark-Simulacrum:warn-on-forbids, r=pnkfelix 

Use true previous lint level when detecting overriden forbids

Previously, cap-lints was ignored when checking the previous forbid level, which
meant that it was a hard error to do so. This is different from the normal
behavior of lints, which are silenced by cap-lints; if the forbid would not take
effect regardless, there is not much point in complaining about the fact that we
are reducing its level.

It might be considered a bug that even `--cap-lints deny` would suffice to
silence the error on overriding forbid, depending on if one cares about failing
the build or precisely forbid being set. But setting cap-lints to deny is quite
odd and not really done in practice, so we don't try to handle it specially.

This also unifies the code paths for nested and same-level scopes. However, the
special case for CLI lint flags is left in place (introduced by #70918) to fix
the regression noted in #70819. That means that CLI flags do not lint on forbid
being overridden by a non-forbid level. It is unclear whether this is a bug or a
desirable feature, but it is certainly inconsistent. CLI flags are a
sufficiently different "type" of place though that this is deemed out of scope
for this commit.

r? `@pnkfelix` perhaps?

cc #77713 -- not marking as "Fixes" because of the lack of proper unused attribute handling in this PR
This commit is contained in:
bors 2020-12-02 02:07:45 +00:00
parent 18aa5ee209 64efcbe0e9
commit eb4860c7e1
18 changed files with 127 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
compiler/rustc_lint/src/levels.rs
View File

@ -108,18 +108,32 @@ impl<'s> LintLevelsBuilder<'s> {
id: LintId, id: LintId,
(level, src): LevelSource, (level, src): LevelSource,
) { ) {
if let Some((old_level, old_src)) = specs.get(&id) { // Setting to a non-forbid level is an error if the lint previously had
if old_level == &Level::Forbid && level != Level::Forbid { // a forbid level. Note that this is not necessarily true even with a
// `#[forbid(..)]` attribute present, as that is overriden by `--cap-lints`.
//
// This means that this only errors if we're truly lowering the lint
// level from forbid.
if level != Level::Forbid {
if let (Level::Forbid, old_src) =
self.sets.get_lint_level(id.lint, self.cur, Some(&specs), &self.sess)
{
let mut diag_builder = struct_span_err!( let mut diag_builder = struct_span_err!(
self.sess, self.sess,
src.span(), src.span(),
E0453, E0453,
"{}({}) incompatible with previous forbid in same scope", "{}({}) incompatible with previous forbid",
level.as_str(), level.as_str(),
src.name(), src.name(),
); );
match *old_src { diag_builder.span_label(src.span(), "overruled by previous forbid");
LintSource::Default => {} match old_src {
LintSource::Default => {
diag_builder.note(&format!(
"`forbid` lint level is the default for {}",
id.to_string()
));
}
LintSource::Node(_, forbid_source_span, reason) => { LintSource::Node(_, forbid_source_span, reason) => {
diag_builder.span_label(forbid_source_span, "`forbid` level set here"); diag_builder.span_label(forbid_source_span, "`forbid` level set here");
if let Some(rationale) = reason { if let Some(rationale) = reason {
@ -131,6 +145,8 @@ impl<'s> LintLevelsBuilder<'s> {
} }
} }
diag_builder.emit(); diag_builder.emit();
// Retain the forbid lint level
return; return;
} }
} }
@ -414,50 +430,6 @@ impl<'s> LintLevelsBuilder<'s> {
} }
} }
for (id, &(level, ref src)) in specs.iter() {
if level == Level::Forbid {
continue;
}
let forbid_src = match self.sets.get_lint_id_level(*id, self.cur, None) {
(Some(Level::Forbid), src) => src,
_ => continue,
};
let forbidden_lint_name = match forbid_src {
LintSource::Default => id.to_string(),
LintSource::Node(name, _, _) => name.to_string(),
LintSource::CommandLine(name, _) => name.to_string(),
};
let (lint_attr_name, lint_attr_span) = match *src {
LintSource::Node(name, span, _) => (name, span),
_ => continue,
};
let mut diag_builder = struct_span_err!(
self.sess,
lint_attr_span,
E0453,
"{}({}) overruled by outer forbid({})",
level.as_str(),
lint_attr_name,
forbidden_lint_name
);
diag_builder.span_label(lint_attr_span, "overruled by previous forbid");
match forbid_src {
LintSource::Default => {}
LintSource::Node(_, forbid_source_span, reason) => {
diag_builder.span_label(forbid_source_span, "`forbid` level set here");
if let Some(rationale) = reason {
diag_builder.note(&rationale.as_str());
}
}
LintSource::CommandLine(_, _) => {
diag_builder.note("`forbid` lint level was set on command line");
}
}
diag_builder.emit();
// don't set a separate error for every lint in the group
break;
}
let prev = self.cur; let prev = self.cur;
if !specs.is_empty() { if !specs.is_empty() {
self.cur = self.sets.list.len() as u32; self.cur = self.sets.list.len() as u32;

6
src/test/ui-fulldeps/lint-plugin-forbid-attrs.rs
View File

@ -9,9 +9,9 @@
fn lintme() {} //~ ERROR item is named 'lintme' fn lintme() {} //~ ERROR item is named 'lintme'
#[allow(test_lint)] #[allow(test_lint)]
//~^ ERROR allow(test_lint) overruled by outer forbid(test_lint) //~^ ERROR allow(test_lint) incompatible
//~| ERROR allow(test_lint) overruled by outer forbid(test_lint) //~| ERROR allow(test_lint) incompatible
//~| ERROR allow(test_lint) overruled by outer forbid(test_lint) //~| ERROR allow(test_lint) incompatible
pub fn main() { pub fn main() {
lintme(); lintme();
} }

8
src/test/ui-fulldeps/lint-plugin-forbid-attrs.stderr
View File

@ -1,4 +1,4 @@
error[E0453]: allow(test_lint) overruled by outer forbid(test_lint) error[E0453]: allow(test_lint) incompatible with previous forbid
--> $DIR/lint-plugin-forbid-attrs.rs:11:9 --> $DIR/lint-plugin-forbid-attrs.rs:11:9
| |
LL | #![forbid(test_lint)] LL | #![forbid(test_lint)]
@ -7,7 +7,7 @@ LL | #![forbid(test_lint)]
LL | #[allow(test_lint)] LL | #[allow(test_lint)]
| ^^^^^^^^^ overruled by previous forbid | ^^^^^^^^^ overruled by previous forbid
error[E0453]: allow(test_lint) overruled by outer forbid(test_lint) error[E0453]: allow(test_lint) incompatible with previous forbid
--> $DIR/lint-plugin-forbid-attrs.rs:11:9 --> $DIR/lint-plugin-forbid-attrs.rs:11:9
| |
LL | #![forbid(test_lint)] LL | #![forbid(test_lint)]
@ -28,7 +28,7 @@ error: item is named 'lintme'
--> $DIR/lint-plugin-forbid-attrs.rs:9:1 --> $DIR/lint-plugin-forbid-attrs.rs:9:1
| |
LL | fn lintme() {} LL | fn lintme() {}
| ^^^^^^^^^^^^^^^ | ^^^^^^^^^^^^^^
| |
note: the lint level is defined here note: the lint level is defined here
--> $DIR/lint-plugin-forbid-attrs.rs:7:11 --> $DIR/lint-plugin-forbid-attrs.rs:7:11
@ -36,7 +36,7 @@ note: the lint level is defined here
LL | #![forbid(test_lint)] LL | #![forbid(test_lint)]
| ^^^^^^^^^ | ^^^^^^^^^
error[E0453]: allow(test_lint) overruled by outer forbid(test_lint) error[E0453]: allow(test_lint) incompatible with previous forbid
--> $DIR/lint-plugin-forbid-attrs.rs:11:9 --> $DIR/lint-plugin-forbid-attrs.rs:11:9
| |
LL | #![forbid(test_lint)] LL | #![forbid(test_lint)]

6
src/test/ui-fulldeps/lint-plugin-forbid-cmdline.rs
View File

@ -7,9 +7,9 @@
//~^ WARN use of deprecated attribute `plugin` //~^ WARN use of deprecated attribute `plugin`
fn lintme() { } //~ ERROR item is named 'lintme' fn lintme() { } //~ ERROR item is named 'lintme'
#[allow(test_lint)] //~ ERROR allow(test_lint) overruled by outer forbid(test_lint) #[allow(test_lint)] //~ ERROR allow(test_lint) incompatible
//~| ERROR allow(test_lint) overruled by outer forbid(test_lint) //~| ERROR allow(test_lint) incompatible
//~| ERROR allow(test_lint) overruled by outer forbid(test_lint) //~| ERROR allow(test_lint)
pub fn main() { pub fn main() {
lintme(); lintme();
} }

6
src/test/ui-fulldeps/lint-plugin-forbid-cmdline.stderr
View File

@ -1,4 +1,4 @@
error[E0453]: allow(test_lint) overruled by outer forbid(test_lint) error[E0453]: allow(test_lint) incompatible with previous forbid
--> $DIR/lint-plugin-forbid-cmdline.rs:10:9 --> $DIR/lint-plugin-forbid-cmdline.rs:10:9
| |
LL | #[allow(test_lint)] LL | #[allow(test_lint)]
@ -6,7 +6,7 @@ LL | #[allow(test_lint)]
| |
= note: `forbid` lint level was set on command line = note: `forbid` lint level was set on command line
error[E0453]: allow(test_lint) overruled by outer forbid(test_lint) error[E0453]: allow(test_lint) incompatible with previous forbid
--> $DIR/lint-plugin-forbid-cmdline.rs:10:9 --> $DIR/lint-plugin-forbid-cmdline.rs:10:9
| |
LL | #[allow(test_lint)] LL | #[allow(test_lint)]
@ -30,7 +30,7 @@ LL | fn lintme() { }
| |
= note: requested on the command line with `-F test-lint` = note: requested on the command line with `-F test-lint`
error[E0453]: allow(test_lint) overruled by outer forbid(test_lint) error[E0453]: allow(test_lint) incompatible with previous forbid
--> $DIR/lint-plugin-forbid-cmdline.rs:10:9 --> $DIR/lint-plugin-forbid-cmdline.rs:10:9
| |
LL | #[allow(test_lint)] LL | #[allow(test_lint)]

6
src/test/ui/error-codes/E0453.rs
View File

@ -1,8 +1,8 @@
#![forbid(non_snake_case)] #![forbid(non_snake_case)]
#[allow(non_snake_case)] #[allow(non_snake_case)]
//~^ ERROR allow(non_snake_case) overruled by outer forbid(non_snake_case) //~^ ERROR allow(non_snake_case) incompatible
//~| ERROR allow(non_snake_case) overruled by outer forbid(non_snake_case) //~| ERROR allow(non_snake_case) incompatible
//~| ERROR allow(non_snake_case) overruled by outer forbid(non_snake_case) //~| ERROR allow(non_snake_case) incompatible
fn main() { fn main() {
} }

6
src/test/ui/error-codes/E0453.stderr
View File

@ -1,4 +1,4 @@
error[E0453]: allow(non_snake_case) overruled by outer forbid(non_snake_case) error[E0453]: allow(non_snake_case) incompatible with previous forbid
--> $DIR/E0453.rs:3:9 --> $DIR/E0453.rs:3:9
| |
LL | #![forbid(non_snake_case)] LL | #![forbid(non_snake_case)]
@ -7,7 +7,7 @@ LL |
LL | #[allow(non_snake_case)] LL | #[allow(non_snake_case)]
| ^^^^^^^^^^^^^^ overruled by previous forbid | ^^^^^^^^^^^^^^ overruled by previous forbid
error[E0453]: allow(non_snake_case) overruled by outer forbid(non_snake_case) error[E0453]: allow(non_snake_case) incompatible with previous forbid
--> $DIR/E0453.rs:3:9 --> $DIR/E0453.rs:3:9
| |
LL | #![forbid(non_snake_case)] LL | #![forbid(non_snake_case)]
@ -16,7 +16,7 @@ LL |
LL | #[allow(non_snake_case)] LL | #[allow(non_snake_case)]
| ^^^^^^^^^^^^^^ overruled by previous forbid | ^^^^^^^^^^^^^^ overruled by previous forbid
error[E0453]: allow(non_snake_case) overruled by outer forbid(non_snake_case) error[E0453]: allow(non_snake_case) incompatible with previous forbid
--> $DIR/E0453.rs:3:9 --> $DIR/E0453.rs:3:9
| |
LL | #![forbid(non_snake_case)] LL | #![forbid(non_snake_case)]

15
src/test/ui/lint/forbid-error-capped.rs Normal file
View File

@ -0,0 +1,15 @@
// check-pass
// compile-args: --cap-lints=warn -Fwarnings
// This checks that the forbid attribute checking is ignored when the forbidden
// lint is capped.
#![forbid(warnings)]
#![allow(unused)]
#[allow(unused)]
mod bar {
fn bar() {}
}
fn main() {}

6
src/test/ui/lint/issue-70819-dont-override-forbid-in-same-scope.rs
View File

@ -17,11 +17,11 @@
fn forbid_first(num: i32) -> i32 { fn forbid_first(num: i32) -> i32 {
#![forbid(unused)] #![forbid(unused)]
#![deny(unused)] #![deny(unused)]
//~^ ERROR: deny(unused) incompatible with previous forbid in same scope [E0453] //~^ ERROR: deny(unused) incompatible with previous forbid
#![warn(unused)] #![warn(unused)]
//~^ ERROR: warn(unused) incompatible with previous forbid in same scope [E0453] //~^ ERROR: warn(unused) incompatible with previous forbid
#![allow(unused)] #![allow(unused)]
//~^ ERROR: allow(unused) incompatible with previous forbid in same scope [E0453] //~^ ERROR: allow(unused) incompatible with previous forbid
num * num num * num
} }

12
src/test/ui/lint/issue-70819-dont-override-forbid-in-same-scope.stderr
View File

@ -1,28 +1,28 @@
error[E0453]: deny(unused) incompatible with previous forbid in same scope error[E0453]: deny(unused) incompatible with previous forbid
--> $DIR/issue-70819-dont-override-forbid-in-same-scope.rs:19:13 --> $DIR/issue-70819-dont-override-forbid-in-same-scope.rs:19:13
| |
LL | #![forbid(unused)] LL | #![forbid(unused)]
| ------ `forbid` level set here | ------ `forbid` level set here
LL | #![deny(unused)] LL | #![deny(unused)]
| ^^^^^^ | ^^^^^^ overruled by previous forbid
error[E0453]: warn(unused) incompatible with previous forbid in same scope error[E0453]: warn(unused) incompatible with previous forbid
--> $DIR/issue-70819-dont-override-forbid-in-same-scope.rs:21:13 --> $DIR/issue-70819-dont-override-forbid-in-same-scope.rs:21:13
| |
LL | #![forbid(unused)] LL | #![forbid(unused)]
| ------ `forbid` level set here | ------ `forbid` level set here
... ...
LL | #![warn(unused)] LL | #![warn(unused)]
| ^^^^^^ | ^^^^^^ overruled by previous forbid
error[E0453]: allow(unused) incompatible with previous forbid in same scope error[E0453]: allow(unused) incompatible with previous forbid
--> $DIR/issue-70819-dont-override-forbid-in-same-scope.rs:23:14 --> $DIR/issue-70819-dont-override-forbid-in-same-scope.rs:23:14
| |
LL | #![forbid(unused)] LL | #![forbid(unused)]
| ------ `forbid` level set here | ------ `forbid` level set here
... ...
LL | #![allow(unused)] LL | #![allow(unused)]
| ^^^^^^ | ^^^^^^ overruled by previous forbid
error: aborting due to 3 previous errors error: aborting due to 3 previous errors

6
src/test/ui/lint/lint-forbid-attr.rs
View File

@ -1,8 +1,8 @@
#![forbid(deprecated)] #![forbid(deprecated)]
#[allow(deprecated)] #[allow(deprecated)]
//~^ ERROR allow(deprecated) overruled by outer forbid(deprecated) //~^ ERROR allow(deprecated) incompatible
//~| ERROR allow(deprecated) overruled by outer forbid(deprecated) //~| ERROR allow(deprecated) incompatible
//~| ERROR allow(deprecated) overruled by outer forbid(deprecated) //~| ERROR allow(deprecated) incompatible
fn main() { fn main() {
} }

6
src/test/ui/lint/lint-forbid-attr.stderr
View File

@ -1,4 +1,4 @@
error[E0453]: allow(deprecated) overruled by outer forbid(deprecated) error[E0453]: allow(deprecated) incompatible with previous forbid
--> $DIR/lint-forbid-attr.rs:3:9 --> $DIR/lint-forbid-attr.rs:3:9
| |
LL | #![forbid(deprecated)] LL | #![forbid(deprecated)]
@ -7,7 +7,7 @@ LL |
LL | #[allow(deprecated)] LL | #[allow(deprecated)]
| ^^^^^^^^^^ overruled by previous forbid | ^^^^^^^^^^ overruled by previous forbid
error[E0453]: allow(deprecated) overruled by outer forbid(deprecated) error[E0453]: allow(deprecated) incompatible with previous forbid
--> $DIR/lint-forbid-attr.rs:3:9 --> $DIR/lint-forbid-attr.rs:3:9
| |
LL | #![forbid(deprecated)] LL | #![forbid(deprecated)]
@ -16,7 +16,7 @@ LL |
LL | #[allow(deprecated)] LL | #[allow(deprecated)]
| ^^^^^^^^^^ overruled by previous forbid | ^^^^^^^^^^ overruled by previous forbid
error[E0453]: allow(deprecated) overruled by outer forbid(deprecated) error[E0453]: allow(deprecated) incompatible with previous forbid
--> $DIR/lint-forbid-attr.rs:3:9 --> $DIR/lint-forbid-attr.rs:3:9
| |
LL | #![forbid(deprecated)] LL | #![forbid(deprecated)]

6
src/test/ui/lint/lint-forbid-cmdline.rs
View File

@ -1,7 +1,7 @@
// compile-flags: -F deprecated // compile-flags: -F deprecated
#[allow(deprecated)] //~ ERROR allow(deprecated) overruled by outer forbid(deprecated) #[allow(deprecated)] //~ ERROR allow(deprecated) incompatible
//~| ERROR allow(deprecated) overruled by outer forbid(deprecated) //~| ERROR allow(deprecated) incompatible
//~| ERROR allow(deprecated) overruled by outer forbid(deprecated) //~| ERROR allow(deprecated) incompatible
fn main() { fn main() {
} }

6
src/test/ui/lint/lint-forbid-cmdline.stderr
View File

@ -1,4 +1,4 @@
error[E0453]: allow(deprecated) overruled by outer forbid(deprecated) error[E0453]: allow(deprecated) incompatible with previous forbid
--> $DIR/lint-forbid-cmdline.rs:3:9 --> $DIR/lint-forbid-cmdline.rs:3:9
| |
LL | #[allow(deprecated)] LL | #[allow(deprecated)]
@ -6,7 +6,7 @@ LL | #[allow(deprecated)]
| |
= note: `forbid` lint level was set on command line = note: `forbid` lint level was set on command line
error[E0453]: allow(deprecated) overruled by outer forbid(deprecated) error[E0453]: allow(deprecated) incompatible with previous forbid
--> $DIR/lint-forbid-cmdline.rs:3:9 --> $DIR/lint-forbid-cmdline.rs:3:9
| |
LL | #[allow(deprecated)] LL | #[allow(deprecated)]
@ -14,7 +14,7 @@ LL | #[allow(deprecated)]
| |
= note: `forbid` lint level was set on command line = note: `forbid` lint level was set on command line
error[E0453]: allow(deprecated) overruled by outer forbid(deprecated) error[E0453]: allow(deprecated) incompatible with previous forbid
--> $DIR/lint-forbid-cmdline.rs:3:9 --> $DIR/lint-forbid-cmdline.rs:3:9
| |
LL | #[allow(deprecated)] LL | #[allow(deprecated)]

22
src/test/ui/lint/outer-forbid.rs
View File

@ -4,21 +4,25 @@
// subsequent allowance of a lint group containing it (here, `nonstandard_style`). See // subsequent allowance of a lint group containing it (here, `nonstandard_style`). See
// Issue #42873. // Issue #42873.
// If you turn off deduplicate diagnostics (which rustc turns on by default but
// compiletest turns off when it runs ui tests), then the errors are
// (unfortunately) repeated here because the checking is done as we read in the
// errors, and currently that happens two or three different times, depending on
// compiler flags.
//
// The test is much cleaner if we deduplicate, though.
// compile-flags: -Z deduplicate-diagnostics=yes
#![forbid(unused, non_snake_case)] #![forbid(unused, non_snake_case)]
#[allow(unused_variables)] //~ ERROR overruled #[allow(unused_variables)] //~ ERROR incompatible with previous
//~| ERROR overruled
//~| ERROR overruled
fn foo() {} fn foo() {}
#[allow(unused)] //~ ERROR overruled #[allow(unused)] //~ ERROR incompatible with previous
//~| ERROR overruled
//~| ERROR overruled
fn bar() {} fn bar() {}
#[allow(nonstandard_style)] //~ ERROR overruled #[allow(nonstandard_style)] //~ ERROR incompatible with previous
//~| ERROR overruled
//~| ERROR overruled
fn main() { fn main() {
println!("hello forbidden world") println!("hello forbidden world")
} }

68
src/test/ui/lint/outer-forbid.stderr
View File

@ -1,5 +1,5 @@
error[E0453]: allow(unused_variables) overruled by outer forbid(unused) error[E0453]: allow(unused_variables) incompatible with previous forbid
--> $DIR/outer-forbid.rs:9:9 --> $DIR/outer-forbid.rs:19:9
| |
LL | #![forbid(unused, non_snake_case)] LL | #![forbid(unused, non_snake_case)]
| ------ `forbid` level set here | ------ `forbid` level set here
@ -7,8 +7,8 @@ LL |
LL | #[allow(unused_variables)] LL | #[allow(unused_variables)]
| ^^^^^^^^^^^^^^^^ overruled by previous forbid | ^^^^^^^^^^^^^^^^ overruled by previous forbid
error[E0453]: allow(unused) overruled by outer forbid(unused) error[E0453]: allow(unused) incompatible with previous forbid
--> $DIR/outer-forbid.rs:14:9 --> $DIR/outer-forbid.rs:22:9
| |
LL | #![forbid(unused, non_snake_case)] LL | #![forbid(unused, non_snake_case)]
| ------ `forbid` level set here | ------ `forbid` level set here
@ -16,8 +16,8 @@ LL | #![forbid(unused, non_snake_case)]
LL | #[allow(unused)] LL | #[allow(unused)]
| ^^^^^^ overruled by previous forbid | ^^^^^^ overruled by previous forbid
error[E0453]: allow(nonstandard_style) overruled by outer forbid(non_snake_case) error[E0453]: allow(nonstandard_style) incompatible with previous forbid
--> $DIR/outer-forbid.rs:19:9 --> $DIR/outer-forbid.rs:25:9
| |
LL | #![forbid(unused, non_snake_case)] LL | #![forbid(unused, non_snake_case)]
| -------------- `forbid` level set here | -------------- `forbid` level set here
@ -25,60 +25,6 @@ LL | #![forbid(unused, non_snake_case)]
LL | #[allow(nonstandard_style)] LL | #[allow(nonstandard_style)]
| ^^^^^^^^^^^^^^^^^ overruled by previous forbid | ^^^^^^^^^^^^^^^^^ overruled by previous forbid
error[E0453]: allow(unused_variables) overruled by outer forbid(unused) error: aborting due to 3 previous errors
--> $DIR/outer-forbid.rs:9:9
|
LL | #![forbid(unused, non_snake_case)]
| ------ `forbid` level set here
LL |
LL | #[allow(unused_variables)]
| ^^^^^^^^^^^^^^^^ overruled by previous forbid
error[E0453]: allow(unused) overruled by outer forbid(unused)
--> $DIR/outer-forbid.rs:14:9
|
LL | #![forbid(unused, non_snake_case)]
| ------ `forbid` level set here
...
LL | #[allow(unused)]
| ^^^^^^ overruled by previous forbid
error[E0453]: allow(nonstandard_style) overruled by outer forbid(non_snake_case)
--> $DIR/outer-forbid.rs:19:9
|
LL | #![forbid(unused, non_snake_case)]
| -------------- `forbid` level set here
...
LL | #[allow(nonstandard_style)]
| ^^^^^^^^^^^^^^^^^ overruled by previous forbid
error[E0453]: allow(unused_variables) overruled by outer forbid(unused)
--> $DIR/outer-forbid.rs:9:9
|
LL | #![forbid(unused, non_snake_case)]
| ------ `forbid` level set here
LL |
LL | #[allow(unused_variables)]
| ^^^^^^^^^^^^^^^^ overruled by previous forbid
error[E0453]: allow(unused) overruled by outer forbid(unused)
--> $DIR/outer-forbid.rs:14:9
|
LL | #![forbid(unused, non_snake_case)]
| ------ `forbid` level set here
...
LL | #[allow(unused)]
| ^^^^^^ overruled by previous forbid
error[E0453]: allow(nonstandard_style) overruled by outer forbid(non_snake_case)
--> $DIR/outer-forbid.rs:19:9
|
LL | #![forbid(unused, non_snake_case)]
| -------------- `forbid` level set here
...
LL | #[allow(nonstandard_style)]
| ^^^^^^^^^^^^^^^^^ overruled by previous forbid
error: aborting due to 9 previous errors
For more information about this error, try `rustc --explain E0453`. For more information about this error, try `rustc --explain E0453`.

37
src/test/ui/lint/reasons-forbidden.rs
View File

@ -1,13 +1,19 @@
#![feature(lint_reasons)] #![feature(lint_reasons)]
// If you turn off deduplicate diagnostics (which rustc turns on by default but
// compiletest turns off when it runs ui tests), then the errors are
// (unfortunately) repeated here because the checking is done as we read in the
// errors, and currently that happens two or three different times, depending on
// compiler flags.
//
// The test is much cleaner if we deduplicate, though.
// compile-flags: -Z deduplicate-diagnostics=yes
#![forbid( #![forbid(
unsafe_code, unsafe_code,
//~^ NOTE `forbid` level set here //~^ NOTE `forbid` level set here
//~| NOTE `forbid` level set here //~| NOTE the lint level is defined here
//~| NOTE `forbid` level set here
//~| NOTE `forbid` level set here
//~| NOTE `forbid` level set here
//~| NOTE `forbid` level set here
reason = "our errors & omissions insurance policy doesn't cover unsafe Rust" reason = "our errors & omissions insurance policy doesn't cover unsafe Rust"
)] )]
@ -17,25 +23,12 @@ fn main() {
let a_billion_dollar_mistake = ptr::null(); let a_billion_dollar_mistake = ptr::null();
#[allow(unsafe_code)] #[allow(unsafe_code)]
//~^ ERROR allow(unsafe_code) overruled by outer forbid(unsafe_code) //~^ ERROR allow(unsafe_code) incompatible with previous forbid
//~| ERROR allow(unsafe_code) overruled by outer forbid(unsafe_code)
//~| ERROR allow(unsafe_code) overruled by outer forbid(unsafe_code)
//~| ERROR allow(unsafe_code) overruled by outer forbid(unsafe_code)
//~| ERROR allow(unsafe_code) overruled by outer forbid(unsafe_code)
//~| ERROR allow(unsafe_code) overruled by outer forbid(unsafe_code)
//~| NOTE overruled by previous forbid
//~| NOTE overruled by previous forbid
//~| NOTE overruled by previous forbid
//~| NOTE overruled by previous forbid
//~| NOTE overruled by previous forbid
//~| NOTE overruled by previous forbid
//~| NOTE our errors & omissions insurance policy doesn't cover unsafe Rust
//~| NOTE our errors & omissions insurance policy doesn't cover unsafe Rust
//~| NOTE our errors & omissions insurance policy doesn't cover unsafe Rust
//~| NOTE our errors & omissions insurance policy doesn't cover unsafe Rust
//~| NOTE our errors & omissions insurance policy doesn't cover unsafe Rust
//~| NOTE our errors & omissions insurance policy doesn't cover unsafe Rust //~| NOTE our errors & omissions insurance policy doesn't cover unsafe Rust
//~| NOTE overruled by previous forbid
unsafe { unsafe {
//~^ ERROR usage of an `unsafe` block
//~| NOTE our errors & omissions insurance policy doesn't cover unsafe Rust
*a_billion_dollar_mistake *a_billion_dollar_mistake
} }
} }

66
src/test/ui/lint/reasons-forbidden.stderr
View File

@ -1,5 +1,5 @@
error[E0453]: allow(unsafe_code) overruled by outer forbid(unsafe_code) error[E0453]: allow(unsafe_code) incompatible with previous forbid
--> $DIR/reasons-forbidden.rs:19:13 --> $DIR/reasons-forbidden.rs:25:13
| |
LL | unsafe_code, LL | unsafe_code,
| ----------- `forbid` level set here | ----------- `forbid` level set here
@ -9,61 +9,23 @@ LL | #[allow(unsafe_code)]
| |
= note: our errors & omissions insurance policy doesn't cover unsafe Rust = note: our errors & omissions insurance policy doesn't cover unsafe Rust
error[E0453]: allow(unsafe_code) overruled by outer forbid(unsafe_code) error: usage of an `unsafe` block
--> $DIR/reasons-forbidden.rs:19:13 --> $DIR/reasons-forbidden.rs:29:5
| |
LL | unsafe_code, LL | / unsafe {
| ----------- `forbid` level set here LL | |
... LL | |
LL | #[allow(unsafe_code)] LL | | *a_billion_dollar_mistake
| ^^^^^^^^^^^ overruled by previous forbid LL | | }
| |_____^
| |
= note: our errors & omissions insurance policy doesn't cover unsafe Rust = note: our errors & omissions insurance policy doesn't cover unsafe Rust
note: the lint level is defined here
error[E0453]: allow(unsafe_code) overruled by outer forbid(unsafe_code) --> $DIR/reasons-forbidden.rs:14:5
--> $DIR/reasons-forbidden.rs:19:13
| |
LL | unsafe_code, LL | unsafe_code,
| ----------- `forbid` level set here | ^^^^^^^^^^^
...
LL | #[allow(unsafe_code)]
| ^^^^^^^^^^^ overruled by previous forbid
|
= note: our errors & omissions insurance policy doesn't cover unsafe Rust
error[E0453]: allow(unsafe_code) overruled by outer forbid(unsafe_code) error: aborting due to 2 previous errors
--> $DIR/reasons-forbidden.rs:19:13
|
LL | unsafe_code,
| ----------- `forbid` level set here
...
LL | #[allow(unsafe_code)]
| ^^^^^^^^^^^ overruled by previous forbid
|
= note: our errors & omissions insurance policy doesn't cover unsafe Rust
error[E0453]: allow(unsafe_code) overruled by outer forbid(unsafe_code)
--> $DIR/reasons-forbidden.rs:19:13
|
LL | unsafe_code,
| ----------- `forbid` level set here
...
LL | #[allow(unsafe_code)]
| ^^^^^^^^^^^ overruled by previous forbid
|
= note: our errors & omissions insurance policy doesn't cover unsafe Rust
error[E0453]: allow(unsafe_code) overruled by outer forbid(unsafe_code)
--> $DIR/reasons-forbidden.rs:19:13
|
LL | unsafe_code,
| ----------- `forbid` level set here
...
LL | #[allow(unsafe_code)]
| ^^^^^^^^^^^ overruled by previous forbid
|
= note: our errors & omissions insurance policy doesn't cover unsafe Rust
error: aborting due to 6 previous errors
For more information about this error, try `rustc --explain E0453`. For more information about this error, try `rustc --explain E0453`.