OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't panic if `CLIPPY_ARGS` is not Unicode

This commit is contained in:
hyd-dev 2021-03-08 18:49:41 +08:00
parent 2d53b6b824
commit 3cd5f44ec4
No known key found for this signature in database
GPG Key ID: 74FA7FD5B8DA14B8
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver.rs
View File

@ -20,7 +20,7 @@ use rustc_span::symbol::Symbol;
use rustc_tools_util::VersionInfo;
use std::borrow::Cow;
use std::env::{self, VarError};
use std::env;
use std::lazy::SyncLazy;
use std::ops::Deref;
use std::panic;
@ -314,13 +314,7 @@ pub fn main() {
};
let mut no_deps = false;
let clippy_args_var = env::var("CLIPPY_ARGS").map_or_else(
|e| match e {
VarError::NotPresent => None,
VarError::NotUnicode(s) => panic!("CLIPPY_ARGS is not valid Unicode: {:?}", s),
},
Some,
);
let clippy_args_var = env::var("CLIPPY_ARGS").ok();
let clippy_args = clippy_args_var
.as_deref()
.unwrap_or_default()