bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use early_error

Browse source
This commit is contained in:
Camelid 2020-11-23 17:38:20 -08:00
parent 8ad1a1cf39
commit 173a7dbace
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/rustc_driver/src/lib.rs
View file

@ -1288,12 +1288,19 @@ pub fn init_env_logger(env: &str) {
"always" => true, "always" => true,
"never" => false, "never" => false,
"auto" => stdout_isatty(), "auto" => stdout_isatty(),
_ => panic!("invalid log color value '{}': expected one of always, never, or auto", value), _ => early_error(
ErrorOutputType::default(),
&format!(
"invalid log color value '{}': expected one of always, never, or auto",
value
),
),
}, },
Err(std::env::VarError::NotPresent) => stdout_isatty(), Err(std::env::VarError::NotPresent) => stdout_isatty(),
Err(std::env::VarError::NotUnicode(_value)) => { Err(std::env::VarError::NotUnicode(_value)) => early_error(
panic!("non-unicode log color value: expected one of always, never, or auto") ErrorOutputType::default(),
} "non-Unicode log color value: expected one of always, never, or auto",
),
}; };
let filter = tracing_subscriber::EnvFilter::from_env(env); let filter = tracing_subscriber::EnvFilter::from_env(env);
let layer = tracing_tree::HierarchicalLayer::default() let layer = tracing_tree::HierarchicalLayer::default()
@ -1324,7 +1331,7 @@ pub fn main() -> ! {
arg.into_string().unwrap_or_else(|arg| { arg.into_string().unwrap_or_else(|arg| {
early_error( early_error(
ErrorOutputType::default(), ErrorOutputType::default(),
&format!("Argument {} is not valid Unicode: {:?}", i, arg), &format!("argument {} is not valid Unicode: {:?}", i, arg),
) )
}) })
}) })