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 Cargo submodule #48549

Merged
merged 1 commit into from
Mar 11, 2018
Merged

Update Cargo submodule #48549

merged 1 commit into from
Mar 11, 2018

Conversation

alexcrichton
Copy link
Member

Hopefully a routine update...

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@pietroalbini pietroalbini added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 26, 2018
Mark-Simulacrum
Mark-Simulacrum approved these changes Feb 26, 2018
View reviewed changes
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me if you have a solution for the problem I've noted

src/Cargo.lock
@@ -2894,15 +2945,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
"checksum racer 2.0.12 (registry+https://github.com/rust-lang/crates.io-index)" = "034f1c4528581c40a60e96875467c03315868084e08ff4ceb46a00f7be3b16b4"
"checksum radix_trie 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "211c49b6a9995cac0fd1dd9ca60b42cf3a51e151a12eb954b3a9e75513426ee8"
"checksum rand 0.3.20 (registry+https://github.com/rust-lang/crates.io-index)" = "512870020642bb8c221bf68baa1b2573da814f6ccfe5c9699b1c303047abe9b1"
"checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
"checksum rand 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "eba5f8cb59cc50ed56be8880a5c7b496bfd9bd26394e176bc67884094145c2c5"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This'll break some of our tests IIRC so we'll need to not do this until we can get rid of one of the rands or remove extern crate rand from the tests.

@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Feb 26, 2018

📌 Commit 3075dad has been approved by Mark-Simulacrum

@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 Feb 26, 2018
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Feb 26, 2018

📌 Commit 45045d0 has been approved by Mark-Simulacrum

@nikomatsakis
Copy link
Contributor

r? @Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Mar 1, 2018

☔ The latest upstream changes (presumably #48349) 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 1, 2018
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Mar 1, 2018

📌 Commit 842ced5 has been approved by Mark-Simulacrum

@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 1, 2018
@Manishearth
Copy link
Member

@bors p=2

prioritizing risky-to-rollup PRs so they get tested first

@bors
Copy link
Contributor

bors commented Mar 2, 2018

🔒 Merge conflict

@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 2, 2018
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Mar 2, 2018

📌 Commit ac0a2a7 has been approved by Mark-Simulacrum

@bors bors removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 2, 2018
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Mar 9, 2018

📌 Commit 62a8f7d has been approved by Mark-Simulacrum

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Mar 10, 2018
@Mark-Simulacrum
Rollup merge of rust-lang#48549 - alexcrichton:update-cargo, r=Mark-S…
89147b3 
…imulacrum

Update Cargo submodule

Hopefully a routine update...
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Mar 10, 2018
Closed
@bors
Copy link
Contributor

bors commented Mar 11, 2018

⌛ Testing commit 62a8f7d with merge e1999a6...

bors added a commit that referenced this pull request Mar 11, 2018
@bors
Auto merge of #48549 - alexcrichton:update-cargo, r=Mark-Simulacrum
e1999a6 
Update Cargo submodule

Hopefully a routine update...
@bors
Copy link
Contributor

bors commented Mar 11, 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 11, 2018
@kennytm
Copy link
Member

kennytm commented Mar 11, 2018

asmjs failed at slice::panic_safe.

[02:22:46] failures:
[02:22:46] 
[02:22:46] ---- slice::panic_safe stdout ----
[02:22:46] 	thread 'main' panicked at 'explicit panic', libstd/sys/unix/thread.rs:48:5
[02:22:46] 
[02:22:46] 
[02:22:46] failures:
[02:22:46]     slice::panic_safe
[02:22:46] 
[02:22:46] test result: FAILED. 479 passed; 1 failed; 1 ignored; 0 measured; 0 filtered out
[02:22:46] 
[02:22:46] �[m�[m�[31m�[1merror:�[m test failed, to rerun pass '--test collectionstests'

@kennytm kennytm 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 11, 2018
@alexcrichton
Update Cargo submodule
994bfd4 
Required moving all fulldeps tests depending on `rand` to different locations as
now there's multiple `rand` crates that can't be implicitly linked against.
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Mar 11, 2018

📌 Commit 994bfd4 has been approved by Mark-Simulacrum

@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 11, 2018
@kennytm
Copy link
Member

kennytm commented Mar 11, 2018

@bors p=2

@bors
Copy link
Contributor

bors commented Mar 11, 2018

⌛ Testing commit 994bfd4 with merge 178becd...

bors added a commit that referenced this pull request Mar 11, 2018
@bors
Auto merge of #48549 - alexcrichton:update-cargo, r=Mark-Simulacrum
178becd 
Update Cargo submodule

Hopefully a routine update...
@bors
Copy link
Contributor

bors commented Mar 11, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing 178becd to master...

@bors bors mentioned this pull request Mar 11, 2018
Merged
@bors bors merged commit 994bfd4 into rust-lang:master Mar 11, 2018
This was referenced Mar 11, 2018
Merged
Merged
Merged
Merged
@alexcrichton alexcrichton deleted the update-cargo branch March 12, 2018 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum approved these changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@alexcrichton @rust-highfive @bors @nikomatsakis @Manishearth @kennytm @Mark-Simulacrum @pietroalbini