Merge #1121

bors[bot] · lnicola · bors[bot] · commit 1ca7a744eb51 · 2019-04-08T14:11:48.000Z
1121: Avoid two-phase borrow conflict r=matklad a=lnicola See rust-lang/rust#59159. Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
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(..) => {

Original file line number	Diff line number	Diff line change
`@@ -489,8 +489,8 @@ impl<'a, D: HirDatabase> InferenceContext<'a, D> {`
`489`	`489`	`Some(ty)`
`490`	`490`	`}`
`491`	`491`	`Resolution::LocalBinding(pat) => {`
`492`		`- let ty = self.type_of_pat.get(pat)?;`
`493`		`- let ty = self.resolve_ty_as_possible(&mut vec![], ty.clone());`
	`492`	`+ let ty = self.type_of_pat.get(pat)?.clone();`
	`493`	`+ let ty = self.resolve_ty_as_possible(&mut vec![], ty);`
`494`	`494`	`Some(ty)`
`495`	`495`	`}`
`496`	`496`	`Resolution::GenericParam(..) => {`