squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Merge #1121

Browse source 
1121: Avoid two-phase borrow conflict r=matklad a=lnicola

See https://github.com/rust-lang/rust/issues/59159.

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2019-04-08 14:11:48 +00:00
commit 1ca7a744eb
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/ra_hir/src/ty/infer.rs
View file

@ -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(..) => {