or_patterns: implement :pat edition-specific behavior #80100

mark-i-m · 2020-12-17T00:12:16Z

This PR implements the edition-specific behavior of :pat wrt or-patterns, as determined by the crater runs and T-lang consensus in #54883 (comment).

I believe this can unblock stabilization of or_patterns.

r? @petrochenkov

mark-i-m · 2020-12-17T05:48:56Z

I keep getting:

Copying stage0 rustc from stage0 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
Assembling stage1 compiler (x86_64-unknown-linux-gnu)
thread 'main' panicked at 'src.symlink_metadata() failed with No such file or directory (os error 2)', src/bootstrap/lib.rs:1216:24
note: run with RUST_BACKTRACE=1 environment variable to display a backtrace
failed to run: /home/mark/rust/build/bootstrap/debug/bootstrap test --bless
Build completed unsuccessfully in 0:17:56

I've tried everything...

compiler/rustc_ast/src/token.rs

compiler/rustc_parse/src/parser/nonterminal.rs

petrochenkov · 2020-12-17T20:27:57Z

Some UI tests need an update.

mark-i-m · 2020-12-17T23:14:38Z

For some reason, I keep getting the same bootstrapping error above. I'm unable to run any tests locally :(

petrochenkov · 2020-12-17T23:21:44Z

@mark-i-m
https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/bootstrap.20fails.20to.20assemble.20stage.201.20compiler

mark-i-m · 2020-12-18T00:48:58Z

~~I think CI should be passing now.~~ CI is passing now :)

petrochenkov · 2020-12-18T10:31:51Z

r=me with commits squashed.

mark-i-m · 2020-12-18T18:42:17Z

@petrochenkov squashed.

mark-i-m · 2020-12-18T23:39:45Z

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

petrochenkov · 2020-12-19T01:52:19Z

@bors r+

bors · 2020-12-19T01:52:20Z

📌 Commit fd4ae3a has been approved by petrochenkov

or_patterns: implement :pat edition-specific behavior cc rust-lang#54883 `@joshtriplett` This PR implements the edition-specific behavior of `:pat` wrt or-patterns, as determined by the crater runs and T-lang consensus in rust-lang#54883 (comment). I believe this can unblock stabilization of or_patterns. r? `@petrochenkov`

bors · 2020-12-19T16:13:45Z

⌛ Testing commit 1a7d00a with merge e88476cacdce4e89097f37c14e73962b68bcf642...

rust-log-analyzer · 2020-12-19T16:19:29Z

The job dist-armv7-linux failed! Check out the build log: (web) (plain)

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

[TIMING] StdLink { compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target_compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } }, target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } -- 0.001
[TIMING] Std { target: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None }, compiler: Compiler { stage: 0, host: TargetSelection { triple: "x86_64-unknown-linux-gnu", file: None } } } -- 76.664
Building LLVM for x86_64-unknown-linux-gnu
running: "cmake" "/checkout/src/llvm-project/llvm" "-G" "Ninja" "-DLLVM_ENABLE_ASSERTIONS=OFF" "-DLLVM_TARGETS_TO_BUILD=AArch64;ARM;Hexagon;MSP430;Mips;NVPTX;PowerPC;RISCV;Sparc;SystemZ;WebAssembly;X86" "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR" "-DLLVM_INCLUDE_EXAMPLES=OFF" "-DLLVM_INCLUDE_TESTS=OFF" "-DLLVM_INCLUDE_DOCS=OFF" "-DLLVM_INCLUDE_BENCHMARKS=OFF" "-DLLVM_ENABLE_TERMINFO=OFF" "-DLLVM_ENABLE_LIBEDIT=OFF" "-DLLVM_ENABLE_BINDINGS=OFF" "-DLLVM_ENABLE_Z3_SOLVER=OFF" "-DLLVM_PARALLEL_COMPILE_JOBS=16" "-DLLVM_TARGET_ARCH=x86_64" "-DLLVM_DEFAULT_TARGET_TRIPLE=x86_64-unknown-linux-gnu" "-DLLVM_ENABLE_ZLIB=ON" "-DCMAKE_EXE_LINKER_FLAGS=-Wl,-Bsymbolic -static-libstdc++" "-DLLVM_ENABLE_LIBXML2=OFF" "-DLLVM_VERSION_SUFFIX=-rust-1.50.0-nightly" "-DCMAKE_INSTALL_MESSAGE=LAZY" "-DCMAKE_C_COMPILER_LAUNCHER=sccache" "-DCMAKE_CXX_COMPILER_LAUNCHER=sccache" "-DCMAKE_C_COMPILER=cc" "-DCMAKE_CXX_COMPILER=c++" "-DCMAKE_ASM_COMPILER=cc" "-DCMAKE_C_FLAGS=-ffunction-sections -fdata-sections -fPIC -m64" "-DCMAKE_CXX_FLAGS=-ffunction-sections -fdata-sections -fPIC -m64 -static-libstdc++" "-DCMAKE_INSTALL_PREFIX=/checkout/obj/build/x86_64-unknown-linux-gnu/llvm" "-DCMAKE_ASM_FLAGS= -ffunction-sections -fdata-sections -fPIC -m64" "-DCMAKE_BUILD_TYPE=Release"
CMake Error: The source directory "/checkout/src/llvm-project/llvm" does not exist.
Specify --help for usage, or press the help button on the CMake GUI.
command did not execute successfully, got: exit code: 1

 finished in 0.011 seconds
 finished in 0.011 seconds
