Skip to content

Commit

Permalink
normalize adt fields during structural match check
Browse files Browse the repository at this point in the history
  • Loading branch information
lcnr committed Jun 1, 2020
1 parent 4b1f86a commit 29508ce
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/librustc_trait_selection/traits/structural_match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,11 @@ impl<'a, 'tcx> TypeVisitor<'tcx> for Search<'a, 'tcx> {
// fields of ADT.
let tcx = self.tcx();
for field_ty in adt_def.all_fields().map(|field| field.ty(tcx, substs)) {
if field_ty.visit_with(self) {
assert!(!field_ty.needs_subst());
let ty = self.tcx().normalize_erasing_regions(ty::ParamEnv::reveal_all(), field_ty);
debug!("structural-match ADT: field_ty={:?}, ty={:?}", field_ty, ty);

if ty.visit_with(self) {
// found an ADT without structural-match; halt visiting!
assert!(self.found.is_some());
return true;
Expand Down
23 changes: 23 additions & 0 deletions src/test/ui/match/issue-72896.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
// run-pass
trait EnumSetType {
type Repr;
}

enum Enum8 { }
impl EnumSetType for Enum8 {
type Repr = u8;
}

#[derive(PartialEq, Eq)]
struct EnumSet<T: EnumSetType> {
__enumset_underlying: T::Repr,
}

const CONST_SET: EnumSet<Enum8> = EnumSet { __enumset_underlying: 3 };

fn main() {
match CONST_SET {
CONST_SET => { /* ok */ }
_ => panic!("match fell through?"),
}
}

0 comments on commit 29508ce

Please sign in to comment.