Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 66d859e

Browse files
authoredJan 17, 2019
Rollup merge of rust-lang#56479 - mark-i-m:unsat, r=estebank
Better lifetime error message I propose the following error message as more user-friendly r? @nikomatsakis
2 parents c40b977 + 50fad4f commit 66d859e

File tree

52 files changed

+89
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+89
-94
lines changed
 

‎src/librustc_mir/borrow_check/nll/region_infer/error_reporting/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ impl<'tcx> RegionInferenceContext<'tcx> {
505505
) {
506506
let mut diag = infcx.tcx.sess.struct_span_err(
507507
span,
508-
"unsatisfied lifetime constraints", // FIXME
508+
"lifetime may not live long enough"
509509
);
510510

511511
let counter = &mut 1;

‎src/test/ui/nll/closure-requirements/escape-argument-callee.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LL | let mut closure = expect_sig(|p, y| *p = y);
99
for<'r, 's, 't0> extern "rust-call" fn((&ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0:0), 'r)) mut &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0:0), 's)) i32, &ReLateBound(DebruijnIndex(0), BrNamed(crate0:DefIndex(0:0), 't0)) i32))
1010
]
1111

12-
error: unsatisfied lifetime constraints
12+
error: lifetime may not live long enough
1313
--> $DIR/escape-argument-callee.rs:26:45
1414
|
1515
LL | let mut closure = expect_sig(|p, y| *p = y);

0 commit comments

Comments
 (0)
Please sign in to comment.