bump bootstrap dependencies by onur-ozkan · Pull Request #119654 · rust-lang/rust

onur-ozkan · 2024-01-06T11:06:41Z

This PR removes hard-coded patch versions, updates bootstrap's dependency stack to recent versions (some of the versions were released 3-4 years ago), and removes a few dependencies from bootstrap.

Removed dependencies:

rustbot · 2024-01-06T11:06:49Z

r? @clubby789

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

clubby789 · 2024-01-06T15:12:03Z

@bors r+ rollup

bors · 2024-01-06T15:12:06Z

📌 Commit 4039a46 has been approved by clubby789

It is now in the queue for this repository.

…ubby789 bump bootstrap dependencies This PR removes hard-coded patch versions, updates bootstrap's dependency stack to recent versions (some of the versions were released 3-4 years ago), and removes a few dependencies from bootstrap. Removed dependencies: ![image](https://github.com/rust-lang/rust/assets/39852038/95e86325-aea0-4055-bee5-245c144f662e)

…iaskrgr Rollup of 3 pull requests Successful merges: - rust-lang#119654 (bump bootstrap dependencies) - rust-lang#119656 (document rounding behavior of rint/nearbyint for ties) - rust-lang#119657 (Fix typo in docs for slice::split_once, slice::rsplit_once) r? `@ghost` `@rustbot` modify labels: rollup

onur-ozkan · 2024-01-07T08:48:54Z

