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

[beta] hash '__CARGO_DEFAULT_LIB_METADATA' in metadata for rustc #4241

Merged
merged 4 commits into from
Jul 1, 2017

Conversation

Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Jul 1, 2017

This is a backport of #4239 for beta

This will let us seed the release channel as part of the
metadata used for the hash to avoid conflicting hashes across
channels.

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
@rust-highfive
Copy link

r? @matklad

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

@rust-highfive
Copy link

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.19.0. Please double check that you specified the right target!

@matklad
Copy link
Member

matklad commented Jul 1, 2017

r? @alexcrichton

@rust-highfive rust-highfive assigned alexcrichton and unassigned matklad Jul 1, 2017
@alexcrichton
Copy link
Member

Thanks! Mind also cherry-picking #4181 and #4196 to get tests passing?

gilescope added 3 commits July 1, 2017 20:36
PR #42541 on Rust is to make assert_eq error message be multi-line. Before implementing this we need to make the current test less brittle.
@Keruspe
Copy link
Contributor Author

Keruspe commented Jul 1, 2017

I cherry-picked only half of the latter as there was a conflict but looks like that was enough

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 1, 2017

📌 Commit 225aed0 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jul 1, 2017

⌛ Testing commit 225aed0 with merge bff2d2a...

bors added a commit that referenced this pull request Jul 1, 2017
[beta] hash '__CARGO_DEFAULT_LIB_METADATA' in metadata for rustc

This is a backport of #4239 for beta
@bors
Copy link
Contributor

bors commented Jul 1, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing bff2d2a to rust-1.19.0...

@bors bors merged commit 225aed0 into rust-lang:rust-1.19.0 Jul 1, 2017
@ehuss ehuss added this to the 1.19.0 milestone Feb 6, 2022
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.

7 participants