Match ergonomics 2024: Implement TC's match ergonomics proposal #127008

Jules-Bertholet · 2024-06-26T21:35:45Z

Under gate ref_pat_eat_one_layer_2024_structural. Enabling ref_pat_eat_one_layer_2024 at the same time allows the union of what the individual gates allow. @traviscross

r? @Nadrieril

cc #123076

@rustbot label A-edition-2024 A-patterns

Jules-Bertholet · 2024-06-26T22:54:44Z

It works on my machine?

compiler-errors · 2024-06-27T02:18:01Z

@Jules-Bertholet: That's a debug assertion. You need to add:

rust.debug = true

To your config.toml, since debug assertions are not enabled by default even for the "compiler" profile.

Under gate `ref_pat_eat_one_layer_2024_structural`. Enabling `ref_pat_eat_one_layer_2024` at the same time allows the union of what the individual gates allow.

compiler/rustc_feature/src/unstable.rs

Nadrieril · 2024-06-30T12:24:30Z

Looks good! Just one procedural nit and then you can merge

@bors delegate

Nadrieril · 2024-06-30T12:25:36Z

@bors delegate+

bors · 2024-06-30T12:25:39Z

✌️ @Jules-Bertholet, you can now approve this pull request!

If @Nadrieril told you to "r=me" after making some further change, please make that change, then do @bors r=@Nadrieril

Nadrieril · 2024-06-30T12:31:58Z

Forgot I can push that kind of change myself

Nadrieril · 2024-06-30T13:28:08Z

@bors r+

bors · 2024-06-30T13:28:10Z

📌 Commit e09815f has been approved by Nadrieril

It is now in the queue for this repository.

…rieril Match ergonomics 2024: Implement TC's match ergonomics proposal Under gate `ref_pat_eat_one_layer_2024_structural`. Enabling `ref_pat_eat_one_layer_2024` at the same time allows the union of what the individual gates allow. `@traviscross` r? `@Nadrieril` cc rust-lang#123076 `@rustbot` label A-edition-2024 A-patterns

bors · 2024-07-02T02:38:29Z

⌛ Testing commit e09815f with merge bda9808...

bors · 2024-07-02T02:42:05Z

💔 Test failed - checks-actions

rust-log-analyzer · 2024-07-02T02:44:18Z

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

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

#14 0.799 
#14 0.799 gzip: stdin: not in gzip format
#14 0.800 tar: Child returned status 1
#14 0.800 tar: Error is not recoverable: exiting now
#14 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:
0.034 + mkdir netbsd

100   245  100   245    0     0    324      0 --:--:-- --:--:-- --:--:--   324
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "silly_edison" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.331 
#11 0.331 gzip: stdin: not in gzip format
#11 0.331 tar: Child returned status 1
#11 0.331 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   245  100   245    0     0    850      0 --:--:-- --:--:-- --:--:--   847
0.331 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "silly_edison" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.445 
#11 0.445 gzip: stdin: not in gzip format
#11 0.445 tar: Child returned status 1
#11 0.445 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   245  100   245    0     0    607      0 --:--:-- --:--:-- --:--:--   607
0.445 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "silly_edison" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.385 
#11 0.385 gzip: stdin: not in gzip format
#11 0.385 tar: Child returned status 1
#11 0.385 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   245  100   245    0     0    713      0 --:--:-- --:--:-- --:--:--   714
0.385 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "silly_edison" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.326 
#11 0.326 gzip: stdin: not in gzip format
#11 0.326 tar: Child returned status 1
#11 0.327 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   245  100   245    0     0    857      0 --:--:-- --:--:-- --:--:--   856
0.326 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
##[error]Process completed with exit code 1.
Post job cleanup.

compiler-errors · 2024-07-02T02:53:42Z

@bors retry

bors · 2024-07-02T02:58:33Z

⌛ Testing commit e09815f with merge e6da344...

…rieril Match ergonomics 2024: Implement TC's match ergonomics proposal Under gate `ref_pat_eat_one_layer_2024_structural`. Enabling `ref_pat_eat_one_layer_2024` at the same time allows the union of what the individual gates allow. `@traviscross` r? `@Nadrieril` cc rust-lang#123076 `@rustbot` label A-edition-2024 A-patterns

bors · 2024-07-02T03:01:42Z

💔 Test failed - checks-actions

compiler-errors · 2024-07-02T03:15:10Z

@bors retry

rust-log-analyzer · 2024-07-02T03:21:24Z

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

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

#14 0.410 
#14 0.410 gzip: stdin: not in gzip format
#14 0.410 tar: Child returned status 1
#14 0.411 tar: Error is not recoverable: exiting now
#14 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:
0.032 + mkdir netbsd

100   510  100   510    0     0   1379      0 --:--:-- --:--:-- --:--:--  1382
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "affectionate_aryabhata" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.409 
#11 0.409 gzip: stdin: not in gzip format
#11 0.410 tar: Child returned status 1
#11 0.410 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   510  100   510    0     0   1378      0 --:--:-- --:--:-- --:--:--  1374
0.409 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "affectionate_aryabhata" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.242 
#11 0.242 gzip: stdin: not in gzip format
#11 0.242 tar: Child returned status 1
#11 0.242 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   510  100   510    0     0   2540      0 --:--:-- --:--:-- --:--:--  2550
0.242 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "affectionate_aryabhata" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.502 
#11 0.502 gzip: stdin: not in gzip format
#11 0.502 tar: Child returned status 1
#11 0.502 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:

100   510  100   510    0     0   1102      0 --:--:-- --:--:-- --:--:--  1103
0.502 
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
#0 building with "affectionate_aryabhata" instance using docker-container driver

