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.

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 and stdsimd submodules #52429

Merged
merged 1 commit into from Jul 19, 2018
Merged

Update Cargo and stdsimd submodules #52429

merged 1 commit into from Jul 19, 2018

Conversation

alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Jul 16, 2018 •
edited

Update Cargo to bring in some bug fixes and such, and update stdsimd to...

@rust-highfive
Copy link
Collaborator

r? @aturon

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

@rust-highfive
Copy link
Collaborator

warning Warning 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 Jul 16, 2018
@alexcrichton
Copy link
Member Author

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 16, 2018

📌 Commit 7325664 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 Jul 16, 2018
@kennytm kennytm mentioned this pull request Jul 16, 2018
Merged
bors added a commit that referenced this pull request Jul 16, 2018
@bors
Auto merge of #52433 - kennytm:rollup, r=kennytm
0cb6d94 
Rollup of 6 pull requests

Successful merges:

 - #52285 (Deny bare trait objects in librustc_driver)
 - #52338 (update miri)
 - #52392 (AsRef doc wording tweaks)
 - #52404 (Fix doc link)
 - #52430 (update nomicon)
 - #52431 (update compiler-builtins for openbsd)

Failed merges:

 - #52429 (Update Cargo and stdsimd submodules)

r? @ghost
bors pushed a commit that referenced this pull request Jul 17, 2018
@kennytm
Rollup merge of #52429 - alexcrichton:update-cargo, r=Mark-Simulacrum
965b8e5 
Update Cargo and stdsimd submodules

Update Cargo to bring in some bug fixes and such, and update `stdsimd` to...

Closes #52403
bors added a commit that referenced this pull request Jul 17, 2018
@bors
Auto merge of #52433 - kennytm:rollup, r=kennytm
edd38d0 
Rollup of 9 pull requests

Successful merges:

 - #52285 (Deny bare trait objects in librustc_driver)
 - #52286 (Deny bare trait objects in src/librustc_errors)
 - #52306 (Reduce the number of clone()s needed in obligation_forest)
 - #52392 (AsRef doc wording tweaks)
 - #52404 (Fix doc link)
 - #52429 (Update Cargo and stdsimd submodules)
 - #52430 (update nomicon)
 - #52431 (update compiler-builtins for openbsd)
 - #52435 (Calculate the exact capacity for 2 HashMaps)

r? @ghost
@RalfJung
Copy link
Member

Would you mind updating the submodule again to include rust-lang/cargo#5710 ? :D

@alexcrichton
Copy link
Member Author

@bors: r=Mark-SImulacrum

done!

@bors
Copy link
Contributor

bors commented Jul 17, 2018

📌 Commit 797c2d0 has been approved by Mark-SImulacrum

@RalfJung
Copy link
Member

Thanks :)

@bors

This comment has been minimized.

Sign in to view
@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 Jul 17, 2018
@alexcrichton
Copy link
Member Author

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jul 17, 2018

📌 Commit 0d86556 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 Jul 17, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@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 Jul 18, 2018
@kennytm
Copy link
Member

kennytm commented Jul 18, 2018 

duplicate artfacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
the following dependencies are duplicated although they have the same features enabled:
  backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)
    `clippy-driver` ("C:\\projects\\rust\\build\\x86_64-pc-windows-gnu\\stage2-tools\\x86_64-pc-windows-gnu\\release\\deps\\libbacktrace-7dc4ef752c85274e.rlib")
    `cargo` ("C:\\projects\\rust\\build\\x86_64-pc-windows-gnu\\stage2-tools\\x86_64-pc-windows-gnu\\release\\deps\\libbacktrace-ab50bab4d87e7bbe.rlib")
the following dependencies have different features:
  winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)
    `clippy-driver` additionally enabled features {} at "C:\\projects\\rust\\build\\x86_64-pc-windows-gnu\\stage2-tools\\x86_64-pc-windows-gnu\\release\\deps\\libwinapi-b494f3abb913a03b.rlib"
    `cargo` additionally enabled features {"userenv"} at "C:\\projects\\rust\\build\\x86_64-pc-windows-gnu\\stage2-tools\\x86_64-pc-windows-gnu\\release\\deps\\libwinapi-e648ff91915e2746.rlib"
thread 'main' panicked at 'tools should not compile multiple copies of the same crate',

cargo added "userenv" feature to winapi. needs to update clippy and RLS.

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

@bors: r=Mark-Simulacrum

@pitdicker correct, the stdsimd update got merged in with #52433

@bors
Copy link
Contributor

bors commented Jul 18, 2018

📌 Commit 52d7ee8 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 Jul 18, 2018
@kennytm
Copy link
Member

kennytm commented Jul 18, 2018

@alexcrichton #52433 doesn't contain stdsimd, I've excluded it from the rollup due to #52433 (comment).

@bors
Copy link
Contributor

bors commented Jul 19, 2018

⌛ Testing commit 52d7ee8 with merge 142c065...

bors added a commit that referenced this pull request Jul 19, 2018
@bors
Auto merge of #52429 - alexcrichton:update-cargo, r=Mark-Simulacrum
142c065 
Update Cargo and stdsimd submodules

Update Cargo to bring in some bug fixes and such, and update `stdsimd` to...

Closes #52403
@bors
Copy link
Contributor

bors commented Jul 19, 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 Jul 19, 2018
@rust-highfive

This comment has been minimized.

Sign in to view
@kennytm
Copy link
Member

kennytm commented Jul 19, 2018

@bors retry #50887 (hopefully the last one)

@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 Jul 19, 2018
bors added a commit that referenced this pull request Jul 19, 2018
@bors
Auto merge of #52429 - alexcrichton:update-cargo, r=Mark-Simulacrum
0fc4501 
Update Cargo and stdsimd submodules

Update Cargo to bring in some bug fixes and such, and update `stdsimd` to...

Closes #52403
@bors
Copy link
Contributor

bors commented Jul 19, 2018

⌛ Testing commit 52d7ee8 with merge 0fc4501...

@alexcrichton
Copy link
Member Author

@kennytm aha thanks for the heads up! I'll send a future PR for stdsimd in that case

@bors
Copy link
Contributor

bors commented Jul 19, 2018

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

@bors bors merged commit 52d7ee8 into rust-lang:master Jul 19, 2018
@bors bors mentioned this pull request Jul 19, 2018
Merged
@alexcrichton alexcrichton mentioned this pull request Jul 19, 2018
Merged
@alexcrichton alexcrichton deleted the update-cargo branch July 19, 2018 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
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.

None yet
8 participants
@alexcrichton @rust-highfive @Mark-Simulacrum @bors @RalfJung @kennytm @pitdicker @aturon