Skip to content

Commit 4b86841

Browse files
committed
Auto merge of #30804 - shssoichiro:deny-warnings-msg, r=nrc
Show clearer error message when #![deny(warnings)] escalates a warning Addresses #30730
2 parents bb868f1 + a5bdc43 commit 4b86841

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

src/librustc/lint/context.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,9 +489,14 @@ pub trait LintContext: Sized {
489489

490490
fn level_src(&self, lint: &'static Lint) -> Option<LevelSource> {
491491
self.lints().levels.get(&LintId::of(lint)).map(|ls| match ls {
492-
&(Warn, src) => {
492+
&(Warn, _) => {
493493
let lint_id = LintId::of(builtin::WARNINGS);
494-
(self.lints().get_level_source(lint_id).0, src)
494+
let warn_src = self.lints().get_level_source(lint_id);
495+
if warn_src.0 != Warn {
496+
warn_src
497+
} else {
498+
*ls
499+
}
495500
}
496501
_ => *ls
497502
})

src/test/compile-fail/issue-30730.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![deny(warnings)] //~ NOTE: lint level defined here
12+
use std::thread; //~ ERROR: unused import
13+
fn main() {}

0 commit comments

Comments
 (0)