Update env_logger to 0.5.4 by alexcrichton · Pull Request #48642 · rust-lang/rust

alexcrichton · 2018-03-01T19:10:37Z

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!

rust-highfive · 2018-03-01T19:10:47Z

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

kennytm · 2018-03-01T21:51:06Z

What about #47501?

alexcrichton · 2018-03-01T22:00:07Z

Oh right yeah! Looks like env_logger has since removed the chrono dependency, so seems like this may be able to progress?

michaelwoerister · 2018-03-02T09:36:39Z

@bors r+

bors · 2018-03-02T09:36:40Z

📌 Commit b25441a has been approved by michaelwoerister

alexcrichton · 2018-03-03T23:58:05Z

@bors: r=michaelwoerister

bors · 2018-03-03T23:58:06Z

📌 Commit aff7be7 has been approved by michaelwoerister

bors · 2018-03-04T07:09:42Z

☔ The latest upstream changes (presumably #48125) made this pull request unmergeable. Please resolve the merge conflicts.

alexcrichton · 2018-03-04T19:46:20Z

@bors: r=michaelwoerister

bors · 2018-03-04T19:46:20Z

📌 Commit 5420d3e has been approved by michaelwoerister

alexcrichton · 2018-03-05T21:30:17Z

@bors: r=michaelwoerister

I've thrown in an update to ena which updates its own dependency on log which should also fix a performance issue related to inlining I saw

bors · 2018-03-05T21:30:18Z

📌 Commit 23d9591 has been approved by michaelwoerister

alexcrichton · 2018-03-06T21:27:01Z

@bors: retry

network error?

bors · 2018-03-06T21:34:21Z

⌛ Testing commit 87f3dda with merge e586eb44d5817d1114db969dc51aa2d3b79924dd...

bors · 2018-03-06T22:24:11Z

💔 Test failed - status-travis

alexcrichton · 2018-03-06T22:39:14Z

@bors: retry

host is up for me locally?

bors · 2018-03-06T22:40:22Z

⌛ Testing commit 87f3dda with merge 4cdbac6...

…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!

bors · 2018-03-07T01:40:52Z

💔 Test failed - status-travis

alexcrichton · 2018-03-07T01:46:18Z

Although one dist builder failed, I'm merging anyway. If someone on mips breaks please ping me!

bors · 2018-03-07T01:46:39Z

☔ The latest upstream changes (presumably #48642) made this pull request unmergeable. Please resolve the merge conflicts.

kennytm-githubbot · 2018-03-07T01:47:48Z

📣 Toolstate changed by #48642!

Tested on commit 4cdbac6.
Direct link to PR: #48642

💔 rls on windows: test-pass → build-fail (cc @nrc).
💔 rls on linux: test-pass → build-fail (cc @nrc).

@nrc

Tested on commit rust-lang/rust@4cdbac6. Direct link to PR: <rust-lang/rust#48642> 💔 rls on windows: test-pass → build-fail (cc @nrc). 💔 rls on linux: test-pass → build-fail (cc @nrc).

alexcrichton · 2018-03-07T01:51:00Z

Gah sorry @nrc, didn't mean to break the rls! I forgot to update rls-rustc so I've included that update in #48549

bdrewery · 2018-03-12T19:02:31Z

@alexcrichton Looks like the rls-rustc update to 0.2.2 got lost somewhere to bring in rust-dev-tools/rls-rustc@c563ac9:

Building stage2 tool rls (x86_64-unknown-freebsd)
    c Sysroot { compiler: Compiler { stage: 2, host: "x86_64-unknown-freebsd" } }
    c Sysroot { compiler: Compiler { stage: 2, host: "x86_64-unknown-freebsd" } }
    c Sysroot { compiler: Compiler { stage: 2, host: "x86_64-unknown-freebsd" } }
    c Sysroot { compiler: Compiler { stage: 2, host: "x86_64-unknown-freebsd" } }
    c Sysroot { compiler: Compiler { stage: 2, host: "x86_64-unknown-freebsd" } }
running: "/root/git/rust/rust/build/x86_64-unknown-freebsd/stage0/bin/cargo" "build" "--target" "x86_64-unknown-freebsd" "-j" "16" "--release" "--manifest-path" "/root/git/rust/rust/src/tools/rls/Cargo.toml"
   Compiling rls-rustc v0.2.1
   Compiling unicode-xid v0.0.3
   Compiling rayon-core v1.4.0
   Compiling memchr v0.1.11
   Compiling rls v0.126.0 (file:///root/git/rust/rust/src/tools/rls)
   Compiling toml v0.2.1
   Compiling syntex_pos v0.52.0
   Compiling textwrap v0.9.0
   Compiling crossbeam-utils v0.2.2
   Compiling arrayvec v0.4.7
   Compiling radix_trie v0.1.2
   Compiling num-traits v0.1.43
   Compiling serde_json v1.0.10
   Compiling thread-id v2.0.0
   Compiling url_serde v0.2.0
   Compiling rls-span v0.4.0
   Compiling enum_primitive v0.1.1
   Compiling thread_local v0.2.7
   Compiling aho-corasick v0.5.3
error[E0599]: no method named `unwrap` found for type `()` in the current scope
  --> /root/.cargo/registry/src/github.com-1ecc6299db9ec823/rls-rustc-0.2.1/src/lib.rs:25:24
   |
25 |     env_logger::init().unwrap();
   |                        ^^^^^^

   Compiling crossbeam-epoch v0.3.0
error: aborting due to previous error

alexcrichton · 2018-03-12T20:02:05Z

@bdrewery indeed!

I intended to include it in #48549 but that PR changed so many times it fell out by accident, I'll submit a follow-up

rust-highfive assigned michaelwoerister Mar 1, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2018

alexcrichton force-pushed the compile-cargo-once branch from 9255eda to b25441a Compare March 1, 2018 20:05

alexcrichton mentioned this pull request Mar 1, 2018

Cargo and some dependencies are compiled twice on CI #48223

Closed

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 2, 2018

kennytm mentioned this pull request Mar 3, 2018

Rollup of 8 pull requests #48694

Merged

alexcrichton force-pushed the compile-cargo-once branch from b25441a to aff7be7 Compare March 3, 2018 23:57

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 4, 2018

alexcrichton force-pushed the compile-cargo-once branch from aff7be7 to 5420d3e Compare March 4, 2018 19:46

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 4, 2018

alexcrichton force-pushed the compile-cargo-once branch from 5420d3e to 23d9591 Compare March 5, 2018 21:29

alexcrichton mentioned this pull request Mar 5, 2018

Upgrade env_logger #47501

Closed

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 6, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 6, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 6, 2018

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 6, 2018

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 7, 2018

alexcrichton merged commit 87f3dda into rust-lang:master Mar 7, 2018

alexcrichton deleted the compile-cargo-once branch March 7, 2018 01:49

This was referenced Mar 7, 2018

Replace all const evaluation with miri #46882

Merged

Automatically enable the clippy feature of rls if clippy builds #48097

Merged

WIP: Parallelize passes using rayon #46564

Closed

Uh oh!

Conversation

alexcrichton commented Mar 1, 2018

Uh oh!

rust-highfive commented Mar 1, 2018

Uh oh!

kennytm commented Mar 1, 2018

Uh oh!

alexcrichton commented Mar 1, 2018

Uh oh!

michaelwoerister commented Mar 2, 2018

Uh oh!

bors commented Mar 2, 2018

Uh oh!

alexcrichton commented Mar 3, 2018

Uh oh!

bors commented Mar 3, 2018

Uh oh!

bors commented Mar 4, 2018

Uh oh!

alexcrichton commented Mar 4, 2018

Uh oh!

bors commented Mar 4, 2018

Uh oh!

alexcrichton commented Mar 5, 2018

Uh oh!

bors commented Mar 5, 2018

Uh oh!

alexcrichton commented Mar 6, 2018

Uh oh!

bors commented Mar 6, 2018

Uh oh!

bors commented Mar 6, 2018

Uh oh!

alexcrichton commented Mar 6, 2018

Uh oh!

bors commented Mar 6, 2018

Uh oh!

bors commented Mar 7, 2018

Uh oh!

alexcrichton commented Mar 7, 2018

Uh oh!

bors commented Mar 7, 2018

Uh oh!

kennytm-githubbot commented Mar 7, 2018

Uh oh!

alexcrichton commented Mar 7, 2018

Uh oh!

bdrewery commented Mar 12, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alexcrichton commented Mar 12, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

bdrewery commented Mar 12, 2018 •

edited

Loading