user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename *note_without_error as *note.

Browse source 
Because the variant name in `Level` is `Note`, and the `without_error`
suffix is omitted in similar cases like `struct_allow` and
`struct_help`.
This commit is contained in:
Nicholas Nethercote 2023-11-30 14:01:35 +11:00
parent c3628bb970
commit 57d6f840b9
10 changed files with 25 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/clippy/src/driver.rs
View file

@ -183,7 +183,7 @@ pub fn main() {
// as simple as moving the call from the hook to main, because `install_ice_hook` doesn't
// accept a generic closure.
let version_info = rustc_tools_util::get_version_info!();
handler.note_without_error(format!("Clippy version: {version_info}"));
handler.note(format!("Clippy version: {version_info}"));
});
exit(rustc_driver::catch_with_exit_code(move || {

4
src/tools/miri/src/diagnostics.rs
View file

@ -384,7 +384,7 @@ pub fn report_error<'tcx, 'mir>(
// Include a note like `std` does when we omit frames from a backtrace
if was_pruned {
ecx.tcx.sess.diagnostic().note_without_error(
ecx.tcx.sess.diagnostic().note(
"some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace",
);
}
@ -431,7 +431,7 @@ pub fn report_leaks<'mir, 'tcx>(
);
}
if any_pruned {
ecx.tcx.sess.diagnostic().note_without_error(
ecx.tcx.sess.diagnostic().note(
"some details are omitted, run with `MIRIFLAGS=-Zmiri-backtrace=full` for a verbose backtrace",
);
}

4
src/tools/miri/src/eval.rs
View file

@ -464,7 +464,7 @@ pub fn eval_entry<'tcx>(
// Check for thread leaks.
if !ecx.have_all_terminated() {
tcx.sess.err("the main thread terminated without waiting for all remaining threads");
tcx.sess.note_without_error("pass `-Zmiri-ignore-leaks` to disable this check");
tcx.sess.note("pass `-Zmiri-ignore-leaks` to disable this check");
return None;
}
// Check for memory leaks.
@ -475,7 +475,7 @@ pub fn eval_entry<'tcx>(
let leak_message = "the evaluated program leaked memory, pass `-Zmiri-ignore-leaks` to disable this check";
if ecx.machine.collect_leak_backtraces {
// If we are collecting leak backtraces, each leak is a distinct error diagnostic.
tcx.sess.note_without_error(leak_message);
tcx.sess.note(leak_message);
} else {
// If we do not have backtraces, we just report an error without any span.
tcx.sess.err(leak_message);