bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustc/driver: use Cow<str> where applicable

Browse source
This commit is contained in:
ljedrz 2018-10-12 14:16:06 +02:00
parent 9a1de086e4
commit 2c482d8d41
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/librustc_driver/lib.rs
View file

@ -90,6 +90,7 @@ use rustc_codegen_utils::codegen_backend::CodegenBackend;
use serialize::json::ToJson; use serialize::json::ToJson;
use std::any::Any; use std::any::Any;
use std::borrow::Cow;
use std::cmp::max; use std::cmp::max;
use std::default::Default; use std::default::Default;
use std::env::consts::{DLL_PREFIX, DLL_SUFFIX}; use std::env::consts::{DLL_PREFIX, DLL_SUFFIX};
@ -1678,25 +1679,25 @@ pub fn monitor<F: FnOnce() + Send + 'static>(f: F) -> Result<(), CompilationFail
errors::Level::Bug); errors::Level::Bug);
} }
let mut xs = vec![ let mut xs: Vec<Cow<'static, str>> = vec![
"the compiler unexpectedly panicked. this is a bug.".to_string(), "the compiler unexpectedly panicked. this is a bug.".into(),
format!("we would appreciate a bug report: {}", BUG_REPORT_URL), format!("we would appreciate a bug report: {}", BUG_REPORT_URL).into(),
format!("rustc {} running on {}", format!("rustc {} running on {}",
option_env!("CFG_VERSION").unwrap_or("unknown_version"), option_env!("CFG_VERSION").unwrap_or("unknown_version"),
config::host_triple()), config::host_triple()).into(),
]; ];
if let Some((flags, excluded_cargo_defaults)) = extra_compiler_flags() { if let Some((flags, excluded_cargo_defaults)) = extra_compiler_flags() {
xs.push(format!("compiler flags: {}", flags.join(" "))); xs.push(format!("compiler flags: {}", flags.join(" ")).into());
if excluded_cargo_defaults { if excluded_cargo_defaults {
xs.push("some of the compiler flags provided by cargo are hidden".to_string()); xs.push("some of the compiler flags provided by cargo are hidden".into());
} }
} }
for note in &xs { for note in &xs {
handler.emit(&MultiSpan::new(), handler.emit(&MultiSpan::new(),
&note, note,
errors::Level::Note); errors::Level::Note);
} }