bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #92112 - SparrowLii:issue92010, r=cjgillot

Browse source 
Fix the error of checking `base_expr` twice in type_changing_struct_update

Fixes #92010
This commit is contained in:
Matthias Krüger 2021-12-27 21:42:25 +01:00 • committed by GitHub
commit bd77fbfef1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_typeck/src/check/expr.rs
View file

@ -1508,7 +1508,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
} else {
self.check_expr_has_type_or_error(base_expr, adt_ty, |_| {
let base_ty = self.check_expr(base_expr);
let base_ty = self.typeck_results.borrow().node_type(base_expr.hir_id);
let same_adt = match (adt_ty.kind(), base_ty.kind()) {
(ty::Adt(adt, _), ty::Adt(base_adt, _)) if adt == base_adt => true,
_ => false,