Skip to content

Update tool submodules, update feature unification strategy#52919

Merged
bors merged 1 commit intorust-lang:masterfrom
alexcrichton:update-cargo
Aug 3, 2018
Merged

Update tool submodules, update feature unification strategy#52919
bors merged 1 commit intorust-lang:masterfrom
alexcrichton:update-cargo

Conversation

@alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Jul 31, 2018 •
edited
Loading

  • Bring in some fixes for cargo fix
  • Update RLS/rustfmt to keep them compiling
  • Update all tools to depend on rustc-workspace-hack
  • Change how we deal with feature unification amongst these builds.

@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive

This comment has been minimized.

Sign in to view
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 31, 2018
@alexcrichton
Copy link
Member Author

alexcrichton commented Jul 31, 2018

r? @Mark-Simulacrum

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jul 31, 2018

@bors r+ p=1 (edition)

@bors

This comment has been minimized.

Sign in to view
@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 31, 2018
@bors

This comment has been minimized.

Sign in to view
bors added a commit that referenced this pull request Aug 1, 2018
@bors
Auto merge of #52919 - alexcrichton:update-cargo, r=Mark-Simulacrum
efdd0e8 
Update Cargo submodule

Bring in some fixes for `cargo fix` notably
@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 Aug 1, 2018
@kennytm

This comment has been minimized.

Sign in to view
@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 Aug 1, 2018
alexcrichton added a commit to alexcrichton/rls that referenced this pull request Aug 1, 2018
@alexcrichton
Update to the latest Cargo
08be519 
Found as part of rust-lang/rust#52919
@alexcrichton alexcrichton mentioned this pull request Aug 1, 2018
Merged
@alexcrichton

This comment has been minimized.

Sign in to view
@alexcrichton alexcrichton added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 1, 2018
@alexcrichton

This comment has been minimized.

Sign in to view
@bors

This comment has been minimized.

Sign in to view
@bors bors removed the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Aug 1, 2018
@alexcrichton alexcrichton force-pushed the update-cargo branch 2 times, most recently from c2c6610 to 2786bb6 Compare August 2, 2018 22:30
@alexcrichton

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-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 Aug 2, 2018
This was referenced Aug 2, 2018
Closed
Closed
@alexcrichton
Copy link
Member Author

alexcrichton commented Aug 2, 2018

I've opened #53005 and #53006 as follow-up issues for the build time regressions we're going to see as a result of this update

@alexcrichton alexcrichton mentioned this pull request Aug 2, 2018
Closed
@bors

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 Aug 3, 2018
@kennytm

This comment has been minimized.

Sign in to view
@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 Aug 3, 2018
@alexcrichton
Update Cargo submodule
0e034d1 
Bring in some fixes for `cargo fix` notably
@alexcrichton
Copy link
Member Author

alexcrichton commented Aug 3, 2018

@bors: r=Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Aug 3, 2018

📌 Commit 0e034d1 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 Aug 3, 2018
@bors
Copy link
Collaborator

bors commented Aug 3, 2018

⌛ Testing commit 0e034d1 with merge 7e8ca9f...

@bors
Copy link
Collaborator

bors commented Aug 3, 2018

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

@rust-highfive
Copy link
Contributor

rust-highfive commented Aug 3, 2018

📣 Toolstate changed by #52919!

Tested on commit 7e8ca9f.
Direct link to PR: #52919

🎉 clippy-driver on windows: build-fail → test-pass.
🎉 clippy-driver on linux: build-fail → test-pass.
🎉 rls on windows: build-fail → test-pass.
🎉 rls on linux: build-fail → test-pass.

oli-obk
oli-obk reviewed Aug 3, 2018
View reviewed changes
src/Cargo.toml
cargo = { path = "tools/cargo" }

[patch."https://github.com/rust-lang-nursery/rustfmt"]
[patch.crates-io]
Copy link
Contributor

@oli-obk oli-obk Aug 3, 2018

Choose a reason for hiding this comment

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

why is this turned back to crates.io? Don't we want to override with the local rustfmt?

Copy link
Member Author

@alexcrichton alexcrichton Aug 3, 2018

Choose a reason for hiding this comment

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

Oh that's because the RLS currently depends on rustfmt-nightly through crates.io

@alexcrichton alexcrichton mentioned this pull request Nov 20, 2018
Merged
@petrochenkov petrochenkov mentioned this pull request Mar 24, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obk oli-obk oli-obk left review comments

@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 @Mark-Simulacrum @bors @kennytm @mati865 @oli-obk @nikomatsakis