Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Update to latest Cargo master - #767

Merged
nrc merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-cargo
Mar 16, 2018
Merged

Update to latest Cargo master#767
nrc merged 1 commit into
rust-lang:masterfrom
alexcrichton:update-cargo

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

No description provided.

Comment thread Cargo.toml Outdated
[dependencies]
# cargo hash delivered with nightly-2018-03-14
cargo = { git = "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/rust-lang/cargo", rev = "5f83bb4044f32b60d06717c609610f67411fc671" }
cargo = { git = "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/rust-lang/cargo" }

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could we keep the rev? I think it is useful for RLS devs to have a consistent version of Cargo, even if when we embed in Rust, we get whatever Rust has.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Sure yeah, but just to confirm, doesn't Cargo.lock do that already? With the rev in here it means that Cargo can't be updated w/o editing the Cargo.toml

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Referring to the hash allows frequent use of cargo update in a non-breaking way. We had it in the lock before but that seemed to encourage not using cargo update. See #680. Maybe there's a better way?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Ok! For big projects I wouldn't necessarily recommend cargo update as it can change quite a lot but I'll add this back in

@Xanewok

Xanewok commented Mar 16, 2018

Copy link
Copy Markdown
Contributor

Oops, I created a conflict with merging #768, sorry!

@alexcrichton could you rebase it again, please?

@alexcrichton

Copy link
Copy Markdown
Member Author

Sure thing, done!

@nrc
nrc merged commit a9a644c into rust-lang:master Mar 16, 2018
@nrc

nrc commented Mar 16, 2018

Copy link
Copy Markdown
Member

Thanks!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants