Skip to content

Commit 82f25b3

Browse files
committed
code review fixes
1 parent a851e1e commit 82f25b3

File tree

1 file changed

+26
-29
lines changed

1 file changed

+26
-29
lines changed

src/librustc/infer/error_reporting/named_anon_conflict.rs

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -43,39 +43,36 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
4343
let body_id = self.tcx.hir.maybe_body_owned_by(node_id).unwrap();
4444
let mut is_first = false;
4545
let body = self.tcx.hir.body(body_id);
46-
body.arguments
47-
.iter()
48-
.filter_map(|arg| if let Some(tables) = self.in_progress_tables {
49-
let ty = tables.borrow().node_id_to_type(arg.id);
50-
let mut found_anon_region = false;
51-
let new_arg_ty = self.tcx
52-
.fold_regions(&ty,
53-
&mut false,
54-
|r, _| if *r == *anon_region {
55-
found_anon_region = true;
56-
named_region
57-
} else {
58-
r
59-
});
60-
if found_anon_region {
61-
if body.arguments.iter().nth(0) == Some(&arg) {
62-
is_first = true;
63-
}
64-
return Some((arg,
65-
new_arg_ty,
66-
free_region.bound_region,
67-
is_first));
68-
} else {
69-
None
70-
}
46+
if let Some(tables) = self.in_progress_tables {
47+
body.arguments
48+
.iter()
49+
.filter_map(|arg| {
50+
let ty = tables.borrow().node_id_to_type(arg.id);
51+
let mut found_anon_region = false;
52+
let new_arg_ty = self.tcx
53+
.fold_regions(&ty, &mut false, |r, _| if *r == *anon_region {
54+
found_anon_region = true;
55+
named_region
7156
} else {
72-
None
73-
})
74-
.next()
57+
r
58+
});
59+
if found_anon_region {
60+
if body.arguments.iter().nth(0) == Some(&arg) {
61+
is_first = true;
62+
}
63+
Some((arg, new_arg_ty, free_region.bound_region, is_first))
64+
} else {
65+
None
66+
}
67+
})
68+
.next()
69+
} else {
70+
None
71+
}
7572
}
7673
_ => None,
77-
}
7874

75+
}
7976
}
8077

8178
// This method generates the error message for the case when

0 commit comments

Comments
 (0)