Implement MIR lowering for or-patterns by matthewjasper · Pull Request #67668 · rust-lang/rust

matthewjasper · 2019-12-27T20:57:30Z

This is the last thing needed to get meaningful run-pass tests for or-patterns. There probably need to be more tests before stabilizing this, but the most important cases should have been covered.

Note: we can generate exponentially large MIR CFGs when using or-patterns containing bindings, type ascriptions, or that are for a match arm with a guard. src/test/mir-opt/exponential-or.rs shows the best case for what we currently do.

cc #54883
closes#60350
closes#67514

cc @Centril
r? @pnkfelix

matthewjasper · 2019-12-28T17:17:52Z

@bors try @rust-timer queue

rust-timer · 2019-12-28T17:17:53Z

Awaiting bors try build completion

bors · 2019-12-28T17:18:03Z

⌛ Trying commit 232d661 with merge 844409e...

@Centril

Implement MIR lowering for or-patterns This is the last thing needed to get meaningful run-pass tests for or-patterns. There probably need to be more tests before stabilizing this, but the most important cases should have been covered. Note: we can generate exponentially large MIR CFGs when using or-patterns containing bindings, type ascriptions, or that are for a match arm with a guard. `src/test/mir-opt/exponential-or.rs` shows the best case for what we currently do. cc #54883closes#60350closes#67514 cc @Centril r? @pnkfelix

bors · 2019-12-28T20:03:23Z

☀️ Try build successful - checks-azure
Build commit: 844409e (844409ebe6232d7e9a5a32387b23564bc48ab7f9)

rust-timer · 2019-12-28T20:03:25Z

Queued 844409e with parent 2ee25da, future comparison URL.

Centril · 2019-12-28T22:05:49Z

 let x = Ok(3);
 let Ok(y) | Err(y) = x;
 //~^ ERROR or-pattern is not allowed in a `const`
+ //~| ERROR constant contains unimplemented expression type


What is going on here? cc @ecstatic-morse @oli-obk

We're generating actual branches in the MIR now, which const qualif is erroring for.

What surprised me though was that we've added support for control flow to const qualif, so I didn't expect this specific error here. Should we open an issue to follow up?

You're right, this is from the ProjectionElem::Downcast. Changing from y to _ avoids the extra errors.

matthewjasper · 2019-12-29T09:42:19Z

Perf is done and looks good.

Centril

Just some nits.

nagisa · 2020-01-06T01:26:50Z

This is weird and mind-bending, but correct once you bang your head against the wall enough trying to comprehend what's going on.
impure guard code is yucky.

