nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-07 20:43:03 +00:00
Code Issues Packages Projects Releases Wiki 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) Some(ty)
} }
Resolution::LocalBinding(pat) => { Resolution::LocalBinding(pat) => {
let ty = self.type_of_pat.get(pat)?; let ty = self.type_of_pat.get(pat)?.clone();
let ty = self.resolve_ty_as_possible(&mut vec![], ty.clone()); let ty = self.resolve_ty_as_possible(&mut vec![], ty);
Some(ty) Some(ty)
} }
Resolution::GenericParam(..) => { Resolution::GenericParam(..) => {