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

Rootless resolve #3013

Merged
merged 4 commits into from
Aug 18, 2016
Merged

Rootless resolve #3013

merged 4 commits into from
Aug 18, 2016

Conversation

matklad
Copy link
Member

@matklad matklad commented Aug 17, 2016

This should help to make more commands applicable to the whole workspace. Though there is apparently a ton of work to make cargo metadata work with workspaces.

This does not support rootless lockfiles. Will do this in a separate PR.

@@ -74,7 +74,6 @@ impl Encodable for MetadataResolve {
fn encode<S: Encoder>(&self, s: &mut S) -> Result<(), S::Error> {
#[derive(RustcEncodable)]
struct EncodableResolve<'a> {
root: &'a PackageId,
Copy link
Member Author

@matklad matklad Aug 17, 2016

Choose a reason for hiding this comment

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

This is a breaking changing regarding cargo metadata json format. We can use arbitrary package as root here, but I'd rather just remove this field. IntelliJ Rust already ignores the root field.

Copy link
Member Author

Choose a reason for hiding this comment

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

Hm, actually there is absolutely no need to break anything untill cargo metadata supports workspaces. Will rebase in a moment.

@matklad matklad force-pushed the rootless-resolve branch 2 times, most recently from 1299fe9 to 584d719 Compare August 18, 2016 09:49
@alexcrichton
Copy link
Member

@bors: r+ 584d719ef891c6436d7a49f93dcc41bcbe962ff1

Nice!

@bors
Copy link
Collaborator

bors commented Aug 18, 2016

🔒 Merge conflict

@bors
Copy link
Collaborator

bors commented Aug 18, 2016

☔ The latest upstream changes (presumably #3007) made this pull request unmergeable. Please resolve the merge conflicts.

@matklad
Copy link
Member Author

matklad commented Aug 18, 2016

Merge conflict is fixed

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Aug 18, 2016

📌 Commit a8a446c has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Aug 18, 2016

⌛ Testing commit a8a446c with merge 9f8c469...

bors added a commit that referenced this pull request Aug 18, 2016
Rootless resolve

This should help to make more commands applicable to the whole workspace. Though there is apparently a ton of work to make `cargo metadata` work with workspaces.

This does not support rootless lockfiles. Will do this in a separate PR.
@bors
Copy link
Collaborator

bors commented Aug 18, 2016

☀️ Test successful - cargo-cross-linux, cargo-linux-32, cargo-linux-64, cargo-mac-32, cargo-mac-64, cargo-win-gnu-32, cargo-win-gnu-64, cargo-win-msvc-32, cargo-win-msvc-64
Approved by: alexcrichton
Pushing 9f8c469 to master...

@bors bors merged commit a8a446c into rust-lang:master Aug 18, 2016
@matklad matklad deleted the rootless-resolve branch August 19, 2016 22:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants