Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bootstrap bump #117875

Merged
merged 5 commits into from
Nov 16, 2023
Merged

Bootstrap bump #117875

merged 5 commits into from
Nov 16, 2023

Conversation

Mark-Simulacrum
Copy link
Member

@rustbot
Copy link
Collaborator

rustbot commented Nov 13, 2023

r? @clubby789

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

@Mark-Simulacrum
Copy link
Member Author

rustfmt changes seem potentially more widespread than I'd expect, so asked on Zulip about them - https://rust-lang.zulipchat.com/#narrow/stream/266220-t-rustdoc/topic/expected.20changes.20in.20bootstrap.20bump.3F

cc @rust-lang/rustdoc as well

@Mark-Simulacrum
Copy link
Member Author

er, @rust-lang/rustfmt, sorry

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic O-ios Operating system: iOS O-macos Operating system: macOS O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-watchos Operating System: watchOS O-windows Operating system: Windows T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Nov 13, 2023
@rustbot

This comment was marked as off-topic.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@calebcartwright
Copy link
Member

rustfmt changes seem potentially more widespread than I'd expect, so asked on Zulip about them - https://rust-lang.zulipchat.com/#narrow/stream/266220-t-rustdoc/topic/expected.20changes.20in.20bootstrap.20bump.3F

cc @rust-lang/rustdoc as well

Acknowledge seeing this, from a quick glance many of the changes look related to things like the newly added support for formatting let chains (some of the diffs are to lines contained within the body of a let chain). Can take a deeper look later though

@GuillaumeGomez
Copy link
Member

Please don't add the link to the rustdoc team in your replies. We get re-subscribed every time. 😅

@Urgau
Copy link
Member

Urgau commented Nov 13, 2023 •
edited
Loading

The job x86_64-gnu-llvm-15 failed! Check out the build log: (web) (plain)
Click to see the possible cause of the failure (guessed by this bot)

I've investigated the failure. This due to the way the cranelift build system and bootstrap interacts.
bootstrap use RUSTFLAGS to pass extra --check-cfg arguments which the cranelift build system happily passes, marking some cfgs (bootstrap and parallel_compiler) as expected.
This didn't cause a issue before because cranelift build system didn't respect -Zcheck-cfg that we were passing to Cargo, but now with the new syntax, exhaustiveness is by default, making no_unstable_features unexpected.

The short term solution would be to add it the our list of EXTRA_CHECK_CFG in bootstrap.
The long term solution is a bit unclear, either cranelift build system should mark no_unstable_features as expected or maybe not re-use the RUSTFLAGS from bootstrap.
Tagging @bjorn3 for awareness.

@bjorn3
Copy link
Member

bjorn3 commented Nov 14, 2023

cg_clif's build system has to respect RUSTFLAGS to pick up the right linker and such. I can add -Zcheck-cfg= to it though.

@Urgau
Copy link
Member

Urgau commented Nov 14, 2023

cg_clif's build system has to respect RUSTFLAGS to pick up the right linker and such. I can add -Zcheck-cfg= to it though.

Adding --check-cfg=cfg(no_unstable_features) to every rustc invocation for mini_core should do it.

@bjorn3
Copy link
Member

bjorn3 commented Nov 14, 2023

Adding that here should work:

rust/compiler/rustc_codegen_cranelift/build_system/tests.rs

Line 459 in d97bb19

cmd.arg("-Cpanic=abort");

@rustbot
Copy link
Collaborator

rustbot commented Nov 14, 2023

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member Author

@bors r-

@bors 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 Nov 16, 2023
@Mark-Simulacrum
Copy link
Member Author

@bors r=clubby789

@bors
Copy link
Contributor

bors commented Nov 16, 2023

📌 Commit 9e8edb6 has been approved by clubby789

It is now in the queue for this repository.

@bors 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 Nov 16, 2023
@bors
Copy link
Contributor

bors commented Nov 16, 2023

⌛ Testing commit 9e8edb6 with merge 1be1e84...

@bors
Copy link
Contributor

bors commented Nov 16, 2023

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 16, 2023
@bors bors merged commit 1be1e84 into rust-lang:master Nov 16, 2023
12 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Nov 16, 2023
This was referenced Nov 16, 2023
Merged
Merged
Merged
Merged
Closed
Merged
Merged
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (1be1e84): 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)		 1.3% [0.9%, 1.8%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.9% [-1.3%, -0.5%] 3
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 0.0% [-1.3%, 1.8%] 5

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
Improvements ✅
(secondary)		 -1.9% [-2.1%, -1.8%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 675.207s -> 676.569s (0.20%)
Artifact size: 313.64 MiB -> 313.63 MiB (-0.00%)

@chenrui333
Copy link

This was referenced Nov 16, 2023
Closed
Closed
@Mark-Simulacrum Mark-Simulacrum deleted the bootstrap-bump branch November 17, 2023 02:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ytmimi ytmimi ytmimi left review comments

@clubby789 clubby789 clubby789 approved these changes

Assignees

@clubby789 clubby789

Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-rustdoc-json Area: Rustdoc JSON backend A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. O-ios Operating system: iOS O-macos Operating system: macOS O-unix Operating system: Unix-like O-wasi Operating system: Wasi, Webassembly System Interface O-watchos Operating System: watchOS O-windows Operating system: Windows S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.76.0
Development

Successfully merging this pull request may close these issues.

None yet