bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix #72680 by explicitly checking for or-pattern before test

Browse source
This commit is contained in:
mark 2020-11-07 15:22:52 -06:00
parent b2d115f6db
commit 459dae94a1
2 changed files with 75 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_mir_build/src/build/matches/test.rs
View file

@ -671,6 +671,16 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
(&TestKind::Range { .. }, _) => None,
(&TestKind::Eq { .. } | &TestKind::Len { .. }, _) => {
// We do call `test()` below to see what kind of test `match_pair` would require.
// If it is the same test as `test`, then we can just use `test`.
//
// However, `test()` assumes that there won't be any or-patterns, so we need to
// specially handle that here and return `None` (since the `test` clearly doesn't
// apply to an or-pattern).
if let PatKind::Or { .. } = &*match_pair.pattern.kind {
return None;
}
// These are all binary tests.
//
// FIXME(#29623) we can be more clever here