[beta] rollup

[Mark-Simulacrum]

This rolls up the following bumps onto the beta branch; no backports in this PR.

• [beta] Bootstrap update [beta] Bootstrap update #92888
• [beta] backport cargo [beta] backport cargo #92839

r? @Mark-Simulacrum

[rust-highfive]

Updates src/tools/cargo.

cc @ehuss

[rust-highfive]

⚠️ Warning ⚠️

• Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
• These commits modify submodules.

[Mark-Simulacrum]

@bors r+ rollup=never

[bors]

📌 Commit f61c455 has been approved by Mark-Simulacrum

[Mark-Simulacrum]

@bors p=1

Needed for Crater run to kickoff.

[bors]

⌛ Testing commit f61c455 with merge d0b1bde482e0c75c0d7ebe9c49dc03b3eb133b5a...

[bors]

💥 Test timed out

[Mark-Simulacrum]

@bors retry - dist-i686-linux docker rebuild?

[rust-log-analyzer]

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[ehuss]

Unless there is something wrong with the log capture, it looks like it is hanging updating crates.io:

2022-01-18T18:32:20.5711041Z Building rustbuild
2022-01-18T18:32:20.7118437Z     Updating crates.io index
2022-01-18T22:46:55.7969765Z ##[error]The operation was canceled.

I've been seeing this happening lately. I don't have too many ideas what is causing it, though.

I discussed with the Cargo team to see if anyone had thoughts about using a watchdog on rust-lang/rust to check for console output. Alex felt it would be fairly easy, but I'm a little more skeptical.

[bors]

⌛ Testing commit f61c455 with merge 98a701b...

[bors]

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 98a701b to beta...