diff options
| author | bors <bors@rust-lang.org> | 2018-03-06 22:40:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-06 22:40:15 +0000 |
| commit | 4cdbac639af2074b8a07b4391b4e3e28b4118487 (patch) | |
| tree | 9a58c89d76742813ba0df750d852209846619b07 /src/tools/compiletest | |
| parent | 2789b067da2ac921b86199bde21dd231ace1da39 (diff) | |
| parent | 87f3dda514a587fcaf4523816a6188368b8bc568 (diff) | |
Auto merge of #48642 - alexcrichton:compile-cargo-once, r=michaelwoerister
Update env_logger to 0.5.4 It looks like this cuts down on the number of dependencies in env_logger and notably cuts out a difference between a shared dependency of rls/cargo. My goal here is to ensure that when we compile the RLS/Cargo on CI we only compile Cargo once, and this is one step towards that!
Diffstat (limited to 'src/tools/compiletest')
| -rw-r--r-- | src/tools/compiletest/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/tools/compiletest/src/main.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index 725c8e75e6a..fb7125ffa01 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -5,7 +5,7 @@ version = "0.0.0" [dependencies] diff = "0.1.10" -env_logger = { version = "0.4", default-features = false } +env_logger = { version = "0.5", default-features = false } filetime = "0.1" getopts = "0.2" log = "0.4" diff --git a/src/tools/compiletest/src/main.rs b/src/tools/compiletest/src/main.rs index 304143eaa0b..7928cab74fe 100644 --- a/src/tools/compiletest/src/main.rs +++ b/src/tools/compiletest/src/main.rs @@ -51,7 +51,7 @@ mod raise_fd_limit; mod read2; fn main() { - env_logger::init().unwrap(); + env_logger::init(); let config = parse_config(env::args().collect()); |
