bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

compiletest: Always preserve kind for compiler diagnostics

Browse source 
Those that didn't previously preserved kind are now marked as not requiring annotations to keep the previous behavior.

Also, do not lose diagnostics with an empty message.
This commit is contained in:
Vadim Petrochenkov 2025-04-07 14:45:53 +03:00
parent 42048ea122
commit b86b3fb640
5 changed files with 46 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/tools/compiletest/src/errors.rs
View file

@ -53,6 +53,10 @@ pub struct Error {
/// `None` if not specified or unknown message kind.
pub kind: Option<ErrorKind>,
pub msg: String,
/// For some `Error`s, like secondary lines of multi-line diagnostics, line annotations
/// are not mandatory, even if they would otherwise be mandatory for primary errors.
/// Only makes sense for "actual" errors, not for "expected" errors.
pub require_annotation: bool,
}
impl Error {
@ -182,7 +186,7 @@ fn parse_expected(
kind,
msg
);
Some((follow_prev, Error { line_num, kind, msg }))
Some((follow_prev, Error { line_num, kind, msg, require_annotation: true }))
}
#[cfg(test)]

57
src/tools/compiletest/src/json.rs
View file

@ -231,36 +231,42 @@ fn push_actual_errors(
// We expect to replace these with something more structured anyhow.
let mut message_lines = diagnostic.message.lines();
let kind = ErrorKind::from_str(&diagnostic.level).ok();
if let Some(first_line) = message_lines.next() {
let ignore = |s| {
static RE: OnceLock<Regex> = OnceLock::new();
RE.get_or_init(|| {
Regex::new(r"aborting due to \d+ previous errors?|\d+ warnings? emitted").unwrap()
})
.is_match(s)
};
if primary_spans.is_empty() && !ignore(first_line) {
errors.push(Error { line_num: None, kind, msg: with_code(None, first_line) });
let first_line = message_lines.next().unwrap_or(&diagnostic.message);
if primary_spans.is_empty() {
static RE: OnceLock<Regex> = OnceLock::new();
let re_init =
|| Regex::new(r"aborting due to \d+ previous errors?|\d+ warnings? emitted").unwrap();
errors.push(Error {
line_num: None,
kind,
msg: with_code(None, first_line),
require_annotation: !RE.get_or_init(re_init).is_match(first_line),
});
} else {
for span in primary_spans {
errors.push(Error {
line_num: Some(span.line_start),
kind,
msg: with_code(Some(span), first_line),
require_annotation: true,
});
}
}
for next_line in message_lines {
if primary_spans.is_empty() {
errors.push(Error {
line_num: None,
kind,
msg: with_code(None, next_line),
require_annotation: false,
});
} else {
for span in primary_spans {
errors.push(Error {
line_num: Some(span.line_start),
kind,
msg: with_code(Some(span), first_line),
});
}
}
}
for next_line in message_lines {
if primary_spans.is_empty() {
errors.push(Error { line_num: None, kind: None, msg: with_code(None, next_line) });
} else {
for span in primary_spans {
errors.push(Error {
line_num: Some(span.line_start),
kind: None,
msg: with_code(Some(span), next_line),
require_annotation: false,
});
}
}
@ -274,6 +280,7 @@ fn push_actual_errors(
line_num: Some(span.line_start + index),
kind: Some(ErrorKind::Suggestion),
msg: line.to_string(),
require_annotation: true,
});
}
}
@ -292,6 +299,7 @@ fn push_actual_errors(
line_num: Some(span.line_start),
kind: Some(ErrorKind::Note),
msg: span.label.clone().unwrap(),
require_annotation: true,
});
}
@ -311,6 +319,7 @@ fn push_backtrace(
line_num: Some(expansion.span.line_start),
kind: Some(ErrorKind::Note),
msg: format!("in this expansion of {}", expansion.macro_decl_name),
require_annotation: true,
});
}

1
src/tools/compiletest/src/runtest.rs
View file

@ -811,6 +811,7 @@ impl<'test> TestCx<'test> {
expect_note: bool,
) -> bool {
!actual_error.msg.is_empty()
&& actual_error.require_annotation
&& match actual_error.kind {
Some(ErrorKind::Help) => expect_help,
Some(ErrorKind::Note) => expect_note,

3
tests/ui/proc-macro/issue-91800.rs
View file

@ -6,11 +6,14 @@ extern crate issue_91800_macro;
#[derive(MyTrait)]
//~^ ERROR macros that expand to items must be delimited with braces or followed by a semicolon
//~| ERROR proc-macro derive produced unparsable tokens
//~| ERROR
#[attribute_macro]
//~^ ERROR macros that expand to items must be delimited with braces or followed by a semicolon
//~| ERROR
struct MyStruct;
fn_macro! {}
//~^ ERROR macros that expand to items must be delimited with braces or followed by a semicolon
//~| ERROR
fn main() {}

8
tests/ui/proc-macro/issue-91800.stderr
View file

@ -21,7 +21,7 @@ LL | #[derive(MyTrait)]
= note: this error originates in the derive macro `MyTrait` (in Nightly builds, run with -Z macro-backtrace for more info)
error: macros that expand to items must be delimited with braces or followed by a semicolon
--> $DIR/issue-91800.rs:9:1
--> $DIR/issue-91800.rs:10:1
|
LL | #[attribute_macro]
| ^^^^^^^^^^^^^^^^^^
@ -29,7 +29,7 @@ LL | #[attribute_macro]
= note: this error originates in the attribute macro `attribute_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
error:
--> $DIR/issue-91800.rs:9:1
--> $DIR/issue-91800.rs:10:1
|
LL | #[attribute_macro]
| ^^^^^^^^^^^^^^^^^^
@ -37,7 +37,7 @@ LL | #[attribute_macro]
= note: this error originates in the attribute macro `attribute_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
error: macros that expand to items must be delimited with braces or followed by a semicolon
--> $DIR/issue-91800.rs:13:1
--> $DIR/issue-91800.rs:15:1
|
LL | fn_macro! {}
| ^^^^^^^^^^^^
@ -45,7 +45,7 @@ LL | fn_macro! {}
= note: this error originates in the macro `fn_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
error:
--> $DIR/issue-91800.rs:13:1
--> $DIR/issue-91800.rs:15:1
|
LL | fn_macro! {}
| ^^^^^^^^^^^^