mirror of https://github.com/rust-lang/rust.git
very minor cleanups
- add `must_use` to `early_error_no_abort` this was already being used at its only callsite, but this ensures that new code remembers to use it if it's called in the future. - remove outdated and incorrect comment in `builder.rs`. `doc_rust_lang_org_channel` doesn't exist in rustdoc, it gets it from an env var instead.
This commit is contained in:
parent
ba6f5e3b4d
commit
04265621f9
|
@ -1250,7 +1250,8 @@ pub fn install_ice_hook(bug_report_url: &'static str, extra_info: fn(&Handler))
|
|||
#[cfg(windows)]
|
||||
if let Some(msg) = info.payload().downcast_ref::<String>() {
|
||||
if msg.starts_with("failed printing to stdout: ") && msg.ends_with("(os error 232)") {
|
||||
early_error_no_abort(ErrorOutputType::default(), msg.as_str());
|
||||
// the error code is already going to be reported when the panic unwinds up the stack
|
||||
let _ = early_error_no_abort(ErrorOutputType::default(), msg.as_str());
|
||||
return;
|
||||
}
|
||||
};
|
||||
|
|
|
@ -1727,6 +1727,7 @@ fn early_error_handler(output: config::ErrorOutputType) -> rustc_errors::Handler
|
|||
|
||||
#[allow(rustc::untranslatable_diagnostic)]
|
||||
#[allow(rustc::diagnostic_outside_of_impl)]
|
||||
#[must_use = "ErrorGuaranteed must be returned from `run_compiler` in order to exit with a non-zero status code"]
|
||||
pub fn early_error_no_abort(
|
||||
output: config::ErrorOutputType,
|
||||
msg: impl Into<DiagnosticMessage>,
|
||||
|
|
|
@ -942,7 +942,6 @@ impl<'a> Builder<'a> {
|
|||
self.run_step_descriptions(&Builder::get_step_descriptions(Kind::Doc), paths);
|
||||
}
|
||||
|
||||
/// NOTE: keep this in sync with `rustdoc::clean::utils::doc_rust_lang_org_channel`, or tests will fail on beta/stable.
|
||||
pub fn doc_rust_lang_org_channel(&self) -> String {
|
||||
let channel = match &*self.config.channel {
|
||||
"stable" => &self.version,
|
||||
|
|
Loading…
Reference in New Issue