Mirrors/rust-clippy
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-clippy synced 2024-11-23 21:23:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #118470 - nnethercote:cleanup-error-handlers, r=compiler-errors

Browse source 
Cleanup error handlers

Mostly by making function naming more consistent. More to do after this, but this is enough for one PR.

r? compiler-errors
This commit is contained in:
bors 2023-12-02 02:48:34 +00:00
commit 30f8e871a3
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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 // as simple as moving the call from the hook to main, because `install_ice_hook` doesn't
// accept a generic closure. // accept a generic closure.
let version_info = rustc_tools_util::get_version_info!(); 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 || { exit(rustc_driver::catch_with_exit_code(move || {

8
tests/integration.rs
View file

@ -69,15 +69,15 @@ fn integration_test() {
// debug: // debug:
eprintln!("{stderr}"); eprintln!("{stderr}");
// this is an internal test to make sure we would correctly panic on a delay_span_bug // this is an internal test to make sure we would correctly panic on a span_delayed_bug
if repo_name == "matthiaskrgr/clippy_ci_panic_test" { if repo_name == "matthiaskrgr/clippy_ci_panic_test" {
// we need to kind of switch around our logic here: // we need to kind of switch around our logic here:
// if we find a panic, everything is fine, if we don't panic, SOMETHING is broken about our testing // if we find a panic, everything is fine, if we don't panic, SOMETHING is broken about our testing
// the repo basically just contains a delay_span_bug that forces rustc/clippy to panic: // the repo basically just contains a span_delayed_bug that forces rustc/clippy to panic:
/* /*
#![feature(rustc_attrs)] #![feature(rustc_attrs)]
#[rustc_error(delay_span_bug_from_inside_query)] #[rustc_error(span_delayed_bug_from_inside_query)]
fn main() {} fn main() {}
*/ */
@ -86,7 +86,7 @@ fn integration_test() {
return; return;
} }
panic!("panic caused by delay_span_bug was NOT detected! Something is broken!"); panic!("panic caused by span_delayed_bug was NOT detected! Something is broken!");
} }
if let Some(backtrace_start) = stderr.find("error: internal compiler error") { if let Some(backtrace_start) = stderr.find("error: internal compiler error") {