Upgrade rustc and bootstrap dependencies

[mati865]

No description provided.

[rust-highfive]

r? @varkor

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

[Mark-Simulacrum]

Please do split out changes to dependencies of std (and friends), like hashbrown. I would also ask that the polonius changes are either dropped or split to a separate PR at least -- I'm not sure whether just updating polonius makes sense (cc @matthewjasper, perhaps?)

[matthewjasper]

Polonius is generally updated by @rust-lang/wg-polonius add needed. I don't think it should be updated separately.

[lqd]

The polonius update is in-progress in #68993: it's still WIP as it's possible it'll contain more rustc changes than updating polonius-engine, but those may also be split into another different PR.

[lqd]

@mati865 thanks for working on the polonius update! However, it requires new facts to be emitted in addition to the API changes, I'll be taking care of it in #69482.

As Matthew said, the WG usually updates both polonius and rustc in tandem, as it requires a bit of choreography to update both because of changes to fact generation, testing, and so on.

[mati865]

Please do split out changes to dependencies of std (and friends), like hashbrown.

It's unclear to me if you mean separate commits or PRs.

I would also ask that the polonius changes are either dropped or split to a separate PR

Dropped.

[JohnCSimon]

ping from triage:
@Mark-Simulacrum - mati865 is asking for clarification

thanks.

[Mark-Simulacrum]

Separate PRs for each std dependency update, unless it makes sense to couple them (e.g., like the backtrace update I just approved - #69729). Please also prepare a summary of the upstream changes for the std dependency changes.

[varkor]

r? @Mark-Simulacrum

[Mark-Simulacrum]

@bors r+

Thanks!

[bors]

📌 Commit 78db865ae56ed2d49dadbd91e056d7dff61ad2e7 has been approved by Mark-Simulacrum

[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 deps (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 deps --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

Auto-merging src/librustc/Cargo.toml
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

[mati865]

Something has broke and GitHub closed PR by itself.

[Mark-Simulacrum]

@bors r+

[bors]

📌 Commit f5e702d has been approved by Mark-Simulacrum

[bors]

⌛ Testing commit f5e702d with merge b77c05fb3b027f0a822bd768a9134a1ca338c788...

[bors]

💔 Test failed - checks-azure

[mati865]

Appears to be spurious chocolatey issue.

@bors retry

[bors]

@mati865: 🔑 Insufficient privileges: not in try users

[cuviper]

@bors retry

[Dylan-DPC-zz]

@bors p=1

[bors]

⌛ Testing commit f5e702d with merge b9ac291...

[bors]

☀️ Test successful - checks-azure
Approved by: Mark-Simulacrum
Pushing b9ac291 to master...