Skip to content

Commit 214cd1f

Browse files
borsbors
committed
Auto merge of #87337 - jyn514:lint-error, r=oli-obk,flip1995
Don't abort compilation after giving a lint error The only reason to use `abort_if_errors` is when the program is so broken that either: 1. later passes get confused and ICE 2. any diagnostics from later passes would be noise This is never the case for lints, because the compiler has to be able to deal with `allow`-ed lints. So it can continue to lint and compile even if there are lint errors. Closes #82761. This is a WIP because I have a feeling it will exit with 0 even if there were lint errors; I don't have a computer that can build rustc locally at the moment.
2 parents 60952bc + ebf8966 commit 214cd1f

File tree

67 files changed

+486
-211
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+486
-211
lines changed

‎compiler/rustc_codegen_llvm/src/back/write.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ fn report_inline_asm(
286286
cookie = 0;
287287
}
288288
let level = match level {
289-
llvm::DiagnosticLevel::Error => Level::Error,
289+
llvm::DiagnosticLevel::Error => Level::Error { lint: false },
290290
llvm::DiagnosticLevel::Warning => Level::Warning,
291291
llvm::DiagnosticLevel::Note | llvm::DiagnosticLevel::Remark => Level::Note,
292292
};

‎compiler/rustc_codegen_ssa/src/back/write.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1757,7 +1757,7 @@ impl SharedEmitterMain {
17571757
let msg = msg.strip_prefix("error: ").unwrap_or(&msg);
17581758

17591759
let mut err = match level {
1760-
Level::Error => sess.struct_err(&msg),
1760+
Level::Error { lint: false } => sess.struct_err(&msg),
17611761
Level::Warning => sess.struct_warn(&msg),
17621762
Level::Note => sess.struct_note_without_error(&msg),
17631763
_ => bug!("Invalid inline asm diagnostic level"),

‎compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fn source_string(file: Lrc<SourceFile>, line: &Line) -> String {
6666
/// Maps `Diagnostic::Level` to `snippet::AnnotationType`
6767
fn annotation_type_for_level(level: Level) -> AnnotationType {
6868
match level {
69-
Level::Bug | Level::Fatal | Level::Error => AnnotationType::Error,
69+
Level::Bug | Level::Fatal | Level::Error { .. } => AnnotationType::Error,
7070
Level::Warning => AnnotationType::Warning,
7171
Level::Note => AnnotationType::Note,
7272
Level::Help => AnnotationType::Help,

‎compiler/rustc_errors/src/diagnostic.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl Diagnostic {
114114

115115
pub fn is_error(&self) -> bool {
116116
match self.level {
117-
Level::Bug | Level::Fatal | Level::Error | Level::FailureNote => true,
117+
Level::Bug | Level::Fatal | Level::Error { .. } | Level::FailureNote => true,
118118

119119
Level::Warning | Level::Note | Level::Help | Level::Cancelled | Level::Allow => false,
120120
}

‎compiler/rustc_errors/src/lib.rs

+39-9
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,8 @@ pub struct Handler {
411411
/// as well as inconsistent state observation.
412412
struct HandlerInner {
413413
flags: HandlerFlags,
414+
/// The number of lint errors that have been emitted.
415+
lint_err_count: usize,
414416
/// The number of errors that have been emitted, including duplicates.
415417
///
416418
/// This is not necessarily the count that's reported to the user once
@@ -550,6 +552,7 @@ impl Handler {
550552
flags,
551553
inner: Lock::new(HandlerInner {
552554
flags,
555+
lint_err_count: 0,
553556
err_count: 0,
554557
warn_count: 0,
555558
deduplicated_err_count: 0,
@@ -726,7 +729,13 @@ impl Handler {
726729
/// Construct a builder at the `Error` level with the `msg`.
727730
// FIXME: This method should be removed (every error should have an associated error code).
728731
pub fn struct_err(&self, msg: &str) -> DiagnosticBuilder<'_> {
729-
DiagnosticBuilder::new(self, Level::Error, msg)
732+
DiagnosticBuilder::new(self, Level::Error { lint: false }, msg)
733+
}
734+
735+
/// This should only be used by `rustc_middle::lint::struct_lint_level`. Do not use it for hard errors.
736+
#[doc(hidden)]
737+
pub fn struct_err_lint(&self, msg: &str) -> DiagnosticBuilder<'_> {
738+
DiagnosticBuilder::new(self, Level::Error { lint: true }, msg)
730739
}
731740

732741
/// Construct a builder at the `Error` level with the `msg` and the `code`.
@@ -790,11 +799,14 @@ impl Handler {
790799
}
791800

792801
pub fn span_err(&self, span: impl Into<MultiSpan>, msg: &str) {
793-
self.emit_diag_at_span(Diagnostic::new(Error, msg), span);
802+
self.emit_diag_at_span(Diagnostic::new(Error { lint: false }, msg), span);
794803
}
795804

796805
pub fn span_err_with_code(&self, span: impl Into<MultiSpan>, msg: &str, code: DiagnosticId) {
797-
self.emit_diag_at_span(Diagnostic::new_with_code(Error, Some(code), msg), span);
806+
self.emit_diag_at_span(
807+
Diagnostic::new_with_code(Error { lint: false }, Some(code), msg),
808+
span,
809+
);
798810
}
799811

800812
pub fn span_warn(&self, span: impl Into<MultiSpan>, msg: &str) {
@@ -862,6 +874,9 @@ impl Handler {
862874
pub fn has_errors(&self) -> bool {
863875
self.inner.borrow().has_errors()
864876
}
877+
pub fn has_errors_or_lint_errors(&self) -> bool {
878+
self.inner.borrow().has_errors_or_lint_errors()
879+
}
865880
pub fn has_errors_or_delayed_span_bugs(&self) -> bool {
866881
self.inner.borrow().has_errors_or_delayed_span_bugs()
867882
}
@@ -979,7 +994,11 @@ impl HandlerInner {
979994
}
980995
}
981996
if diagnostic.is_error() {
982-
self.bump_err_count();
997+
if matches!(diagnostic.level, Level::Error { lint: true }) {
998+
self.bump_lint_err_count();
999+
} else {
1000+
self.bump_err_count();
1001+
}
9831002
} else {
9841003
self.bump_warn_count();
9851004
}
@@ -1073,11 +1092,14 @@ impl HandlerInner {
10731092
fn has_errors(&self) -> bool {
10741093
self.err_count() > 0
10751094
}
1095+
fn has_errors_or_lint_errors(&self) -> bool {
1096+
self.has_errors() || self.lint_err_count > 0
1097+
}
10761098
fn has_errors_or_delayed_span_bugs(&self) -> bool {
10771099
self.has_errors() || !self.delayed_span_bugs.is_empty()
10781100
}
10791101
fn has_any_message(&self) -> bool {
1080-
self.err_count() > 0 || self.warn_count > 0
1102+
self.err_count() > 0 || self.lint_err_count > 0 || self.warn_count > 0
10811103
}
10821104

10831105
fn abort_if_errors(&mut self) {
@@ -1131,7 +1153,7 @@ impl HandlerInner {
11311153
}
11321154

11331155
fn err(&mut self, msg: &str) {
1134-
self.emit_error(Error, msg);
1156+
self.emit_error(Error { lint: false }, msg);
11351157
}
11361158

11371159
/// Emit an error; level should be `Error` or `Fatal`.
@@ -1167,6 +1189,11 @@ impl HandlerInner {
11671189
}
11681190
}
11691191

1192+
fn bump_lint_err_count(&mut self) {
1193+
self.lint_err_count += 1;
1194+
self.panic_if_treat_err_as_bug();
1195+
}
1196+
11701197
fn bump_err_count(&mut self) {
11711198
self.err_count += 1;
11721199
self.panic_if_treat_err_as_bug();
@@ -1210,7 +1237,10 @@ impl DelayedDiagnostic {
12101237
pub enum Level {
12111238
Bug,
12121239
Fatal,
1213-
Error,
1240+
Error {
1241+
/// If this error comes from a lint, don't abort compilation even when abort_if_errors() is called.
1242+
lint: bool,
1243+
},
12141244
Warning,
12151245
Note,
12161246
Help,
@@ -1229,7 +1259,7 @@ impl Level {
12291259
fn color(self) -> ColorSpec {
12301260
let mut spec = ColorSpec::new();
12311261
match self {
1232-
Bug | Fatal | Error => {
1262+
Bug | Fatal | Error { .. } => {
12331263
spec.set_fg(Some(Color::Red)).set_intense(true);
12341264
}
12351265
Warning => {
@@ -1250,7 +1280,7 @@ impl Level {
12501280
pub fn to_str(self) -> &'static str {
12511281
match self {
12521282
Bug => "error: internal compiler error",
1253-
Fatal | Error => "error",
1283+
Fatal | Error { .. } => "error",
12541284
Warning => "warning",
12551285
Note => "note",
12561286
Help => "help",

‎compiler/rustc_expand/src/proc_macro_server.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ impl ToInternal<TokenStream> for TokenTree<Group, Punct, Ident, Literal> {
273273
impl ToInternal<rustc_errors::Level> for Level {
274274
fn to_internal(self) -> rustc_errors::Level {
275275
match self {
276-
Level::Error => rustc_errors::Level::Error,
276+
Level::Error => rustc_errors::Level::Error { lint: false },
277277
Level::Warning => rustc_errors::Level::Warning,
278278
Level::Note => rustc_errors::Level::Note,
279279
Level::Help => rustc_errors::Level::Help,

‎compiler/rustc_middle/src/lint.rs

+6-2
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,12 @@ pub fn struct_lint_level<'s, 'd>(
248248
(Level::Warn, None) => sess.struct_warn(""),
249249
(Level::ForceWarn, Some(span)) => sess.struct_span_force_warn(span, ""),
250250
(Level::ForceWarn, None) => sess.struct_force_warn(""),
251-
(Level::Deny | Level::Forbid, Some(span)) => sess.struct_span_err(span, ""),
252-
(Level::Deny | Level::Forbid, None) => sess.struct_err(""),
251+
(Level::Deny | Level::Forbid, Some(span)) => {
252+
let mut builder = sess.diagnostic().struct_err_lint("");
253+
builder.set_span(span);
254+
builder
255+
}
256+
(Level::Deny | Level::Forbid, None) => sess.diagnostic().struct_err_lint(""),
253257
};
254258

255259
// If this code originates in a foreign macro, aka something that this crate

‎compiler/rustc_session/src/session.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ impl Session {
411411
self.diagnostic().abort_if_errors();
412412
}
413413
pub fn compile_status(&self) -> Result<(), ErrorReported> {
414-
if self.has_errors() {
414+
if self.diagnostic().has_errors_or_lint_errors() {
415415
self.diagnostic().emit_stashed_diagnostics();
416416
Err(ErrorReported)
417417
} else {

‎src/librustdoc/core.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -468,11 +468,13 @@ crate fn run_global_ctxt(
468468
};
469469
if run {
470470
debug!("running pass {}", p.pass.name);
471-
krate = ctxt.tcx.sess.time(p.pass.name, || (p.pass.run)(krate, &mut ctxt));
471+
krate = tcx.sess.time(p.pass.name, || (p.pass.run)(krate, &mut ctxt));
472472
}
473473
}
474474

475-
ctxt.sess().abort_if_errors();
475+
if tcx.sess.diagnostic().has_errors_or_lint_errors() {
476+
rustc_errors::FatalError.raise();
477+
}
476478

477479
let render_options = ctxt.render_options;
478480
let mut cache = ctxt.cache;

‎src/librustdoc/doctest.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rustc_ast as ast;
22
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
33
use rustc_data_structures::sync::Lrc;
4-
use rustc_errors::{ColorConfig, ErrorReported};
4+
use rustc_errors::{ColorConfig, ErrorReported, FatalError};
55
use rustc_hir as hir;
66
use rustc_hir::def_id::LOCAL_CRATE;
77
use rustc_hir::intravisit;
@@ -149,7 +149,9 @@ crate fn run(options: Options) -> Result<(), ErrorReported> {
149149

150150
collector
151151
});
152-
compiler.session().abort_if_errors();
152+
if compiler.session().diagnostic().has_errors_or_lint_errors() {
153+
FatalError.raise();
154+
}
153155

154156
let unused_extern_reports = collector.unused_extern_reports.clone();
155157
let compiling_test_count = collector.compiling_test_count.load(Ordering::SeqCst);

‎src/librustdoc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ fn main_options(options: config::Options) -> MainResult {
776776
// current architecture.
777777
let resolver = core::create_resolver(queries, sess);
778778

779-
if sess.has_errors() {
779+
if sess.diagnostic().has_errors_or_lint_errors() {
780780
sess.fatal("Compilation failed, aborting rustdoc");
781781
}
782782

‎src/test/ui-fulldeps/lint-tool-test.rs

+3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,12 @@
1010
//~^ WARNING lint name `test_lint` is deprecated and may not have an effect in the future
1111
//~| WARNING lint name `test_lint` is deprecated and may not have an effect in the future
1212
//~| WARNING lint name `test_lint` is deprecated and may not have an effect in the future
13+
//~| WARNING lint name `test_lint` is deprecated and may not have an effect in the future
1314
#![deny(clippy_group)]
1415
//~^ WARNING lint name `clippy_group` is deprecated and may not have an effect in the future
1516
//~| WARNING lint name `clippy_group` is deprecated and may not have an effect in the future
1617
//~| WARNING lint name `clippy_group` is deprecated and may not have an effect in the future
18+
//~| WARNING lint name `clippy_group` is deprecated and may not have an effect in the future
1719

1820
fn lintme() { } //~ ERROR item is named 'lintme'
1921

@@ -30,6 +32,7 @@ pub fn main() {
3032
//~^ WARNING lint name `test_group` is deprecated and may not have an effect in the future
3133
//~| WARNING lint name `test_group` is deprecated and may not have an effect in the future
3234
//~| WARNING lint name `test_group` is deprecated and may not have an effect in the future
35+
//~| WARNING lint name `test_group` is deprecated and may not have an effect in the future
3336
#[deny(this_lint_does_not_exist)] //~ WARNING unknown lint: `this_lint_does_not_exist`
3437
fn hello() {
3538
fn lintmetoo() { }

‎src/test/ui-fulldeps/lint-tool-test.stderr

+30-12
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ LL | #![cfg_attr(foo, warn(test_lint))]
77
= note: `#[warn(renamed_and_removed_lints)]` on by default
88

99
warning: lint name `clippy_group` is deprecated and may not have an effect in the future.
10-
--> $DIR/lint-tool-test.rs:13:9
10+
--> $DIR/lint-tool-test.rs:14:9
1111
|
1212
LL | #![deny(clippy_group)]
1313
| ^^^^^^^^^^^^ help: change it to: `clippy::group`
1414

1515
warning: lint name `test_group` is deprecated and may not have an effect in the future.
16-
--> $DIR/lint-tool-test.rs:29:9
16+
--> $DIR/lint-tool-test.rs:31:9
1717
|
1818
LL | #[allow(test_group)]
1919
| ^^^^^^^^^^ help: change it to: `clippy::test_group`
2020

2121
warning: unknown lint: `this_lint_does_not_exist`
22-
--> $DIR/lint-tool-test.rs:33:8
22+
--> $DIR/lint-tool-test.rs:36:8
2323
|
2424
LL | #[deny(this_lint_does_not_exist)]
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -33,13 +33,13 @@ LL | #![cfg_attr(foo, warn(test_lint))]
3333
| ^^^^^^^^^ help: change it to: `clippy::test_lint`
3434

3535
warning: lint name `clippy_group` is deprecated and may not have an effect in the future.
36-
--> $DIR/lint-tool-test.rs:13:9
36+
--> $DIR/lint-tool-test.rs:14:9
3737
|
3838
LL | #![deny(clippy_group)]
3939
| ^^^^^^^^^^^^ help: change it to: `clippy::group`
4040

4141
warning: lint name `test_group` is deprecated and may not have an effect in the future.
42-
--> $DIR/lint-tool-test.rs:29:9
42+
--> $DIR/lint-tool-test.rs:31:9
4343
|
4444
LL | #[allow(test_group)]
4545
| ^^^^^^^^^^ help: change it to: `clippy::test_group`
@@ -59,42 +59,60 @@ LL | #![cfg_attr(foo, warn(test_lint))]
5959
| ^^^^^^^^^ help: change it to: `clippy::test_lint`
6060

6161
warning: lint name `clippy_group` is deprecated and may not have an effect in the future.
62-
--> $DIR/lint-tool-test.rs:13:9
62+
--> $DIR/lint-tool-test.rs:14:9
6363
|
6464
LL | #![deny(clippy_group)]
6565
| ^^^^^^^^^^^^ help: change it to: `clippy::group`
6666

6767
error: item is named 'lintme'
68-
--> $DIR/lint-tool-test.rs:18:1
68+
--> $DIR/lint-tool-test.rs:20:1
6969
|
7070
LL | fn lintme() { }
7171
| ^^^^^^^^^^^^^^^
7272
|
7373
note: the lint level is defined here
74-
--> $DIR/lint-tool-test.rs:13:9
74+
--> $DIR/lint-tool-test.rs:14:9
7575
|
7676
LL | #![deny(clippy_group)]
7777
| ^^^^^^^^^^^^
7878
= note: `#[deny(clippy::test_lint)]` implied by `#[deny(clippy::group)]`
7979

8080
error: item is named 'lintmetoo'
81-
--> $DIR/lint-tool-test.rs:26:5
81+
--> $DIR/lint-tool-test.rs:28:5
8282
|
8383
LL | fn lintmetoo() { }
8484
| ^^^^^^^^^^^^^^^^^^
8585
|
8686
note: the lint level is defined here
87-
--> $DIR/lint-tool-test.rs:13:9
87+
--> $DIR/lint-tool-test.rs:14:9
8888
|
8989
LL | #![deny(clippy_group)]
9090
| ^^^^^^^^^^^^
9191
= note: `#[deny(clippy::test_group)]` implied by `#[deny(clippy::group)]`
9292

9393
warning: lint name `test_group` is deprecated and may not have an effect in the future.
94-
--> $DIR/lint-tool-test.rs:29:9
94+
--> $DIR/lint-tool-test.rs:31:9
9595
|
9696
LL | #[allow(test_group)]
9797
| ^^^^^^^^^^ help: change it to: `clippy::test_group`
9898

99-
error: aborting due to 2 previous errors; 11 warnings emitted
99+
warning: lint name `test_lint` is deprecated and may not have an effect in the future.
100+
--> $DIR/lint-tool-test.rs:9:23
101+
|
102+
LL | #![cfg_attr(foo, warn(test_lint))]
103+
| ^^^^^^^^^ help: change it to: `clippy::test_lint`
104+
105+
warning: lint name `clippy_group` is deprecated and may not have an effect in the future.
106+
--> $DIR/lint-tool-test.rs:14:9
107+
|
108+
LL | #![deny(clippy_group)]
109+
| ^^^^^^^^^^^^ help: change it to: `clippy::group`
110+
111+
warning: lint name `test_group` is deprecated and may not have an effect in the future.
112+
--> $DIR/lint-tool-test.rs:31:9
113+
|
114+
LL | #[allow(test_group)]
115+
| ^^^^^^^^^^ help: change it to: `clippy::test_group`
116+
117+
error: aborting due to 2 previous errors; 14 warnings emitted
100118

‎src/test/ui/deprecation/deprecation-lint.rs

+1
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@ mod this_crate {
278278
let _ = nested::DeprecatedStruct {
279279
//~^ ERROR use of deprecated struct `this_crate::nested::DeprecatedStruct`: text
280280
i: 0 //~ ERROR use of deprecated field `this_crate::nested::DeprecatedStruct::i`: text
281+
//~| ERROR field `i` of struct `this_crate::nested::DeprecatedStruct` is private
281282
};
282283

283284
let _ = nested::DeprecatedUnitStruct; //~ ERROR use of deprecated unit struct `this_crate::nested::DeprecatedUnitStruct`: text

0 commit comments

Comments
 (0)