Merge #1121

1121: Avoid two-phase borrow conflict r=matklad a=lnicola See rust-lang/rust#59159. Co-authored-by: Laurențiu Nicola <[email protected]>
rust-lang · Apr 8, 2019 · 1ca7a74 · 1ca7a74
2 parents 1e2178e + 61c09ed
commit 1ca7a74
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/crates/ra_hir/src/ty/infer.rs b/crates/ra_hir/src/ty/infer.rs
@@ -489,8 +489,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {
                 Some(ty)
             }
             Resolution::LocalBinding(pat) => {
-                let ty = self.type_of_pat.get(pat)?;
-                let ty = self.resolve_ty_as_possible(&mut vec![], ty.clone());
+                let ty = self.type_of_pat.get(pat)?.clone();
+                let ty = self.resolve_ty_as_possible(&mut vec![], ty);
                 Some(ty)
             }
             Resolution::GenericParam(..) => {