Its possible the test would be a little less mind-bending if it also included this variant on search (play):
fnsearch_old_style(target:(bool,bool,bool)) -> u32{let x = ((false,true),(false,true),(false,true));letmut guard_count = 0;match x {// ((a, _) | (_, a), (b @ _, _) | (_, b @ _), (c @ false, _) | (_, c @ true)) |((a, _),(b @ _, _),(c @ false, _)) | ((a, _),(b @ _, _),(_, c @ true)) | ((a, _),(_, b @ _),(c @ false, _)) | ((a, _),(_, b @ _),(_, c @ true)) | ((_, a),(b @ _, _),(c @ false, _)) | ((_, a),(b @ _, _),(_, c @ true)) | ((_, a),(_, b @ _),(c @ false, _)) | ((_, a),(_, b @ _),(_, c @ true))if{ guard_count += 1;(a, b, c) == target } => { guard_count } _ => unreachable!(),}}
this is of course just the original OR-patterns now expanded into the old syntax. Seeing that made me immediately understand what was going on in the test.
Now, whether this language feature (mixing multi-pattern arms and guards) is an anti-pattern in disguise is another matter entirely ...
(I'll admit that when I initially read examples like these, I wrongly assume that we commit to the pattern, check the guard, and when the guard fails, move on to the next arm. That is of course not what happens, which is probably for the best, but it definitely can make impure guards very confusing.)

nagisa

Looked through the tests and they all seem reasonable. Perhaps would want a run-pass test that also checks the sugared matches (if-let, while-let, for etc).

bors · 2020-02-03T15:56:56Z

📌 Commit a781aed402778bbbed9494261a71b28f4544b611 has been approved by pnkfelix

bors · 2020-02-03T16:25:59Z

⌛ Testing commit a781aed402778bbbed9494261a71b28f4544b611 with merge d8001e113550e7254016c3ee22dbd06e2cb7d781...

rust-highfive · 2020-02-03T17:54:43Z

The job i686-gnu-nopt of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2020-02-03T17:50:09.8978571Z test [ui] ui/optimization-fuel-1.rs ... ok
2020-02-03T17:50:09.9959214Z test [ui] ui/option-ext.rs ... ok
2020-02-03T17:50:10.0755133Z test [ui] ui/or-patterns/already-bound-name.rs ... ok
2020-02-03T17:50:10.1050753Z test [ui] ui/option-unwrap.rs ... ok
2020-02-03T17:50:10.2522256Z test [ui] ui/or-patterns/basic-switch.rs ... ok
2020-02-03T17:50:10.3023647Z test [ui] ui/or-patterns/basic-switchint.rs ... ok
2020-02-03T17:50:10.4182009Z test [ui] ui/or-patterns/bindings-runpass-1.rs ... ok
2020-02-03T17:50:10.4701702Z test [ui] ui/or-patterns/consistent-bindings.rs ... ok
2020-02-03T17:50:10.4721831Z test [ui] ui/or-patterns/bindings-runpass-2.rs ... ok
2020-02-03T17:50:10.5236341Z test [ui] ui/or-patterns/exhaustiveness-non-exhaustive.rs ... ok
2020-02-03T17:50:10.5798582Z test [ui] ui/or-patterns/feature-gate-const-fn.rs ... ok
2020-02-03T17:50:10.5819152Z test [ui] ui/or-patterns/exhaustiveness-unreachable-pattern.rs ... ok
2020-02-03T17:50:10.6168266Z test [ui] ui/or-patterns/feature-gate-or_patterns-leading-for.rs ... ok
---
2020-02-03T17:50:11.3436105Z test [ui] ui/or-patterns/or-pattern-mismatch.rs ... ok
2020-02-03T17:50:11.3824195Z test [ui] ui/or-patterns/or-patterns-syntactic-pass.rs ... ok
2020-02-03T17:50:11.4370475Z test [ui] ui/or-patterns/or-patterns-syntactic-fail.rs ... ok
2020-02-03T17:50:11.4812754Z test [ui] ui/or-patterns/remove-leading-vert.rs ... ok
2020-02-03T17:50:11.6629475Z test [ui] ui/or-patterns/struct-like.rs ... ok
2020-02-03T17:50:11.6854264Z test [ui] ui/or-patterns/search-via-bindings.rs ... ok
2020-02-03T17:50:11.7231910Z test [ui] ui/order-dependent-cast-inference.rs ... ok
2020-02-03T17:50:11.7594346Z test [ui] ui/osx-frameworks.rs ... ok
2020-02-03T17:50:11.7979439Z test [ui] ui/orphan-check-diagnostics.rs ... ok
2020-02-03T17:50:11.8491660Z test [ui] ui/out-of-order-shadowing.rs ... ok
---
2020-02-03T17:53:54.5199048Z test [mir-opt] mir-opt/while-storage.rs ... ok
2020-02-03T17:53:54.5199594Z 2020-02-03T17:53:54.5199795Z failures:
2020-02-03T17:53:54.5210006Z 2020-02-03T17:53:54.5210811Z ---- [mir-opt] mir-opt/exponential-or.rs stdout ----
2020-02-03T17:53:54.5211041Z [ERROR compiletest::runtest] Some("bb0: {")
2020-02-03T17:53:54.5211446Z thread '[mir-opt] mir-opt/exponential-or.rs' panicked at 'Did not find expected line, error: Mismatch in lines
2020-02-03T17:53:54.5211686Z Current block: bb0: {
2020-02-03T17:53:54.5212032Z Actual Line: " switchInt((_1.0: u32)) -> [1u32: bb3, 4u32: bb3, otherwise: bb2];"
2020-02-03T17:53:54.5212506Z Expected Line: " switchInt((_1.0: u32)) -> [1u32: bb2, 4u32: bb2, otherwise: bb1];"
2020-02-03T17:53:54.5212954Z Test Name: rustc.match_tuple.SimplifyCfg-initial.after.mir
2020-02-03T17:53:54.5213368Z ... (elided)
2020-02-03T17:53:54.5213436Z scope 1 {
2020-02-03T17:53:54.5213624Z debug y => _7;
2020-02-03T17:53:54.5213822Z debug z => _8;
2020-02-03T17:53:54.5213822Z debug z => _8;
2020-02-03T17:53:54.5213917Z }
2020-02-03T17:53:54.5213996Z bb0: {
2020-02-03T17:53:54.5214168Z FakeRead(ForMatchedPlace, _1);
2020-02-03T17:53:54.5214665Z switchInt((_1.0: u32)) -> [1u32: bb2, 4u32: bb2, otherwise: bb1];
2020-02-03T17:53:54.5214945Z bb1: {
2020-02-03T17:53:54.5215081Z _0 = const 0u32;
2020-02-03T17:53:54.5215329Z goto -> bb10;
2020-02-03T17:53:54.5215413Z }
2020-02-03T17:53:54.5215413Z }
2020-02-03T17:53:54.5215475Z bb2: {
2020-02-03T17:53:54.5215690Z _2 = discriminant((_1.2: std::option::Option<i32>));
2020-02-03T17:53:54.5216109Z switchInt(move _2) -> [0isize: bb4, 1isize: bb3, otherwise: bb1];
2020-02-03T17:53:54.5216513Z bb3: {
2020-02-03T17:53:54.5216513Z bb3: {
2020-02-03T17:53:54.5216901Z switchInt((((_1.2: std::option::Option<i32>) as Some).0: i32)) -> [1i32: bb4, 8i32: bb4, otherwise: bb1];
2020-02-03T17:53:54.5217227Z bb4: {
2020-02-03T17:53:54.5217227Z bb4: {
2020-02-03T17:53:54.5217339Z _5 = Le(const 6u32, (_1.3: u32));
2020-02-03T17:53:54.5217630Z switchInt(move _5) -> [false: bb6, otherwise: bb5];
2020-02-03T17:53:54.5217784Z bb5: {
2020-02-03T17:53:54.5217784Z bb5: {
2020-02-03T17:53:54.5218152Z _6 = Le((_1.3: u32), const 9u32);
2020-02-03T17:53:54.5218512Z switchInt(move _6) -> [false: bb6, otherwise: bb8];
2020-02-03T17:53:54.5218673Z bb6: {
2020-02-03T17:53:54.5218673Z bb6: {
2020-02-03T17:53:54.5218879Z _3 = Le(const 13u32, (_1.3: u32));
2020-02-03T17:53:54.5219288Z switchInt(move _3) -> [false: bb1, otherwise: bb7];
2020-02-03T17:53:54.5219691Z bb7: {
2020-02-03T17:53:54.5219691Z bb7: {
2020-02-03T17:53:54.5219801Z _4 = Le((_1.3: u32), const 16u32);
2020-02-03T17:53:54.5220317Z switchInt(move _4) -> [false: bb1, otherwise: bb8];
2020-02-03T17:53:54.5220717Z bb8: {
2020-02-03T17:53:54.5220717Z bb8: {
2020-02-03T17:53:54.5221015Z falseEdges -> [real: bb9, imaginary: bb1];
2020-02-03T17:53:54.5221286Z bb9: {
2020-02-03T17:53:54.5221457Z StorageLive(_7);
2020-02-03T17:53:54.5221457Z StorageLive(_7);
2020-02-03T17:53:54.5221553Z _7 = (_1.0: u32);
2020-02-03T17:53:54.5221643Z StorageLive(_8);
2020-02-03T17:53:54.5221832Z _8 = (_1.3: u32);
2020-02-03T17:53:54.5222068Z StorageLive(_9);
2020-02-03T17:53:54.5222178Z _9 = _7;
2020-02-03T17:53:54.5222270Z StorageLive(_10);
2020-02-03T17:53:54.5222358Z StorageLive(_11);
2020-02-03T17:53:54.5222531Z _11 = _8;
2020-02-03T17:53:54.5222721Z _10 = Mul(const 2u32, move _11);
2020-02-03T17:53:54.5222815Z StorageDead(_11);
2020-02-03T17:53:54.5222994Z _0 = Add(move _9, move _10);
2020-02-03T17:53:54.5223186Z StorageDead(_10);
2020-02-03T17:53:54.5223287Z StorageDead(_9);
2020-02-03T17:53:54.5223376Z StorageDead(_8);
2020-02-03T17:53:54.5223454Z StorageDead(_7);
2020-02-03T17:53:54.5223717Z goto -> bb10;
2020-02-03T17:53:54.5224076Z bb10: {
2020-02-03T17:53:54.5224185Z return;
2020-02-03T17:53:54.5224253Z }
2020-02-03T17:53:54.5224431Z Actual:
2020-02-03T17:53:54.5224431Z Actual:
2020-02-03T17:53:54.5224917Z fn match_tuple(_1: (u32, bool, std::option::Option<i32>, u32)) -> u32 {
2020-02-03T17:53:54.5225281Z let mut _0: u32;
2020-02-03T17:53:54.5225380Z let mut _2: isize;
2020-02-03T17:53:54.5225573Z let mut _3: bool;
2020-02-03T17:53:54.5225751Z let mut _4: bool;
2020-02-03T17:53:54.5225751Z let mut _4: bool;
2020-02-03T17:53:54.5225840Z let mut _5: bool;
2020-02-03T17:53:54.5226013Z let mut _6: bool;
2020-02-03T17:53:54.5226138Z let _7: u32;
2020-02-03T17:53:54.5226207Z let _8: u32;
2020-02-03T17:53:54.5226398Z let mut _9: u32;
2020-02-03T17:53:54.5226625Z let mut _10: u32;
2020-02-03T17:53:54.5226719Z let mut _11: u32;
2020-02-03T17:53:54.5226807Z let mut _12: (u32, bool);
2020-02-03T17:53:54.5226998Z let mut _13: (u32, bool);
2020-02-03T17:53:54.5227302Z debug y => _7;
2020-02-03T17:53:54.5227414Z debug z => _8;
2020-02-03T17:53:54.5227521Z }
2020-02-03T17:53:54.5227586Z bb0: {
2020-02-03T17:53:54.5227586Z bb0: {
2020-02-03T17:53:54.5228180Z FakeRead(ForMatchedPlace, _1);
2020-02-03T17:53:54.5228654Z switchInt((_1.0: u32)) -> [1u32: bb3, 4u32: bb3, otherwise: bb2];
2020-02-03T17:53:54.5228866Z }
2020-02-03T17:53:54.5228991Z bb1 (cleanup): {
2020-02-03T17:53:54.5229084Z resume;
2020-02-03T17:53:54.5229445Z bb2: {
2020-02-03T17:53:54.5229553Z _0 = const 0u32;
2020-02-03T17:53:54.5229830Z goto -> bb13;
2020-02-03T17:53:54.5230026Z }
2020-02-03T17:53:54.5230026Z }
2020-02-03T17:53:54.5230238Z bb3: {
2020-02-03T17:53:54.5230356Z _2 = discriminant((_1.2: std::option::Option<i32>));
2020-02-03T17:53:54.5230717Z switchInt(move _2) -> [0isize: bb5, 1isize: bb4, otherwise: bb2];
2020-02-03T17:53:54.5231101Z bb4: {
2020-02-03T17:53:54.5231101Z bb4: {
2020-02-03T17:53:54.5231485Z switchInt((((_1.2: std::option::Option<i32>) as Some).0: i32)) -> [1i32: bb5, 8i32: bb5, otherwise: bb2];
2020-02-03T17:53:54.5231679Z bb5: {
2020-02-03T17:53:54.5231679Z bb5: {
2020-02-03T17:53:54.5231867Z _5 = Le(const 6u32, (_1.3: u32));
2020-02-03T17:53:54.5232224Z switchInt(move _5) -> [false: bb7, otherwise: bb6];
2020-02-03T17:53:54.5232620Z bb6: {
2020-02-03T17:53:54.5232620Z bb6: {
2020-02-03T17:53:54.5232769Z _6 = Le((_1.3: u32), const 9u32);
2020-02-03T17:53:54.5233207Z switchInt(move _6) -> [false: bb7, otherwise: bb9];
2020-02-03T17:53:54.5233542Z bb7: {
2020-02-03T17:53:54.5233542Z bb7: {
2020-02-03T17:53:54.5233650Z _3 = Le(const 13u32, (_1.3: u32));
2020-02-03T17:53:54.5234057Z switchInt(move _3) -> [false: bb2, otherwise: bb8];
2020-02-03T17:53:54.5234541Z bb8: {
2020-02-03T17:53:54.5234541Z bb8: {
2020-02-03T17:53:54.5234795Z _4 = Le((_1.3: u32), const 16u32);
2020-02-03T17:53:54.5235224Z switchInt(move _4) -> [false: bb2, otherwise: bb9];
2020-02-03T17:53:54.5235596Z bb9: {
2020-02-03T17:53:54.5235596Z bb9: {
2020-02-03T17:53:54.5235874Z falseEdges -> [real: bb10, imaginary: bb2];
2020-02-03T17:53:54.5236213Z bb10: {
2020-02-03T17:53:54.5236282Z StorageLive(_7);
2020-02-03T17:53:54.5236282Z StorageLive(_7);
2020-02-03T17:53:54.5236474Z _7 = (_1.0: u32);
2020-02-03T17:53:54.5236703Z StorageLive(_8);
2020-02-03T17:53:54.5236903Z _8 = (_1.3: u32);
2020-02-03T17:53:54.5237036Z StorageLive(_9);
2020-02-03T17:53:54.5237151Z _9 = _7;
2020-02-03T17:53:54.5237240Z StorageLive(_10);
2020-02-03T17:53:54.5237418Z StorageLive(_11);
2020-02-03T17:53:54.5237683Z _11 = _8;
2020-02-03T17:53:54.5237785Z _12 = CheckedMul(const 2u32, move _11);
2020-02-03T17:53:54.5238268Z assert(!move (_12.1: bool), "attempt to multiply with overflow") -> [success: bb11, unwind: bb1];
2020-02-03T17:53:54.5238616Z bb11: {
2020-02-03T17:53:54.5238616Z bb11: {
2020-02-03T17:53:54.5238701Z _10 = move (_12.0: u32);
2020-02-03T17:53:54.5238877Z StorageDead(_11);
2020-02-03T17:53:54.5239084Z _13 = CheckedAdd(move _9, move _10);
2020-02-03T17:53:54.5239433Z assert(!move (_13.1: bool), "attempt to add with overflow") -> [success: bb12, unwind: bb1];
2020-02-03T17:53:54.5239851Z bb12: {
2020-02-03T17:53:54.5239851Z bb12: {
2020-02-03T17:53:54.5239947Z _0 = move (_13.0: u32);
2020-02-03T17:53:54.5240038Z StorageDead(_10);
2020-02-03T17:53:54.5240215Z StorageDead(_9);
2020-02-03T17:53:54.5240434Z StorageDead(_8);
2020-02-03T17:53:54.5240527Z StorageDead(_7);
2020-02-03T17:53:54.5240817Z goto -> bb13;
2020-02-03T17:53:54.5241122Z bb13: {
2020-02-03T17:53:54.5241230Z return;
2020-02-03T17:53:54.5241299Z }
2020-02-03T17:53:54.5241703Z }', src/tools/compiletest/src/runtest.rs:3121:13
---
2020-02-03T17:53:54.5243080Z test result: FAILED. 81 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out
2020-02-03T17:53:54.5243274Z 2020-02-03T17:53:54.5243391Z 2020-02-03T17:53:54.5243452Z 2020-02-03T17:53:54.5245554Z command did not execute successfully: "/checkout/obj/build/i686-unknown-linux-gnu/stage0-tools-bin/compiletest" "/checkout/obj/build/i686-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/i686-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/i686-unknown-linux-gnu/stage2/lib/rustlib/i686-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/i686-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/mir-opt" "--build-base" "/checkout/obj/build/i686-unknown-linux-gnu/test/mir-opt" "--stage-id" "stage2-i686-unknown-linux-gnu" "--mode" "mir-opt" "--target" "i686-unknown-linux-gnu" "--host" "i686-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/i686-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/i686-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/i686-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "9.0.1-rust-1.42.0-nightly\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2020-02-03T17:53:54.5246390Z 2020-02-03T17:53:54.5251228Z 2020-02-03T17:53:54.5253044Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:348:22
2020-02-03T17:53:54.5257412Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-02-03T17:53:54.5257412Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
2020-02-03T17:53:54.5257528Z Build completed unsuccessfully in 1:22:15
2020-02-03T17:53:54.5311177Z == clock drift check ==
2020-02-03T17:53:54.5331315Z local time: Mon Feb 3 17:53:54 UTC 2020
2020-02-03T17:53:55.0785937Z network time: Mon, 03 Feb 2020 17:53:55 GMT
2020-02-03T17:53:55.0786136Z == end clock drift check ==
2020-02-03T17:53:57.2336728Z 2020-02-03T17:53:57.2420833Z ##[error]Bash exited with code '1'.
2020-02-03T17:53:57.2465016Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-02-03T17:53:57.2466943Z ==============================================================================
2020-02-03T17:53:57.2467049Z Task : Get sources
2020-02-03T17:53:57.2467143Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2020-02-03T17:54:57Z

💔 Test failed - checks-azure

Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Also add some comments

matthewjasper · 2020-02-03T21:29:29Z

@bors r=pnkfelix

bors · 2020-02-03T21:29:30Z

📌 Commit 8dbbe4d has been approved by pnkfelix

Centril · 2020-02-03T21:30:14Z

To ensure this doesn't bitrot, @bors p=1 rollup=never

bors · 2020-02-03T22:02:32Z

⌛ Testing commit 8dbbe4d with merge 42a0bd2...

@Centril

Implement MIR lowering for or-patterns This is the last thing needed to get meaningful run-pass tests for or-patterns. There probably need to be more tests before stabilizing this, but the most important cases should have been covered. Note: we can generate exponentially large MIR CFGs when using or-patterns containing bindings, type ascriptions, or that are for a match arm with a guard. `src/test/mir-opt/exponential-or.rs` shows the best case for what we currently do. cc #54883closes#60350closes#67514 cc @Centril r? @pnkfelix

bors · 2020-02-04T01:23:03Z

☀️ Test successful - checks-azure
Approved by: pnkfelix
Pushing 42a0bd2 to master...

@estebank

or_patterns: add regression test for rust-lang#68785Fixesrust-lang#68785. (Fixed by rust-lang#67668.) cc rust-lang#54883 r? @estebank

matthewjasper added the F-or_patterns `#![feature(or_patterns)]` label Dec 27, 2019

rust-highfive assigned pnkfelix Dec 27, 2019

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

This comment has been minimized.
Sign in to view

matthewjasper force-pushed the or-patterns branch 2 times, most recently from c1309e9 to 232d661Compare December 28, 2019 10:57

varkor reviewed Dec 28, 2019
View reviewed changes

Comment threadsrc/librustc_mir/build/matches/simplify.rs Outdated

Centril reviewed Dec 28, 2019
View reviewed changes

This comment has been minimized.
Sign in to view

matthewjasper force-pushed the or-patterns branch from 4e7127c to ba2a379Compare December 29, 2019 17:54

Centril reviewed Dec 29, 2019
View reviewed changes

Comment threadsrc/librustc_mir/build/matches/mod.rs Outdated
Comment threadsrc/librustc_mir/build/matches/mod.rs Outdated
Comment threadsrc/librustc_mir/build/matches/mod.rs Outdated

matthewjasper force-pushed the or-patterns branch from 99eefa8 to 1aa85f9Compare December 30, 2019 17:55

Centril mentioned this pull request Jan 3, 2020
Fix warning for unused variables in or pattern (issue #67691) #67766
Merged

nagisa reviewed Jan 6, 2020
View reviewed changes

matthewjasper force-pushed the or-patterns branch from 1aa85f9 to 876bc41Compare January 11, 2020 20:31

This comment has been minimized.
Sign in to view

matthewjasper force-pushed the or-patterns branch from 876bc41 to ed49d91Compare January 12, 2020 14:06

This comment has been minimized.
Sign in to view

matthewjasper force-pushed the or-patterns branch from ed49d91 to 19377b9Compare January 12, 2020 19:46

This comment has been minimized.
Sign in to view

matthewjasper force-pushed the or-patterns branch from 19377b9 to 56dc63eCompare January 18, 2020 18:31

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 Feb 3, 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 Feb 3, 2020

matthewjasperand others added 6 commits February 3, 2020 19:42

Add more tests for or-patterns
c7e6f88

Make Candidate private
5f90dbd

Address review comments
89e52e2

Apply suggestions from code review
1d90ed6
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>

Make use of Place: Copy
9b9dafb

Avoid scheduling repeated StorageDeads
8dbbe4d
Also add some comments

matthewjasper force-pushed the or-patterns branch from a781aed to 8dbbe4dCompare February 3, 2020 19:42

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 Feb 3, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 4, 2020

bors merged commit 8dbbe4d into rust-lang:masterFeb 4, 2020

Centril mentioned this pull request Feb 4, 2020
Tracking issue for RFC 2535, 2530, 2175, "Or patterns, i.e Foo(Bar(x) | Baz(x))" #54883
Closed
8 tasks

matthewjasper deleted the or-patterns branch February 4, 2020 06:50

Centril mentioned this pull request Feb 5, 2020
or_patterns: add regression test for #68785 #68842
Merged

Uh oh!

Uh oh!

Conversation

matthewjasper commented Dec 27, 2019

Uh oh!

This comment has been minimized.

matthewjasper commented Dec 28, 2019

Uh oh!

rust-timer commented Dec 28, 2019

Uh oh!

bors commented Dec 28, 2019

Uh oh!

bors commented Dec 28, 2019

Uh oh!

rust-timer commented Dec 28, 2019

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

CentrilDec 28, 2019

Choose a reason for hiding this comment

Uh oh!

matthewjasperDec 28, 2019

Choose a reason for hiding this comment

Uh oh!

CentrilDec 30, 2019

Choose a reason for hiding this comment

Uh oh!

matthewjasperDec 30, 2019

Choose a reason for hiding this comment

Uh oh!

matthewjasper commented Dec 29, 2019

Uh oh!

This comment has been minimized.

Centril left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nagisaJan 6, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pnkfelixJan 22, 2020• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nagisa left a comment

Choose a reason for hiding this comment

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Feb 3, 2020

Uh oh!

bors commented Feb 3, 2020

Uh oh!

rust-highfive commented Feb 3, 2020

Uh oh!

bors commented Feb 3, 2020

Uh oh!

matthewjasper commented Feb 3, 2020

Uh oh!

bors commented Feb 3, 2020

Uh oh!

Centril commented Feb 3, 2020

Uh oh!

bors commented Feb 3, 2020

Uh oh!

bors commented Feb 4, 2020

Uh oh!

nagisaJan 6, 2020•
edited
Loading

pnkfelixJan 22, 2020•
edited
Loading