update vergen

[RalfJung]

Fixes #56576

r? @oli-obk

[oli-obk]

@bors r+

[bors]

📌 Commit 7b80acea5dc0b845efdcc3acc7f5a7a76551d8c7 has been approved by oli-obk

[emilyalbini]

Nominating for stable and beta backport, otherwise rustc can't be built from source.

[RalfJung]

Notice that miri failing to build does not block a release. It is essentially coincidence when a beta is branched off at a time when the miri toolstate was green, and there will likely be releases where miri does not build. I think that's okay, miri is a low-priority nightly-only tool that shouldn't interfere with releases.

I am not even sure if the miri in the 1.31 will build. The PR just fixes the vergen problem, which is unrelated to whether the miri version matches rustc.

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout vergen (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self vergen --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[RalfJung]

Looking at the build log, backporting to beta makes sense:

{"rustfmt":"test-pass","nomicon":"test-pass","rls":"test-pass","clippy-driver":"test-pass","rust-by-example":"test-pass","book":"test-pass","reference":"test-pass","miri":"test-pass"}

but backporting to stable does not because miri would not build anyway:

{"book":"test-pass","reference":"test-pass","clippy-driver":"test-pass","nomicon":"test-pass","rust-by-example":"test-pass","rustfmt":"test-pass","miri":"build-fail","rls":"test-pass"}

[oli-obk]

I think we should rather find a way not to build or include clippy miri in the packaged (stable) releases

[RalfJung]

@oli-obk you mean miri?

[RalfJung]

Rebased. This PR will be a lot of fun. I am taking bets how many rebases will be required ;)

@bors r=oli-obk

[bors]

📌 Commit f2a6db7 has been approved by oli-obk

[emilyalbini]

Uh, woops, misread the original issue, this is not critical.

[bors]

⌛ Testing commit f2a6db7 with merge 1ccb5b2...

[bors]

☀️ Test successful - status-appveyor, status-travis
Approved by: oli-obk
Pushing 1ccb5b2 to master...