Format all the let-chains in compiler crates #116688

compiler-errors · 2023-10-13T08:47:11Z

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, 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) -- #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 #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.

rustbot · 2023-10-13T08:47:15Z

Could not assign reviewer from: WaffleLapkin.
User(s) WaffleLapkin are either the PR author, already assigned, or on vacation, and there are no other candidates.
Use r? to specify someone else to assign.

rustbot · 2023-10-13T08:47:23Z

r? @b-naber

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

compiler-errors · 2023-10-13T08:48:36Z

r? Nilstrieb

rustbot · 2023-10-13T09:03:08Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

rustc_macros::diagnostics was changed

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

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes might have occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred in need_type_info.rs

cc @lcnr

WaffleLapkin · 2023-10-13T10:51:33Z

compiler/rustc_ast/src/entry.rs

-        if let Some(name) = name && name == sym::main {
+        if let Some(name) = name
+            && name == sym::main


Not this PR responsibility, but this should probably be just == Some(sym::main)...

Or even if let Some(sym::main) = name :P since sym::main is a const.

oli-obk · 2023-10-13T11:09:18Z

@bors p=42 bitrotty

Mark-Simulacrum · 2023-10-13T12:10:40Z

Note that we format with a (pinned) nightly rustfmt toolchain, so it may make sense to hold off until rustfmt support is in nightly and then do this via x.py fmt? That'll avoid any mistakes in how you ran the formatting and generally give a better contributor experience I think...

WaffleLapkin · 2023-10-13T13:23:33Z

@Mark-Simulacrum I don't think it makes see to hold off this. Current pinned nightly rustfmt won't change all those cases (since it ignores let chains and stuff; more the ci passing). So I don't really see how holding this off will improve anyone's experience. Additionally rustfmt is not released often, so we might need to wait a relatively long time.

On the other hand we'll have to do those changes either way, so we can just as well do them now.

WaffleLapkin

r=WaffleLapkin,Nilstrieb when Mark's concern is resolved ig

WaffleLapkin · 2023-10-13T11:58:28Z

compiler/rustc_resolve/src/late/diagnostics.rs

+                    if let Some(def_id) = candidate.did
+                        && let Some(module) = self.r.get_module(def_id)
+                    {
+                        Some(def_id) != self.parent_scope.module.opt_def_id()


(not this PR) this should be arg swapped

WaffleLapkin · 2023-10-13T12:43:21Z

compiler/rustc_infer/src/infer/error_reporting/note_and_explain.rs

+                                    .unwrap_or_else(|| tcx.def_span(body_owner_def_id));
+                                diag.span_note(
+                                    sp,
+                                    "\


(not this PR problem) this line is not good

WaffleLapkin · 2023-10-13T13:10:50Z

compiler/rustc_mir_transform/src/gvn.rs

@@ -319,7 +319,8 @@ impl<'body, 'tcx> VnState<'body, 'tcx> {
        }

        if let Some(local) = self.try_as_local(value, location)
-            && local != place.local // in case we had no projection to begin with.
+            && local != place.local
+        // in case we had no projection to begin with.


this should be moved above the ==

WaffleLapkin · 2023-10-13T13:26:21Z

Unrelated, but why does this not have any S-* label? D:

Mark-Simulacrum · 2023-10-15T13:21:24Z

@bors r=WaffleLapkin,Nilstrieb

I continue to expect that waiting until this is in nightly rustfmt (all that is needed for x.py to do this) makes sense and is the easier path for future improvements than manually hacking it together. However, after speaking with @WaffleLapkin we agreed that doesn't really need to block this existing PR.

bors · 2023-10-15T13:21:26Z

📌 Commit e805151 has been approved by WaffleLapkin,Nilstrieb

It is now in the queue for this repository.

bors · 2023-10-15T13:23:59Z

⌛ Testing commit e805151 with merge a483969...

klensy · 2023-10-15T13:24:45Z

Need to update .git-blame-ignore-revs? (i'm blind, ignore this.)

compiler-errors · 2023-10-15T13:35:14Z

@klensy: I can do once I know a rev will actually merge :)

bors · 2023-10-15T15:16:09Z

☀️ Test successful - checks-actions
Approved by: WaffleLapkin,Nilstrieb
Pushing a483969 to master...

…hains, r=Mark-Simulacrum Ignore let-chains formatting Follow-up to rust-lang#116688

rust-timer · 2023-10-15T22:33:03Z

Finished benchmarking commit (a483969): 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.2%	[0.4%, 1.8%]	8
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.2%	[0.4%, 1.8%]	8

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)	2.2%	[2.2%, 2.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: 623.941s -> 625.155s (0.19%)
Artifact size: 305.50 MiB -> 305.52 MiB (0.01%)

Rollup merge of rust-lang#116771 - compiler-errors:blame-ignore-let-chains, r=Mark-Simulacrum Ignore let-chains formatting Follow-up to rust-lang#116688

rustbot assigned b-naber Oct 13, 2023

rustbot assigned Nilstrieb and unassigned b-naber Oct 13, 2023

This comment has been minimized.

Sign in to view

Nilstrieb assigned WaffleLapkin Oct 13, 2023

Format all the let chains in compiler

b2d2184

rust-cloud-vms bot force-pushed the rustfmt-up branch from e1a4cc4 to d0143cf Compare October 13, 2023 09:03

This comment has been minimized.

Sign in to view

Bless tests and new warnings due to formatting changes

e805151

rust-cloud-vms bot force-pushed the rustfmt-up branch from d0143cf to e805151 Compare October 13, 2023 09:32

Nilstrieb approved these changes Oct 13, 2023

View reviewed changes

WaffleLapkin reviewed Oct 13, 2023

View reviewed changes

WaffleLapkin approved these changes Oct 13, 2023

View reviewed changes

Nilstrieb added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 13, 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 15, 2023

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

bors merged commit a483969 into rust-lang:master Oct 15, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 15, 2023

compiler-errors mentioned this pull request Oct 15, 2023

Ignore let-chains formatting #116771

Merged

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 15, 2023

Rollup merge of rust-lang#116771 - compiler-errors:blame-ignore-let-c…

66417cb

…hains, r=Mark-Simulacrum Ignore let-chains formatting Follow-up to rust-lang#116688

compiler-errors deleted the rustfmt-up branch October 15, 2023 22:37

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 15, 2023

Unrolled build for rust-lang#116771

7f9cb08

Rollup merge of rust-lang#116771 - compiler-errors:blame-ignore-let-chains, r=Mark-Simulacrum Ignore let-chains formatting Follow-up to rust-lang#116688

Veykril mentioned this pull request Oct 17, 2023

Pull upstream master 2023 10 17 ferrocene/ferrocene#54

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Format all the let-chains in compiler crates #116688

Format all the let-chains in compiler crates #116688

compiler-errors commented Oct 13, 2023 •

edited

rustbot commented Oct 13, 2023

rustbot commented Oct 13, 2023

compiler-errors commented Oct 13, 2023

This comment has been minimized.

rustbot commented Oct 13, 2023

This comment has been minimized.

WaffleLapkin Oct 13, 2023

fmease Oct 13, 2023

oli-obk commented Oct 13, 2023

Mark-Simulacrum commented Oct 13, 2023

WaffleLapkin commented Oct 13, 2023

WaffleLapkin left a comment

WaffleLapkin Oct 13, 2023

WaffleLapkin Oct 13, 2023

WaffleLapkin Oct 13, 2023

WaffleLapkin commented Oct 13, 2023

Mark-Simulacrum commented Oct 15, 2023

bors commented Oct 15, 2023

bors commented Oct 15, 2023

klensy commented Oct 15, 2023 •

edited

compiler-errors commented Oct 15, 2023

bors commented Oct 15, 2023

rust-timer commented Oct 15, 2023

Format all the let-chains in compiler crates #116688

Format all the let-chains in compiler crates #116688

Conversation

compiler-errors commented Oct 13, 2023 • edited

rustbot commented Oct 13, 2023

rustbot commented Oct 13, 2023

compiler-errors commented Oct 13, 2023

This comment has been minimized.

rustbot commented Oct 13, 2023

This comment has been minimized.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

oli-obk commented Oct 13, 2023

Mark-Simulacrum commented Oct 13, 2023

WaffleLapkin commented Oct 13, 2023

WaffleLapkin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

WaffleLapkin commented Oct 13, 2023

Mark-Simulacrum commented Oct 15, 2023

bors commented Oct 15, 2023

bors commented Oct 15, 2023

klensy commented Oct 15, 2023 • edited

compiler-errors commented Oct 15, 2023

bors commented Oct 15, 2023

rust-timer commented Oct 15, 2023

Overall result: no relevant changes - no action needed

compiler-errors commented Oct 13, 2023 •

edited

klensy commented Oct 15, 2023 •

edited