Update cargo #117000

weihanglo · 2023-10-20T23:04:19Z

22 commits in 8eb8acbb116e7923ea2ce33a50109933ed5ab375..d2f6a048529eb8e9ebc55d793abd63456c98fac2
2023-10-17 11:55:04 +0000 to 2023-10-20 18:25:30 +0000

chore(deps): bump rustix from 0.38.18 to 0.38.19 (chore(deps): bump rustix from 0.38.18 to 0.38.19 cargo#12851)
refactor: centralize logic of getting max resolve version (refactor: centralize logic of getting max resolve version cargo#12860)
If there's a version in the lock file only use that exact version (If there's a version in the lock file only use that exact version cargo#12772)
Make the precise field of a source an Enum (Make the precise field of a source an Enum cargo#12849)
fix(cli): Provide next steps for bad -Z flag (fix(cli): Provide next steps for bad -Z flag cargo#12857)
fix(remove): Preserve feature comments (fix(remove): Preserve feature comments cargo#12837)
docs: fix typo (docs: fix typo cargo#12844)
chore(triagebot): auto label when PR review state changes (chore(triagebot): auto label when PR review state changes cargo#12856)
fix(add): Preserve more comments (fix(add): Preserve more comments cargo#12838)
ci: big ⚠️ to ensure the CNAME file is always there (ci: big ⚠️ to ensure the CNAME file is always there cargo#12853)
docs(cargo-bench): --bench is passed in unconditionally to bench harnesses (docs(cargo-bench): --bench is passed in unconditionally to bench harnesses cargo#12850)
docs(contrib): generate redirection HTML pages in CI (docs(contrib): generate redirection HTML pages in CI cargo#12846)
docs: remove review capacity notice (docs: remove review capacity notice cargo#12842)
fix(help):Clarify install's positional (fix(help):Clarify install's positional cargo#12841)
Adjust -Zcheck-cfg for new rustc syntax and behavior (Adjust -Zcheck-cfg for new rustc syntax and behavior cargo#12845)
fix(replace): Partial-version spec support (fix(replace): Partial-version spec support cargo#12806)
Print environment variables for build script executions with -vv (Print environment variables for build script executions with -vv cargo#12829)
fix(cli): Suggest cargo-search on bad commands (fix(cli): Suggest cargo-search on bad commands cargo#12840)
docs(contrib): Policy on manifest editing (docs(contrib): Policy on manifest editing cargo#12836)
ci/contrib: use separate concurrency group (ci/contrib: use separate concurrency group cargo#12835)
ci/contrib: do not fail on missing gh-pages (ci/contrib: do not fail on missing gh-pages cargo#12834)
Clarify flag behavior in cargo remove --help (Clarify flag behavior in cargo remove --help cargo#12823)

r? ghost

rustbot · 2023-10-20T23:04:23Z

Some changes occurred in src/tools/cargo

cc @ehuss

weihanglo · 2023-10-20T23:05:17Z

@bors r+ p=1 rollup=never

bors · 2023-10-20T23:05:20Z

📌 Commit 45e7423 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2023-10-20T23:18:40Z

⌛ Testing commit 45e7423 with merge 16f7e20...

Update cargo 22 commits in 8eb8acbb116e7923ea2ce33a50109933ed5ab375..d2f6a048529eb8e9ebc55d793abd63456c98fac2 2023-10-17 11:55:04 +0000 to 2023-10-20 18:25:30 +0000 - chore(deps): bump rustix from 0.38.18 to 0.38.19 (rust-lang/cargo#12851) - refactor: centralize logic of getting max resolve version (rust-lang/cargo#12860) - If there's a version in the lock file only use that exact version (rust-lang/cargo#12772) - Make the precise field of a source an Enum (rust-lang/cargo#12849) - fix(cli): Provide next steps for bad -Z flag (rust-lang/cargo#12857) - fix(remove): Preserve feature comments (rust-lang/cargo#12837) - docs: fix typo (rust-lang/cargo#12844) - chore(triagebot): auto label when PR review state changes (rust-lang/cargo#12856) - fix(add): Preserve more comments (rust-lang/cargo#12838) - ci: big ⚠️ to ensure the CNAME file is always there (rust-lang/cargo#12853) - docs(cargo-bench): `--bench` is passed in unconditionally to bench harnesses (rust-lang/cargo#12850) - docs(contrib): generate redirection HTML pages in CI (rust-lang/cargo#12846) - docs: remove review capacity notice (rust-lang/cargo#12842) - fix(help):Clarify install's positional (rust-lang/cargo#12841) - Adjust `-Zcheck-cfg` for new rustc syntax and behavior (rust-lang/cargo#12845) - fix(replace): Partial-version spec support (rust-lang/cargo#12806) - Print environment variables for build script executions with `-vv` (rust-lang/cargo#12829) - fix(cli): Suggest cargo-search on bad commands (rust-lang/cargo#12840) - docs(contrib): Policy on manifest editing (rust-lang/cargo#12836) - ci/contrib: use separate concurrency group (rust-lang/cargo#12835) - ci/contrib: do not fail on missing gh-pages (rust-lang/cargo#12834) - Clarify flag behavior in `cargo remove --help` (rust-lang/cargo#12823) r? ghost

rust-log-analyzer · 2023-10-21T00:02:14Z

The job aarch64-gnu failed! Check out the build log: (web) (plain)

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

##[endgroup]
[TIMING] core::build_steps::tool::ToolBuild { compiler: Compiler { stage: 0, host: aarch64-unknown-linux-gnu }, target: aarch64-unknown-linux-gnu, tool: "lint-docs", path: "src/tools/lint-docs", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [], allow_features: "" } -- 8.780
[TIMING] core::build_steps::tool::LintDocs { compiler: Compiler { stage: 0, host: aarch64-unknown-linux-gnu }, target: aarch64-unknown-linux-gnu } -- 0.000
##[group]Running stage2 lint-docs (aarch64-unknown-linux-gnu)
##[error]The runner has received a shutdown signal. This can happen when the runner service is stopped, or a manually started runner is canceled.
##[group]Clock drift check
  local time: Sat Oct 21 00:01:57 UTC 2023
  local time: Sat Oct 21 00:01:57 UTC 2023
Session terminated, killing shell... ...killed.
##[error]The operation was canceled.
Cleaning up orphan processes

bors · 2023-10-21T00:02:47Z

💔 Test failed - checks-actions

weihanglo · 2023-10-21T01:14:16Z

@bors retry

bors · 2023-10-21T01:59:49Z

⌛ Testing commit 45e7423 with merge ceab958...

Update cargo 22 commits in 8eb8acbb116e7923ea2ce33a50109933ed5ab375..d2f6a048529eb8e9ebc55d793abd63456c98fac2 2023-10-17 11:55:04 +0000 to 2023-10-20 18:25:30 +0000 - chore(deps): bump rustix from 0.38.18 to 0.38.19 (rust-lang/cargo#12851) - refactor: centralize logic of getting max resolve version (rust-lang/cargo#12860) - If there's a version in the lock file only use that exact version (rust-lang/cargo#12772) - Make the precise field of a source an Enum (rust-lang/cargo#12849) - fix(cli): Provide next steps for bad -Z flag (rust-lang/cargo#12857) - fix(remove): Preserve feature comments (rust-lang/cargo#12837) - docs: fix typo (rust-lang/cargo#12844) - chore(triagebot): auto label when PR review state changes (rust-lang/cargo#12856) - fix(add): Preserve more comments (rust-lang/cargo#12838) - ci: big ⚠️ to ensure the CNAME file is always there (rust-lang/cargo#12853) - docs(cargo-bench): `--bench` is passed in unconditionally to bench harnesses (rust-lang/cargo#12850) - docs(contrib): generate redirection HTML pages in CI (rust-lang/cargo#12846) - docs: remove review capacity notice (rust-lang/cargo#12842) - fix(help):Clarify install's positional (rust-lang/cargo#12841) - Adjust `-Zcheck-cfg` for new rustc syntax and behavior (rust-lang/cargo#12845) - fix(replace): Partial-version spec support (rust-lang/cargo#12806) - Print environment variables for build script executions with `-vv` (rust-lang/cargo#12829) - fix(cli): Suggest cargo-search on bad commands (rust-lang/cargo#12840) - docs(contrib): Policy on manifest editing (rust-lang/cargo#12836) - ci/contrib: use separate concurrency group (rust-lang/cargo#12835) - ci/contrib: do not fail on missing gh-pages (rust-lang/cargo#12834) - Clarify flag behavior in `cargo remove --help` (rust-lang/cargo#12823) r? ghost

bors · 2023-10-21T03:35:33Z

💔 Test failed - checks-actions

weihanglo · 2023-10-21T04:30:49Z

https://github.com/rust-lang-ci/rust/actions/runs/6594570522/job/17918585736#step:24:32176

error: flag -Zcheck-cfg does not take a value, found: names,values,output

Looks like we need to cherry-pick or wait for #116983?

Urgau · 2023-10-21T10:00:53Z

Hum, sorry for this. It's seems that the opt-dist tool (the PGO/BOLT pipeline tool) is using "nightly" Cargo when running the (final) "Run tests" section and this somewhat obviously doesn't work as bootstrap isn't aware of the new Cargo.
I think this failure is expected as we should always be using beta Cargo for building Rust.

EDIT: I've spoken with @Kobzol and we are gonna switch this opt-dist "Run tests" section to use beta Cargo, this should fix the build failure here.

Use beta cargo in opt-dist Using the new stage2 cargo caused issues when a backwards-incompatible change was made to cargo. This means that we won't be testing the LTO/1-CGU optimized cargo, but I don't think that's a big issue, as we primarily want to test the compiler. Should fix [this](rust-lang#117000 (comment)) failure.

bors · 2023-10-22T15:17:10Z

⌛ Testing commit 45e7423 with merge d5e72b0...

Update cargo 22 commits in 8eb8acbb116e7923ea2ce33a50109933ed5ab375..d2f6a048529eb8e9ebc55d793abd63456c98fac2 2023-10-17 11:55:04 +0000 to 2023-10-20 18:25:30 +0000 - chore(deps): bump rustix from 0.38.18 to 0.38.19 (rust-lang/cargo#12851) - refactor: centralize logic of getting max resolve version (rust-lang/cargo#12860) - If there's a version in the lock file only use that exact version (rust-lang/cargo#12772) - Make the precise field of a source an Enum (rust-lang/cargo#12849) - fix(cli): Provide next steps for bad -Z flag (rust-lang/cargo#12857) - fix(remove): Preserve feature comments (rust-lang/cargo#12837) - docs: fix typo (rust-lang/cargo#12844) - chore(triagebot): auto label when PR review state changes (rust-lang/cargo#12856) - fix(add): Preserve more comments (rust-lang/cargo#12838) - ci: big ⚠️ to ensure the CNAME file is always there (rust-lang/cargo#12853) - docs(cargo-bench): `--bench` is passed in unconditionally to bench harnesses (rust-lang/cargo#12850) - docs(contrib): generate redirection HTML pages in CI (rust-lang/cargo#12846) - docs: remove review capacity notice (rust-lang/cargo#12842) - fix(help):Clarify install's positional (rust-lang/cargo#12841) - Adjust `-Zcheck-cfg` for new rustc syntax and behavior (rust-lang/cargo#12845) - fix(replace): Partial-version spec support (rust-lang/cargo#12806) - Print environment variables for build script executions with `-vv` (rust-lang/cargo#12829) - fix(cli): Suggest cargo-search on bad commands (rust-lang/cargo#12840) - docs(contrib): Policy on manifest editing (rust-lang/cargo#12836) - ci/contrib: use separate concurrency group (rust-lang/cargo#12835) - ci/contrib: do not fail on missing gh-pages (rust-lang/cargo#12834) - Clarify flag behavior in `cargo remove --help` (rust-lang/cargo#12823) r? ghost

lqd · 2023-10-22T16:04:29Z

@bors retry yielding to #117018

this won’t land before opt-dist is fixed in #117018 and both have the same prio

Use beta cargo in opt-dist Using the new stage2 cargo caused issues when a backwards-incompatible change was made to cargo. This means that we won't be testing the LTO/1-CGU optimized cargo, but I don't think that's a big issue, as we primarily want to test the compiler. Should fix [this](rust-lang#117000 (comment)) failure.

bors · 2023-10-22T18:05:12Z

⌛ Testing commit 45e7423 with merge eacdb20...

Update cargo 22 commits in 8eb8acbb116e7923ea2ce33a50109933ed5ab375..d2f6a048529eb8e9ebc55d793abd63456c98fac2 2023-10-17 11:55:04 +0000 to 2023-10-20 18:25:30 +0000 - chore(deps): bump rustix from 0.38.18 to 0.38.19 (rust-lang/cargo#12851) - refactor: centralize logic of getting max resolve version (rust-lang/cargo#12860) - If there's a version in the lock file only use that exact version (rust-lang/cargo#12772) - Make the precise field of a source an Enum (rust-lang/cargo#12849) - fix(cli): Provide next steps for bad -Z flag (rust-lang/cargo#12857) - fix(remove): Preserve feature comments (rust-lang/cargo#12837) - docs: fix typo (rust-lang/cargo#12844) - chore(triagebot): auto label when PR review state changes (rust-lang/cargo#12856) - fix(add): Preserve more comments (rust-lang/cargo#12838) - ci: big ⚠️ to ensure the CNAME file is always there (rust-lang/cargo#12853) - docs(cargo-bench): `--bench` is passed in unconditionally to bench harnesses (rust-lang/cargo#12850) - docs(contrib): generate redirection HTML pages in CI (rust-lang/cargo#12846) - docs: remove review capacity notice (rust-lang/cargo#12842) - fix(help):Clarify install's positional (rust-lang/cargo#12841) - Adjust `-Zcheck-cfg` for new rustc syntax and behavior (rust-lang/cargo#12845) - fix(replace): Partial-version spec support (rust-lang/cargo#12806) - Print environment variables for build script executions with `-vv` (rust-lang/cargo#12829) - fix(cli): Suggest cargo-search on bad commands (rust-lang/cargo#12840) - docs(contrib): Policy on manifest editing (rust-lang/cargo#12836) - ci/contrib: use separate concurrency group (rust-lang/cargo#12835) - ci/contrib: do not fail on missing gh-pages (rust-lang/cargo#12834) - Clarify flag behavior in `cargo remove --help` (rust-lang/cargo#12823) r? ghost

rust-log-analyzer · 2023-10-22T18:07:22Z

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

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

lqd · 2023-10-22T18:17:00Z

This wasn’t meant to be closed…

weihanglo · 2023-10-22T18:44:30Z

@bors r+

bors · 2023-10-22T18:44:33Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: Distribute cg_clif as rustup component on the nightly channel #81746

bors · 2023-10-22T18:44:34Z

📌 Commit 45e7423 has been approved by weihanglo

It is now in the queue for this repository.

bors · 2023-10-22T20:02:35Z

⌛ Testing commit 45e7423 with merge 54b0434...

bors · 2023-10-22T21:56:20Z

☀️ Test successful - checks-actions
Approved by: weihanglo
Pushing 54b0434 to master...

rust-timer · 2023-10-22T23:04:42Z

Finished benchmarking commit (54b0434): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Warning ⚠: The following benchmark(s) failed to build:

rustc

cc @rust-lang/wg-compiler-performance

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.3%	[-3.6%, -1.0%]	4
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.3%	[-3.6%, -1.0%]	4

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	1.2%	[1.2%, 1.2%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: missing data
Artifact size: 304.13 MiB -> 304.24 MiB (0.04%)

Update cargo

45e7423

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 20, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 20, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 21, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 21, 2023

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 21, 2023

weihanglo mentioned this pull request Oct 21, 2023

Prepare the bootstrap tool for the new check-cfg syntax #116983

Merged

Kobzol mentioned this pull request Oct 21, 2023

Use beta cargo in opt-dist #117018

Merged

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 22, 2023

This comment was marked as resolved.

Sign in to view

bors closed this in #117018 Oct 22, 2023

lqd reopened this Oct 22, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 22, 2023

bors merged commit 54b0434 into rust-lang:master Oct 22, 2023

rustbot added this to the 1.75.0 milestone Oct 22, 2023

weihanglo deleted the update-cargo branch October 22, 2023 22:32

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

matthiaskrgr mentioned this pull request Apr 16, 2024

ICE: node HirId ... cannot be placed in TypeckResults with hir_owner DefId... #124022

Closed

Update cargo #117000

Update cargo #117000

Uh oh!

Conversation

weihanglo commented Oct 20, 2023

Uh oh!

rustbot commented Oct 20, 2023

Uh oh!

weihanglo commented Oct 20, 2023

Uh oh!

bors commented Oct 20, 2023

Uh oh!

bors commented Oct 20, 2023

Uh oh!

rust-log-analyzer commented Oct 21, 2023

Uh oh!

bors commented Oct 21, 2023

Uh oh!

weihanglo commented Oct 21, 2023

Uh oh!

bors commented Oct 21, 2023

Uh oh!

bors commented Oct 21, 2023

Uh oh!

weihanglo commented Oct 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Urgau commented Oct 21, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Oct 22, 2023

Uh oh!

lqd commented Oct 22, 2023

Uh oh!

This comment was marked as resolved.

bors commented Oct 22, 2023

Uh oh!

rust-log-analyzer commented Oct 22, 2023

Uh oh!

lqd commented Oct 22, 2023

Uh oh!

weihanglo commented Oct 22, 2023

Uh oh!

bors commented Oct 22, 2023

Uh oh!

bors commented Oct 22, 2023

Uh oh!

bors commented Oct 22, 2023

Uh oh!

bors commented Oct 22, 2023

Uh oh!

rust-timer commented Oct 22, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

weihanglo commented Oct 21, 2023 •

edited

Loading

Urgau commented Oct 21, 2023 •

edited

Loading