bjoernager/rust
bjoernager/rust
1
Fork 0
Code 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 2da59b8676
170 changed files with 495 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_codegen_ssa/src/back/link.rs
View file

@ -143,7 +143,7 @@ pub fn link_binary<'a>(
}
}
if sess.opts.json_artifact_notifications {
sess.parse_sess.span_diagnostic.emit_artifact_notification(&out_filename, "link");
sess.diagnostic().emit_artifact_notification(&out_filename, "link");
}
if sess.prof.enabled() {
@ -1464,7 +1464,7 @@ fn print_native_static_libs(
sess.emit_note(errors::StaticLibraryNativeArtifacts);
// Prefix for greppability
// Note: This must not be translated as tools are allowed to depend on this exact string.
sess.note_without_error(format!("native-static-libs: {}", &lib_args.join(" ")));
sess.note(format!("native-static-libs: {}", &lib_args.join(" ")));
}
}
}

2
compiler/rustc_codegen_ssa/src/back/write.rs
View file

@ -1856,7 +1856,7 @@ impl SharedEmitterMain {
let mut err = match level {
Level::Error { lint: false } => sess.struct_err(msg).forget_guarantee(),
Level::Warning(_) => sess.struct_warn(msg),
Level::Note => sess.struct_note_without_error(msg),
Level::Note => sess.struct_note(msg),
_ => bug!("Invalid inline asm diagnostic level"),
};

2
compiler/rustc_codegen_ssa/src/codegen_attrs.rs
View file

@ -91,7 +91,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
Some(tcx.fn_sig(did))
} else {
tcx.sess
.delay_span_bug(attr.span, "this attribute can only be applied to functions");
.span_delayed_bug(attr.span, "this attribute can only be applied to functions");
None
}
};