@bors r- (#119671 (comment))

onur-ozkan · 2024-01-07T09:03:49Z

@bors r=clubby789

bors · 2024-01-07T09:03:51Z

📌 Commit f116fb7 has been approved by clubby789

It is now in the queue for this repository.

klensy · 2024-01-07T11:48:13Z

You're reverted cc version, right? Should it be pinned in Cargo.toml in that case?

onur-ozkan · 2024-01-07T11:51:24Z

You're reverted cc version, right?

Not reverted, just downgraded couple minor versions. I didn't check the reason behind it.

Should it be pinned in Cargo.toml in that case?

Sure, good idea.

onur-ozkan · 2024-01-07T11:51:31Z

@bors r-

onur-ozkan · 2024-01-07T12:12:24Z

@bors r=clubby789

bors · 2024-01-07T12:12:26Z

📌 Commit 2c27df0 has been approved by clubby789

It is now in the queue for this repository.

…ubby789 bump bootstrap dependencies This PR removes hard-coded patch versions, updates bootstrap's dependency stack to recent versions (some of the versions were released 3-4 years ago), and removes a few dependencies from bootstrap. Removed dependencies: ![image](https://github.com/rust-lang/rust/assets/39852038/95e86325-aea0-4055-bee5-245c144f662e)

bors · 2024-01-10T11:55:05Z

📌 Commit 107ff5c has been approved by clubby789

It is now in the queue for this repository.

bors · 2024-01-10T22:03:13Z

⌛ Testing commit 107ff5c with merge 0442090...

…by789 bump bootstrap dependencies This PR removes hard-coded patch versions, updates bootstrap's dependency stack to recent versions (some of the versions were released 3-4 years ago), and removes a few dependencies from bootstrap. Removed dependencies: ![image](https://github.com/rust-lang/rust/assets/39852038/95e86325-aea0-4055-bee5-245c144f662e)

bors · 2024-01-10T23:41:43Z

💔 Test failed - checks-actions

Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan · 2024-01-11T08:04:13Z

@bors r=clubby789

bors · 2024-01-11T08:04:15Z

📌 Commit f02f09a has been approved by clubby789

It is now in the queue for this repository.

bors · 2024-01-11T10:46:46Z

⌛ Testing commit f02f09a with merge d73bd3f...

bors · 2024-01-11T12:45:23Z

☀️ Test successful - checks-actions
Approved by: clubby789
Pushing d73bd3f to master...

rust-timer · 2024-01-11T14:23:29Z

Finished benchmarking commit (d73bd3f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

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.5%	[0.5%, 0.6%]	2
Regressions ❌ (secondary)	2.6%	[2.4%, 2.8%]	2
Improvements ✅ (primary)	-1.4%	[-1.4%, -1.4%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.1%	[-1.4%, 0.6%]	3

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)	-	-	0
Improvements ✅ (primary)	-0.5%	[-0.5%, -0.5%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-0.5%	[-0.5%, -0.5%]	1

Binary size

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

Bootstrap: 667.879s -> 666.77s (-0.17%)
Artifact size: 308.48 MiB -> 308.45 MiB (-0.01%)

…-ozkan Consistently unset RUSTC_BOOTSTRAP when compiling bootstrap Since rust-lang#113906, all x.py invocations performed by rust-analyzer have RUSTC_BOOTSTRAP=1 set. This was to fixrust-lang#112391 (comment) — rust-analyzer uses some default cargo from the system when fetching workspace layout, and the standard library uses some unstable cargo feature, so x.py would previously fail if the system toolchain wasn't nightly. https://github.com/rust-lang/rust/blob/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/Cargo.toml#L1 This PR changes x.py to cancel out this RUSTC_BOOTSTRAP=1 when compiling bootstrap. It will only remain set when running the compiled bootstrap executable. This fixes spurious bootstrap rebuilds in the event that a rust-analyzer x.py invocation is alternated with someone running x.py themself on the command line, if any dependency of bootstrap looks at `option_env!("RUSTC_BOOTSTRAP")`, which is the case since rust-lang#119654. **Before:** ```console $ RUSTC_BOOTSTRAP=1 ./x.py check library/core Building bootstrap Compiling proc-macro2 v1.0.76 Compiling quote v1.0.35 Compiling syn v2.0.48 Compiling clap_derive v4.4.7 Compiling serde_derive v1.0.195 Compiling clap v4.4.13 Compiling clap_complete v4.4.6 Compiling build_helper v0.1.0 Compiling bootstrap v0.0.0 Finished dev [unoptimized] target(s) in 6.31s Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu) Finished release [optimized] target(s) in 0.23s Build completed successfully in 0:00:07 $ ./x.py check library/core Building bootstrap Compiling proc-macro2 v1.0.76 Compiling quote v1.0.35 Compiling syn v2.0.48 Compiling clap_derive v4.4.7 Compiling serde_derive v1.0.195 Compiling clap v4.4.13 Compiling clap_complete v4.4.6 Compiling build_helper v0.1.0 Compiling bootstrap v0.0.0 Finished dev [unoptimized] target(s) in 5.30s Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu) Finished release [optimized] target(s) in 0.25s Build completed successfully in 0:00:06 ``` **After:** ```console $ RUSTC_BOOTSTRAP=1 ./x.py check library/core Building bootstrap Finished dev [unoptimized] target(s) in 0.06s Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu) Finished release [optimized] target(s) in 0.14s Build completed successfully in 0:00:01 $ ./x.py check library/core Building bootstrap Finished dev [unoptimized] target(s) in 0.04s Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu) Finished release [optimized] target(s) in 0.13s Build completed successfully in 0:00:01 ```

Rollup merge of rust-lang#120001 - dtolnay:bootstrapbootstrap, r=onur-ozkan Consistently unset RUSTC_BOOTSTRAP when compiling bootstrap Since rust-lang#113906, all x.py invocations performed by rust-analyzer have RUSTC_BOOTSTRAP=1 set. This was to fixrust-lang#112391 (comment) — rust-analyzer uses some default cargo from the system when fetching workspace layout, and the standard library uses some unstable cargo feature, so x.py would previously fail if the system toolchain wasn't nightly. https://github.com/rust-lang/rust/blob/82e1608dfa6e0b5569232559e3d385fea5a93112/library/std/Cargo.toml#L1 This PR changes x.py to cancel out this RUSTC_BOOTSTRAP=1 when compiling bootstrap. It will only remain set when running the compiled bootstrap executable. This fixes spurious bootstrap rebuilds in the event that a rust-analyzer x.py invocation is alternated with someone running x.py themself on the command line, if any dependency of bootstrap looks at `option_env!("RUSTC_BOOTSTRAP")`, which is the case since rust-lang#119654. **Before:** ```console $ RUSTC_BOOTSTRAP=1 ./x.py check library/core Building bootstrap Compiling proc-macro2 v1.0.76 Compiling quote v1.0.35 Compiling syn v2.0.48 Compiling clap_derive v4.4.7 Compiling serde_derive v1.0.195 Compiling clap v4.4.13 Compiling clap_complete v4.4.6 Compiling build_helper v0.1.0 Compiling bootstrap v0.0.0 Finished dev [unoptimized] target(s) in 6.31s Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu) Finished release [optimized] target(s) in 0.23s Build completed successfully in 0:00:07 $ ./x.py check library/core Building bootstrap Compiling proc-macro2 v1.0.76 Compiling quote v1.0.35 Compiling syn v2.0.48 Compiling clap_derive v4.4.7 Compiling serde_derive v1.0.195 Compiling clap v4.4.13 Compiling clap_complete v4.4.6 Compiling build_helper v0.1.0 Compiling bootstrap v0.0.0 Finished dev [unoptimized] target(s) in 5.30s Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu) Finished release [optimized] target(s) in 0.25s Build completed successfully in 0:00:06 ``` **After:** ```console $ RUSTC_BOOTSTRAP=1 ./x.py check library/core Building bootstrap Finished dev [unoptimized] target(s) in 0.06s Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu) Finished release [optimized] target(s) in 0.14s Build completed successfully in 0:00:01 $ ./x.py check library/core Building bootstrap Finished dev [unoptimized] target(s) in 0.04s Checking stage0 library artifacts {core} (x86_64-unknown-linux-gnu) Finished release [optimized] target(s) in 0.13s Build completed successfully in 0:00:01 ```

rustbot assigned clubby789 Jan 6, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jan 6, 2024

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 Jan 6, 2024

matthiaskrgr mentioned this pull request Jan 6, 2024
Rollup of 3 pull requests #119671
Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 7, 2024

onur-ozkan force-pushed the bump-dependencies branch from 4039a46 to d9f8e47Compare January 7, 2024 09:02

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 7, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 7, 2024

onur-ozkan force-pushed the bump-dependencies branch from f116fb7 to 2c27df0Compare January 7, 2024 12:11

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 7, 2024

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 Jan 10, 2024

This comment has been minimized.
Sign in to view

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 Jan 10, 2024

onur-ozkan added 2 commits January 11, 2024 10:24

bump bootstrap dependencies
8d0f888
Signed-off-by: onur-ozkan <work@onurozkan.dev>

bless tidy
f02f09a
Signed-off-by: onur-ozkan <work@onurozkan.dev>

onur-ozkan force-pushed the bump-dependencies branch from 107ff5c to f02f09aCompare January 11, 2024 07:24

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 Jan 11, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 11, 2024

bors merged commit d73bd3f into rust-lang:masterJan 11, 2024

rustbot added this to the 1.77.0 milestone Jan 11, 2024

dtolnay mentioned this pull request Jan 15, 2024
Consistently unset RUSTC_BOOTSTRAP when compiling bootstrap #120001
Merged

onur-ozkan deleted the bump-dependencies branch February 17, 2024 10:38

klensy mentioned this pull request Mar 14, 2024
Update cc crate for bootstrap to v1.0.97 #122504
Merged

Uh oh!

Uh oh!

Conversation

onur-ozkan commented Jan 6, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jan 6, 2024

Uh oh!

clubby789 commented Jan 6, 2024

Uh oh!

bors commented Jan 6, 2024

Uh oh!

onur-ozkan commented Jan 7, 2024

Uh oh!

onur-ozkan commented Jan 7, 2024

Uh oh!

bors commented Jan 7, 2024

Uh oh!

klensy commented Jan 7, 2024

Uh oh!

onur-ozkan commented Jan 7, 2024

Uh oh!

onur-ozkan commented Jan 7, 2024

Uh oh!

onur-ozkan commented Jan 7, 2024

Uh oh!

bors commented Jan 7, 2024

Uh oh!

bors commented Jan 10, 2024

Uh oh!

bors commented Jan 10, 2024

Uh oh!

This comment has been minimized.

bors commented Jan 10, 2024

Uh oh!

onur-ozkan commented Jan 11, 2024

Uh oh!

bors commented Jan 11, 2024

Uh oh!

bors commented Jan 11, 2024

Uh oh!

bors commented Jan 11, 2024

Uh oh!

rust-timer commented Jan 11, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

onur-ozkan commented Jan 6, 2024•
edited
Loading