build script failed, must exit now', /cargo/registry/src/github.com-1ecc6299db9ec823/cmake-0.1.44/src/lib.rs:885:5
failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --host armv7-unknown-linux-gnueabihf --target armv7-unknown-linux-gnueabihf
Build completed unsuccessfully in 0:01:17

bors · 2020-12-19T16:20:17Z

💔 Test failed - checks-actions

mark-i-m · 2020-12-19T16:49:52Z

I don't understand the CI failure. It looks like llvm is missing? Seems unrelated?

petrochenkov · 2020-12-19T16:53:55Z

The failure looks unrelated to this PR.
@bors retry

or_patterns: implement :pat edition-specific behavior cc rust-lang#54883 `@joshtriplett` This PR implements the edition-specific behavior of `:pat` wrt or-patterns, as determined by the crater runs and T-lang consensus in rust-lang#54883 (comment). I believe this can unblock stabilization of or_patterns. r? `@petrochenkov`

or_patterns: implement :pat edition-specific behavior cc rust-lang#54883 ``@joshtriplett`` This PR implements the edition-specific behavior of `:pat` wrt or-patterns, as determined by the crater runs and T-lang consensus in rust-lang#54883 (comment). I believe this can unblock stabilization of or_patterns. r? ``@petrochenkov``

bors · 2020-12-20T04:10:49Z

⌛ Testing commit 1a7d00a with merge 29e3212...

bors · 2020-12-20T07:00:55Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 29e3212 to master...

Mark-Simulacrum · 2020-12-24T14:08:58Z

This seems to have been a slight regression in instruction counts (0.5%) on the deep vector benchmark. I think it would probably be good to modify the code to lazily query the edition if we encounter a pat pattern (or, even better, one that would differ in behavior) - edition queries are relatively expensive.

mark-i-m · 2020-12-24T17:44:27Z

@Mark-Simulacrum Hmm... that's good to know. Yeah, I can do that. I think we will want to do something different altogether, though -- adding a new NonterminalKind for 2015/18/21 editions and their different :pats (if I understood the lang team consensus correctly). I think that should naturally handle the regression.

I can hack something together to address the regression now if you want, but I would prefer to just do the above (it might take a bit longer though; not sure I can do it before the beta branches)...

Mark-Simulacrum · 2020-12-24T17:58:53Z

I am not worried about this hitting beta - regression is minor. I agree that the long term planning in this area probably means we don't need a temporary fix for now.

Implement edition-based macro :pat feature This PR does two things: 1. Fixes the perf regression from rust-lang#80100 (comment) 2. Implements `:pat2018` and `:pat2021` matchers, as described by `@joshtriplett` in rust-lang#54883 (comment) behind the feature gate `edition_macro_pat`. r? `@petrochenkov` cc `@Mark-Simulacrum`

mark-i-m · 2021-01-01T07:30:00Z

FYI, if someone is following up perf regressions, #80459 should resolve this regression and recently merged.

…matsakis Stabilize or_patterns (RFC 2535, 2530, 2175) closes rust-lang#54883 This PR stabilizes the or_patterns feature in Rust 1.53. This is blocked on the following (in order): - [x] The crater run in rust-lang#78935 (comment) - [x] The resolution of the unresolved questions and a second crater run (rust-lang#78935 (comment)) - It looks like we will need to pursue some sort of edition-based transition for `:pat`. - [x] Nomination and discussion by T-lang - [x] Implement new behavior for `:pat` based on consensus (rust-lang#80100). - [ ] An FCP on stabilization EDIT: Stabilization report is in rust-lang#79278 (comment)

