Skip to content

Commit

Permalink
Fallback to 'has type' error messages rather than 'lifetime appears i…
Browse files Browse the repository at this point in the history
…n type'.
  • Loading branch information
davidtwco committed Aug 6, 2018
1 parent 5187ad1 commit 12037ff
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 26 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -208,17 +208,14 @@ impl<'tcx> RegionInferenceContext<'tcx> {
return Some(region_name);
}

let (_argument_name, argument_span) = self.get_argument_name_and_span_for_region(
mir, argument_index);

let region_name = self.synthesize_region_name(counter);

diag.span_label(
argument_span,
format!("lifetime `{}` appears in this argument", region_name,),
);

Some(region_name)
self.give_name_if_we_cannot_match_hir_ty(
infcx,
mir,
fr,
arg_ty,
counter,
diag,
)
}

fn give_name_if_we_can_match_hir_ty_from_argument(
Expand Down Expand Up @@ -336,14 +333,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {

search_stack.push((argument_ty, argument_hir_ty));

let mut closest_match: &hir::Ty = argument_hir_ty;

while let Some((ty, hir_ty)) = search_stack.pop() {
// While we search, also track the closet match.
if tcx.any_free_region_meets(&ty, |r| r.to_region_vid() == needle_fr) {
closest_match = hir_ty;
}

match (&ty.sty, &hir_ty.node) {
// Check if the `argument_ty` is `&'X ..` where `'X`
// is the region we are looking for -- if so, and we have a `&T`
Expand Down Expand Up @@ -418,13 +408,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
}
}

let region_name = self.synthesize_region_name(counter);
diag.span_label(
closest_match.span,
format!("lifetime `{}` appears in this type", region_name),
);

return Some(region_name);
return None;
}

/// We've found an enum/struct/union type with the substitutions
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/nll/issue-52742.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ error: unsatisfied lifetime constraints
LL | fn take_bar(&mut self, b: Bar<'_>) {
| --------- -- let's call this `'1`
| |
| lifetime `'2` appears in this type
| has type `&mut Foo<'_, '2>`
LL | self.y = b.z
| ^^^^^^^^^^^^ requires that `'1` must outlive `'2`

Expand Down

0 comments on commit 12037ff

Please sign in to comment.