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

Bump bootstrap to 1.72 beta #113637

Merged
merged 5 commits into from
Jul 13, 2023
Merged

Bump bootstrap to 1.72 beta #113637

merged 5 commits into from
Jul 13, 2023

Conversation

Mark-Simulacrum
Copy link
Member

No description provided.

@rustbot
Copy link
Collaborator

rustbot commented Jul 13, 2023

r? @ozkanonur

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

@rustbot 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) 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. labels Jul 13, 2023
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic WG-trait-system-refactor The Rustc Trait System Refactor Initiative labels Jul 13, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jul 13, 2023

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Some changes might have occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

rustc_macros::diagnostics was changed

cc @davidtwco, @compiler-errors, @JohnTitor, @TaKO8Ki

Some changes occurred in need_type_info.rs

cc @lcnr

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

@Mark-Simulacrum Mark-Simulacrum removed A-testsuite Area: The testsuite used to check the correctness of rustc T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-libs Relevant to the library team, which will review and decide on the PR/issue. A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic WG-trait-system-refactor The Rustc Trait System Refactor Initiative labels Jul 13, 2023
@Mark-Simulacrum
Copy link
Member Author

(This re-formats a bunch of let-else's so touches a bunch of code)

onur-ozkan
onur-ozkan approved these changes Jul 13, 2023
View reviewed changes
Copy link
Member

@onur-ozkan onur-ozkan left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes looks good to me. I am not sure if I should queue the PR right away(I don't know how we handle release PRs). I leave that to you with r=me

@Mark-Simulacrum
Copy link
Member Author

@bors r=ozkanonur p=1 (possibly conflict prone)

@bors
Copy link
Contributor

bors commented Jul 13, 2023

📌 Commit cc907f8 has been approved by ozkanonur

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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 13, 2023
@klensy
Copy link
Contributor

klensy commented Jul 13, 2023

Should format commit be added to git-blame-ignore-revs or it small?

@rust-log-analyzer
Copy link
Collaborator

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

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

@bors 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 Jul 13, 2023
@jyn514
Copy link
Member

jyn514 commented Jul 13, 2023

looks like we timed out installing clang (???)

@bors retry

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 13, 2023
@matthiaskrgr
Copy link
Member

@bors retry no error output

@Noratrieb
Copy link
Member

looks like a timeout
@bors retry

@jyn514
Copy link
Member

jyn514 commented Jul 13, 2023

fwiw i want to mention that these bootstrap bumps usually hit lots of issues that need to be fixed, so spreading them out a day apart with time needed to fix conflicts in between makes it very likely it would take weeks to land

@bors
Copy link
Contributor

bors commented Jul 13, 2023

⌛ Testing commit e8b0b17 with merge a161ab0...

@bors
Copy link
Contributor

bors commented Jul 13, 2023

☀️ Test successful - checks-actions
Approved by: ozkanonur
Pushing a161ab0 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 13, 2023
@bors bors merged commit a161ab0 into rust-lang:master Jul 13, 2023
11 checks passed
@rustbot rustbot added this to the 1.73.0 milestone Jul 13, 2023
This was referenced Jul 13, 2023
Merged
Closed
Merged
Merged
Merged
Merged
Closed
Closed
Closed
Merged
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a161ab0): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

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)		 3.2% [2.9%, 3.6%] 3
Improvements ✅
(primary)		 -2.9% [-2.9%, -2.9%] 1
Improvements ✅
(secondary)		 -3.7% [-3.7%, -3.7%] 1
All ❌✅ (primary) -2.9% [-2.9%, -2.9%] 1

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)		 -4.1% [-4.7%, -3.5%] 6
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -4.1% [-4.7%, -3.5%] 6

Binary size

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

Bootstrap: 658.375s -> 658.555s (0.03%)

@onur-ozkan onur-ozkan mentioned this pull request Jul 14, 2023
Merged
@djkoloski djkoloski mentioned this pull request Aug 21, 2023
Closed
@compiler-errors compiler-errors mentioned this pull request Oct 13, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 15, 2023
@bors
Auto merge of rust-lang#116688 - compiler-errors:rustfmt-up, r=Waffle…
a483969 
…Lapkin,Nilstrieb

Format all the let-chains in compiler crates

Since rust-lang/rustfmt#5910 has landed, soon we will have support for formatting let-chains (as soon as rustfmt syncs and beta gets bumped).

This PR applies the changes [from master rustfmt to rust-lang/rust eagerly](https://rust-lang.zulipchat.com/#narrow/stream/122651-general/topic/out.20formatting.20of.20prs/near/374997516), so that the next beta bump does not have to deal with a 200+ file diff and can remain concerned with other things like `cfg(bootstrap)` -- rust-lang#113637 was a pain to land, for example, because of let-else.

I will also add this commit to the ignore list after it has landed.

The commands that were run -- I'm not great at bash-foo, but this applies rustfmt to every compiler crate, and then reverts the two crates that should probably be formatted out-of-tree.
```
~/rustfmt $ ls -1d ~/rust/compiler/* | xargs -I@ cargo run --bin rustfmt -- `@/src/lib.rs` --config-path ~/rust --edition=2021 # format all of the compiler crates
~/rust $ git checkout HEAD -- compiler/rustc_codegen_{gcc,cranelift} # revert changes to cg-gcc and cg-clif
```

cc `@rust-lang/rustfmt`
r? `@WaffleLapkin` or `@Nilstrieb` who said they may be able to review this purely mechanical PR :>

cc `@Mark-Simulacrum` and `@petrochenkov,` who had some thoughts on the order of operations with big formatting changes in rust-lang#95262 (comment). I think the situation has changed since then, given that let-chains support exists on master rustfmt now, and I'm fairly confident that this formatting PR should land even if *bootstrap* rustfmt doesn't yet format let-chains in order to lessen the burden of the next beta bump.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onur-ozkan onur-ozkan onur-ozkan approved these changes

Assignees

@onur-ozkan onur-ozkan

Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself 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. 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative
Projects
None yet
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.