Stabilize or_patterns (RFC 2535, 2530, 2175) closes #54883 This PR stabilizes the or_patterns feature in Rust 1.53. This is blocked on the following (in order): - [x] The crater run in rust-lang/rust#78935 (comment) - [x] The resolution of the unresolved questions and a second crater run (rust-lang/rust#78935 (comment)) - It looks like we will need to pursue some sort of edition-based transition for `:pat`. - [x] Nomination and discussion by T-lang - [x] Implement new behavior for `:pat` based on consensus (rust-lang/rust#80100). - [ ] An FCP on stabilization EDIT: Stabilization report is in rust-lang/rust#79278 (comment)

rust-highfive assigned petrochenkov Dec 17, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 17, 2020

mark-i-m mentioned this pull request Dec 17, 2020

Stabilize or_patterns (RFC 2535, 2530, 2175) #79278

Merged

5 tasks

This comment has been minimized.

Sign in to view

mark-i-m force-pushed the pattORns-2 branch from e5b2b7d to c817d0c Compare December 17, 2020 05:49

This comment has been minimized.

Sign in to view

petrochenkov reviewed Dec 17, 2020

View reviewed changes

compiler/rustc_ast/src/token.rs Outdated Show resolved Hide resolved

compiler/rustc_parse/src/parser/nonterminal.rs Show resolved Hide resolved

compiler/rustc_parse/src/parser/nonterminal.rs Outdated Show resolved Hide resolved

petrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 17, 2020

This comment has been minimized.

Sign in to view

mark-i-m force-pushed the pattORns-2 branch from e9b8d44 to fd4ae3a Compare December 18, 2020 18:42

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 18, 2020

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 Dec 19, 2020

Dylan-DPC-zz mentioned this pull request Dec 19, 2020

Rollup of 10 pull requests #80178

Closed

This comment has been minimized.

Sign in to view

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 Dec 19, 2020

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 Dec 19, 2020

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 Dec 19, 2020

Dylan-DPC-zz mentioned this pull request Dec 20, 2020

Rollup of 5 pull requests #80212

Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 20, 2020

bors merged commit 29e3212 into rust-lang:master Dec 20, 2020

rustbot added this to the 1.50.0 milestone Dec 20, 2020

mark-i-m mentioned this pull request Dec 20, 2020

Tracking issue for RFC 2535, 2530, 2175, "Or patterns, i.e Foo(Bar(x) | Baz(x))" #54883

Closed

8 tasks

mark-i-m deleted the pattORns-2 branch December 28, 2020 19:56

mark-i-m mentioned this pull request Dec 28, 2020

Implement edition-based macro :pat feature #80459

Merged

m-ou-se mentioned this pull request Sep 3, 2021

🎉 Rust 2021 celebration and thanks #88623

Closed

or_patterns: implement :pat edition-specific behavior #80100

or_patterns: implement :pat edition-specific behavior #80100

Uh oh!

Conversation

mark-i-m commented Dec 17, 2020

Uh oh!

This comment has been minimized.

mark-i-m commented Dec 17, 2020

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Dec 17, 2020

Uh oh!

This comment has been minimized.

mark-i-m commented Dec 17, 2020

Uh oh!

petrochenkov commented Dec 17, 2020

Uh oh!

mark-i-m commented Dec 18, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

petrochenkov commented Dec 18, 2020

Uh oh!

mark-i-m commented Dec 18, 2020

Uh oh!

mark-i-m commented Dec 18, 2020

Uh oh!

petrochenkov commented Dec 19, 2020

Uh oh!

bors commented Dec 19, 2020

Uh oh!

This comment has been minimized.

bors commented Dec 19, 2020

Uh oh!

rust-log-analyzer commented Dec 19, 2020

Uh oh!

bors commented Dec 19, 2020

Uh oh!

mark-i-m commented Dec 19, 2020

Uh oh!

petrochenkov commented Dec 19, 2020

Uh oh!

bors commented Dec 20, 2020

Uh oh!

bors commented Dec 20, 2020

Uh oh!

Mark-Simulacrum commented Dec 24, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mark-i-m commented Dec 24, 2020

Uh oh!

Mark-Simulacrum commented Dec 24, 2020

Uh oh!

mark-i-m commented Jan 1, 2021

Uh oh!

Uh oh!

mark-i-m commented Dec 18, 2020 •

edited

Loading

Mark-Simulacrum commented Dec 24, 2020 •

edited

Loading