Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update env_logger to 0.5.4 #48642

Merged
merged 1 commit into from
Mar 7, 2018
Merged

Update env_logger to 0.5.4 #48642

merged 1 commit into from
Mar 7, 2018

Conversation

alexcrichton
Copy link
Member

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
Copy link
Collaborator

r? @michaelwoerister

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

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

kennytm commented Mar 1, 2018

What about #47501?

@alexcrichton
Copy link
Member Author

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

@alexcrichton alexcrichton mentioned this pull request Mar 1, 2018
Closed
@michaelwoerister
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 2, 2018

📌 Commit b25441a has been approved by michaelwoerister

@bors 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 kennytm mentioned this pull request Mar 3, 2018
Merged
@alexcrichton
Copy link
Member Author

@bors: r=michaelwoerister

@bors
Copy link
Contributor

bors commented Mar 3, 2018

📌 Commit aff7be7 has been approved by michaelwoerister

@bors
Copy link
Contributor

bors commented Mar 4, 2018

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

@bors 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
Copy link
Member Author

@bors: r=michaelwoerister

@bors
Copy link
Contributor

bors commented Mar 4, 2018

📌 Commit 5420d3e has been approved by michaelwoerister

@bors 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
Copy link
Member Author

@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
Copy link
Contributor

bors commented Mar 5, 2018

📌 Commit 23d9591 has been approved by michaelwoerister

@alexcrichton alexcrichton mentioned this pull request Mar 5, 2018
Closed
@bors 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
@alexcrichton
Copy link
Member Author

@bors: retry

network error?

@bors 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
Copy link
Contributor

bors commented Mar 6, 2018

⌛ Testing commit 87f3dda with merge e586eb44d5817d1114db969dc51aa2d3b79924dd...

@bors
Copy link
Contributor

bors commented Mar 6, 2018

💔 Test failed - status-travis

@bors 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
@alexcrichton
Copy link
Member Author

@bors: retry

host is up for me locally?

@bors 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
Copy link
Contributor

bors commented Mar 6, 2018

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

bors added a commit that referenced this pull request Mar 6, 2018
@bors
Auto merge of #48642 - alexcrichton:compile-cargo-once, r=michaelwoer…
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
Copy link
Contributor

bors commented Mar 7, 2018

💔 Test failed - status-travis

@bors 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
Copy link
Member Author

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

@bors
Copy link
Contributor

bors commented Mar 7, 2018

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

@alexcrichton alexcrichton merged commit 87f3dda into rust-lang:master Mar 7, 2018
@kennytm-githubbot
Copy link

📣 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).

kennytm-githubbot added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Mar 7, 2018
@kennytm-githubbot
📣 Toolstate changed by rust-lang/rust#48642!
b54b786 
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 alexcrichton deleted the compile-cargo-once branch March 7, 2018 01:49
@alexcrichton
Copy link
Member Author

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

This was referenced Mar 7, 2018
Merged
Merged
Closed
@bdrewery
Copy link
Contributor

bdrewery commented Mar 12, 2018 •
edited
Loading

@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
Copy link
Member Author

@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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@michaelwoerister michaelwoerister

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@alexcrichton @rust-highfive @kennytm @michaelwoerister @bors @kennytm-githubbot @bdrewery