Skip to content

Conversation

@alexcrichton
Copy link
Member

4 commits in aa6b7e01abce30091cc594cb23a15c46cead6e24..ab6fa8908c9b6c8f7e2249231c395eebfbc49891
2019-09-24 17:19:12 +0000 to 2019-09-25 17:00:56 +0000

4 commits in aa6b7e01abce30091cc594cb23a15c46cead6e24..ab6fa8908c9b6c8f7e2249231c395eebfbc49891
2019-09-24 17:19:12 +0000 to 2019-09-25 17:00:56 +0000
- Fix macOS collection of CPU data (rust-lang/cargo#7429)
- Don't ever capture CPU state if timings are disabled (rust-lang/cargo#7428)
- Change build-std to use --sysroot (rust-lang/cargo#7421)
- set -Zmtime_on_use from config or ENV (rust-lang/cargo#7411)
@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 25, 2019
@alexcrichton
Copy link
Member Author

cc @ehuss

@ehuss
Copy link
Contributor

ehuss commented Sep 25, 2019

@bors r+ p=1

Cargo currently doesn't work on some Mac systems (depending on the number of CPUs), such as Travis CI.

@bors
Copy link
Collaborator

bors commented Sep 25, 2019

📌 Commit d047c42 has been approved by ehuss

@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 Sep 25, 2019
@ehuss ehuss assigned ehuss and unassigned nikomatsakis Sep 25, 2019
@Centril Centril mentioned this pull request Sep 25, 2019
@Manishearth
Copy link
Member

@bors p=10

cargo being broken on ~every osx travis builder probably should be higher priority given that we have other p=1 things

@bors
Copy link
Collaborator

bors commented Sep 25, 2019

⌛ Testing commit d047c42 with merge 37538aa...

bors added a commit that referenced this pull request Sep 25, 2019
Update cargo

4 commits in aa6b7e01abce30091cc594cb23a15c46cead6e24..ab6fa8908c9b6c8f7e2249231c395eebfbc49891
2019-09-24 17:19:12 +0000 to 2019-09-25 17:00:56 +0000
- Fix macOS collection of CPU data (rust-lang/cargo#7429)
- Don't ever capture CPU state if timings are disabled (rust-lang/cargo#7428)
- Change build-std to use --sysroot (rust-lang/cargo#7421)
- set -Zmtime_on_use from config or ENV (rust-lang/cargo#7411)
@bors
Copy link
Collaborator

bors commented Sep 25, 2019

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing 37538aa to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 25, 2019
@bors bors merged commit d047c42 into rust-lang:master Sep 25, 2019
@alexcrichton alexcrichton deleted the update-cargo branch January 14, 2020 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. 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.

6 participants