#1 [internal] load build definition from Dockerfile
#1 transferring dockerfile: 988B done
---
#11 0.423 
#11 0.423 gzip: stdin: not in gzip format
#11 0.423 tar: Child returned status 1
#11 0.423 tar: Error is not recoverable: exiting now
#11 ERROR: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
 > [6/8] RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh:
- --:--:--  1338
0.423 
0.423 gzip: stdin: not in gzip format
---
  11 | >>> RUN env HOST_CFLAGS="-O -fcommon" /tmp/build-netbsd-toolchain.sh
  12 |     
  13 |     COPY scripts/sccache.sh /scripts/
--------------------
ERROR: failed to solve: process "/bin/sh -c env HOST_CFLAGS=\"-O -fcommon\" /tmp/build-netbsd-toolchain.sh" did not complete successfully: exit code: 2
##[error]Process completed with exit code 1.
Post job cleanup.

Nadrieril · 2024-07-03T06:26:20Z

@bors retry

Nadrieril · 2024-07-03T18:16:27Z

@bors retry

Nadrieril · 2024-07-03T18:19:01Z

Oh it's in the queue. I got confused by out-of-order messages

traviscross

Looking at the tests that changed here, this looks right to me.

tests/ui/match/ref_pat_eat_one_layer_2024/ref_pat_eat_one_layer_2024_fail.rs

matthiaskrgr · 2024-07-05T06:43:54Z

@bors rollup=iffy in case of weird perf results

bors · 2024-07-05T09:10:20Z

⌛ Testing commit e09815f with merge 2ad6630...

bors · 2024-07-05T11:31:33Z

☀️ Test successful - checks-actions
Approved by: Nadrieril
Pushing 2ad6630 to master...

rust-timer · 2024-07-05T12:45:54Z

Finished benchmarking commit (2ad6630): 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
Improvements ✅ (secondary)	-0.2%	[-0.3%, -0.2%]	3
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 2.4%, secondary 1.5%)

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)	2.4%	[1.0%, 4.4%]	5
Regressions ❌ (secondary)	1.5%	[0.5%, 2.6%]	7
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	2.4%	[1.0%, 4.4%]	5

Cycles

Results (secondary 1.0%)

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.0%	[0.4%, 2.5%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 698.63s -> 698.523s (-0.02%)
Artifact size: 328.27 MiB -> 328.26 MiB (-0.00%)

rustbot assigned Nadrieril Jun 26, 2024

Jules-Bertholet mentioned this pull request Jun 26, 2024

Tracking Issue for match ergonomics 2024 (RFC 3627) #123076

Open

14 tasks

This comment has been minimized.

Sign in to view

Jules-Bertholet added 2 commits June 27, 2024 00:12

Implement TC's match ergonomics 2024 proposal

372847d

Under gate `ref_pat_eat_one_layer_2024_structural`. Enabling `ref_pat_eat_one_layer_2024` at the same time allows the union of what the individual gates allow.

Fix tidy

35f6b7b

Jules-Bertholet force-pushed the tc-ergonomics branch from f6af9e2 to 35f6b7b Compare June 27, 2024 04:15

Nadrieril reviewed Jun 30, 2024

View reviewed changes

compiler/rustc_feature/src/unstable.rs Outdated Show resolved Hide resolved

New features gates mustn't specify a version by hand

e09815f

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 Jun 30, 2024

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 2, 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 Jul 2, 2024

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 2, 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 Jul 2, 2024

traviscross approved these changes Jul 3, 2024

View reviewed changes

tests/ui/match/ref_pat_eat_one_layer_2024/ref_pat_eat_one_layer_2024_fail.rs Show resolved Hide resolved

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 5, 2024

bors merged commit 2ad6630 into rust-lang:master Jul 5, 2024

rustbot added this to the 1.81.0 milestone Jul 5, 2024

bors mentioned this pull request Jul 5, 2024

Make inline suggestions no longer be the default #127282

Draft

Jules-Bertholet deleted the tc-ergonomics branch July 5, 2024 13:03

Shunpoco mentioned this pull request Feb 1, 2025

Add a comment pointing to ICE-136223 #136397

Merged

Match ergonomics 2024: Implement TC's match ergonomics proposal #127008

Match ergonomics 2024: Implement TC's match ergonomics proposal #127008

Uh oh!

Conversation

Jules-Bertholet commented Jun 26, 2024

Uh oh!

This comment has been minimized.

Jules-Bertholet commented Jun 26, 2024

Uh oh!

compiler-errors commented Jun 27, 2024

Uh oh!

Uh oh!

Nadrieril commented Jun 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Nadrieril commented Jun 30, 2024

Uh oh!

bors commented Jun 30, 2024

Uh oh!

Nadrieril commented Jun 30, 2024

Uh oh!

Nadrieril commented Jun 30, 2024

Uh oh!

bors commented Jun 30, 2024

Uh oh!

bors commented Jul 2, 2024

Uh oh!

bors commented Jul 2, 2024

Uh oh!

rust-log-analyzer commented Jul 2, 2024

Uh oh!

compiler-errors commented Jul 2, 2024

Uh oh!

bors commented Jul 2, 2024

Uh oh!

bors commented Jul 2, 2024

Uh oh!

compiler-errors commented Jul 2, 2024

Uh oh!

rust-log-analyzer commented Jul 2, 2024

Uh oh!

Nadrieril commented Jul 3, 2024

Uh oh!

Nadrieril commented Jul 3, 2024

Uh oh!

Nadrieril commented Jul 3, 2024

Uh oh!

traviscross left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

matthiaskrgr commented Jul 5, 2024

Uh oh!

bors commented Jul 5, 2024

Uh oh!

bors commented Jul 5, 2024

Uh oh!

rust-timer commented Jul 5, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

Nadrieril commented Jun 30, 2024 •

edited

Loading