Skip to content

Commit

Permalink
Auto merge of #48642 - alexcrichton:compile-cargo-once, r=michaelwoer…
Browse files Browse the repository at this point in the history
…ister

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!
  • Loading branch information
bors committed Mar 6, 2018
2 parents 2b297e7 + 2e3023a commit d2ae289
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down

0 comments on commit d2ae289

Please sign in to comment.