Skip to content

Add test for checking duplicated branch or-patterns #75580

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Sep 19, 2020

Conversation

JulianKnodt
Copy link
Contributor

This adds a regression test for checking or-patterns in MIR as shown in #75439.
This doesn't introduce a fix as I'm not sure where it would go(I suspect maybe here: src/librustc_mir_build/build/matches/mod.rs), and I'm not particularly able to fix it.

cc: @lzutao

@rust-highfive
Copy link
Contributor

r? @nikomatsakis

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 16, 2020
@Dylan-DPC-zz
Copy link

r? @wesleywiser

@wesleywiser
Copy link
Member

Thanks! Having this will be helpful when that issue is resolved so we can see the diff.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 3, 2020

📌 Commit 204fa8fb136da9d21481731fbf3875ef22d661d8 has been approved by wesleywiser

@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 Sep 3, 2020
@tesuji
Copy link
Contributor

tesuji commented Sep 3, 2020

This might need a rebase because of other MIR comment changes.

@JulianKnodt JulianKnodt force-pushed the or_pattern branch 2 times, most recently from 709a6ed to c6ab3ff Compare September 3, 2020 18:47
@wesleywiser
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 3, 2020

📌 Commit c6ab3ff has been approved by wesleywiser

matklad added a commit to matklad/rust that referenced this pull request Sep 4, 2020
Add test for checking duplicated branch or-patterns

This adds a regression test for checking `or-patterns` in MIR as shown in rust-lang#75439.
This doesn't introduce a fix as I'm not sure where it would go(I suspect maybe here: src/librustc_mir_build/build/matches/mod.rs), and I'm not particularly able to fix it.

cc: @lzutao
matklad added a commit to matklad/rust that referenced this pull request Sep 4, 2020
Add test for checking duplicated branch or-patterns

This adds a regression test for checking `or-patterns` in MIR as shown in rust-lang#75439.
This doesn't introduce a fix as I'm not sure where it would go(I suspect maybe here: src/librustc_mir_build/build/matches/mod.rs), and I'm not particularly able to fix it.

cc: @lzutao
matklad added a commit to matklad/rust that referenced this pull request Sep 4, 2020
Add test for checking duplicated branch or-patterns

This adds a regression test for checking `or-patterns` in MIR as shown in rust-lang#75439.
This doesn't introduce a fix as I'm not sure where it would go(I suspect maybe here: src/librustc_mir_build/build/matches/mod.rs), and I'm not particularly able to fix it.

cc: @lzutao
matklad added a commit to matklad/rust that referenced this pull request Sep 4, 2020
Add test for checking duplicated branch or-patterns

This adds a regression test for checking `or-patterns` in MIR as shown in rust-lang#75439.
This doesn't introduce a fix as I'm not sure where it would go(I suspect maybe here: src/librustc_mir_build/build/matches/mod.rs), and I'm not particularly able to fix it.

cc: @lzutao
@matklad
Copy link
Member

matklad commented Sep 4, 2020

Failed rollup, needs still more rebase

@wesleywiser
Copy link
Member

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Sep 16, 2020

📌 Commit 6cb6716 has been approved by wesleywiser

RalfJung added a commit to RalfJung/rust that referenced this pull request Sep 19, 2020
Add test for checking duplicated branch or-patterns

This adds a regression test for checking `or-patterns` in MIR as shown in rust-lang#75439.
This doesn't introduce a fix as I'm not sure where it would go(I suspect maybe here: src/librustc_mir_build/build/matches/mod.rs), and I'm not particularly able to fix it.

cc: @lzutao
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 19, 2020
Rollup of 14 pull requests

Successful merges:

 - rust-lang#73963 (deny(unsafe_op_in_unsafe_fn) in libstd/path.rs)
 - rust-lang#75099 (lint/ty: move fns to avoid abstraction violation)
 - rust-lang#75502 (Use implicit (not explicit) rules for promotability by default in `const fn`)
 - rust-lang#75580 (Add test for checking duplicated branch or-patterns)
 - rust-lang#76310 (Add `[T; N]: TryFrom<Vec<T>>` (insta-stable))
 - rust-lang#76400 (Clean up vec benches bench_in_place style)
 - rust-lang#76434 (do not inline black_box when building for Miri)
 - rust-lang#76492 (Add associated constant `BITS` to all integer types)
 - rust-lang#76525 (Add as_str() to string::Drain.)
 - rust-lang#76636 (assert ScalarMaybeUninit size)
 - rust-lang#76749 (give *even better* suggestion when matching a const range)
 - rust-lang#76757 (don't convert types to the same type with try_into (clippy::useless_conversion))
 - rust-lang#76796 (Give a better error message when x.py uses the wrong stage for CI)
 - rust-lang#76798 (Build fixes for RISC-V 32-bit Linux support)

Failed merges:

r? `@ghost`
@bors bors merged commit 3ebba83 into rust-lang:master Sep 19, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 19, 2020
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Feb 28, 2025
…DianQK

Add FileCheck annotations to mir-opt/issues

This resolves a part of rust-lang#116971 .

The directory `tests/mir-opt/issues` has only one test issue_75439.rs which should add FileCheck annotations.

Originally it was introduced in rust-lang#75580 to confirm that there were duplicated basic blocks against or-patterns, but in rust-lang#123067 the duplication was resolved. So FileCheck should ensure that there is no such duplication any more.
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Feb 28, 2025
…DianQK

Add FileCheck annotations to mir-opt/issues

This resolves a part of rust-lang#116971 .

The directory `tests/mir-opt/issues` has only one test issue_75439.rs which should add FileCheck annotations.

Originally it was introduced in rust-lang#75580 to confirm that there were duplicated basic blocks against or-patterns, but in rust-lang#123067 the duplication was resolved. So FileCheck should ensure that there is no such duplication any more.
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Feb 28, 2025
…DianQK

Add FileCheck annotations to mir-opt/issues

This resolves a part of rust-lang#116971 .

The directory `tests/mir-opt/issues` has only one test issue_75439.rs which should add FileCheck annotations.

Originally it was introduced in rust-lang#75580 to confirm that there were duplicated basic blocks against or-patterns, but in rust-lang#123067 the duplication was resolved. So FileCheck should ensure that there is no such duplication any more.
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 1, 2025
Rollup merge of rust-lang#134943 - Shunpoco:116971-mir-opt-issues, r=DianQK

Add FileCheck annotations to mir-opt/issues

This resolves a part of rust-lang#116971 .

The directory `tests/mir-opt/issues` has only one test issue_75439.rs which should add FileCheck annotations.

Originally it was introduced in rust-lang#75580 to confirm that there were duplicated basic blocks against or-patterns, but in rust-lang#123067 the duplication was resolved. So FileCheck should ensure that there is no such duplication any more.
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants