Skip to content

Conversation

@alexcrichton
Copy link
Member

Brings in some perf improvements!

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@petrochenkov
Copy link
Contributor

Nice!
Running a single test with x.py test is annoyingly slow, maybe this will help a bit (submodule processing is still the main problem though).
For reference, the perf improvements in question are rust-lang/cargo#4118.
@bors r+

@bors
Copy link
Collaborator

bors commented Jun 5, 2017

📌 Commit c7bfa0c has been approved by petrochenkov

@Mark-Simulacrum
Copy link
Member

@bors r-

https://travis-ci.org/rust-lang/rust/jobs/239646661#L1219

[00:01:38] error: the lock file needs to be updated but --frozen was passed to prevent this
[00:01:38] failed to run: /checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /checkout/src/bootstrap/Cargo.toml --locked
[00:01:38] Build completed unsuccessfully in 0:00:31
[00:01:38] Makefile:76: recipe for target 'prepare' failed

@alexcrichton
Copy link
Member Author

@bors: r+

FWIW I would not roll this up, it runs a high risk of breakage.

@bors
Copy link
Collaborator

bors commented Jun 5, 2017

📌 Commit 7bf9cf7 has been approved by alexcrichton

@arielb1 arielb1 added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 6, 2017
@ishitatsuyuki
Copy link
Contributor

RLS submodule should also be updated since this changes API.

@bors
Copy link
Collaborator

bors commented Jun 7, 2017

⌛ Testing commit 7bf9cf7 with merge 3e7f190...

@bors
Copy link
Collaborator

bors commented Jun 7, 2017

💔 Test failed - status-travis

Brings in some perf improvements!
@alexcrichton
Copy link
Member Author

@bors: r=petrochenkov

@bors
Copy link
Collaborator

bors commented Jun 7, 2017

📌 Commit 453080f has been approved by petrochenkov

@alexcrichton alexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jun 7, 2017
@alexcrichton
Copy link
Member Author

Nominating and accepting beta as the original beta didn't include this fix but we'll want to get the beta onto the rust-1.19.0 branch of Cargo.

@bors
Copy link
Collaborator

bors commented Jun 7, 2017

⌛ Testing commit 453080f with merge 03eb710...

bors added a commit that referenced this pull request Jun 7, 2017
Update Cargo

Brings in some perf improvements!
@bors
Copy link
Collaborator

bors commented Jun 8, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing 03eb710 to master...

@bors bors merged commit 453080f into rust-lang:master Jun 8, 2017
@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jun 12, 2017
@alexcrichton alexcrichton deleted the update-cargo branch June 14, 2017 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants