user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use lifetime name if available

Browse source
This commit is contained in:
Esteban Küber 2018-06-20 15:38:07 -07:00
parent aaf78a5265
commit 612657d9f0
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs
View file

@ -12,7 +12,7 @@
use infer::error_reporting::nice_region_error::NiceRegionError;
use infer::lexical_region_resolve::RegionResolutionError;
use ty::RegionKind;
use ty::{BoundRegion, FreeRegion, RegionKind};
use util::common::ErrorReported;
impl<'a, 'gcx, 'tcx> NiceRegionError<'a, 'gcx, 'tcx> {
@ -29,7 +29,7 @@ impl<'a, 'gcx, 'tcx> NiceRegionError<'a, 'gcx, 'tcx> {
) => {
let anon_reg_sup = self.is_suitable_region(sup_r)?;
if sub_r == &RegionKind::ReStatic &&
self._is_return_type_impl_trait(anon_reg_sup.def_id)
self.is_return_type_impl_trait(anon_reg_sup.def_id)
{
let sp = var_origin.span();
let return_sp = sub_origin.span();
@ -54,6 +54,12 @@ impl<'a, 'gcx, 'tcx> NiceRegionError<'a, 'gcx, 'tcx> {
);
}
let lifetime_name = match sup_r {
RegionKind::ReFree(FreeRegion {
bound_region: BoundRegion::BrNamed(_, ref name), ..
}) => format!("{}", name),
_ => "'_".to_owned(),
};
if let Ok(snippet) = self.tcx.sess.codemap().span_to_snippet(return_sp) {
err.span_suggestion(
return_sp,
@ -62,7 +68,7 @@ impl<'a, 'gcx, 'tcx> NiceRegionError<'a, 'gcx, 'tcx> {
less than `'static` and match {}",
lifetime,
),
format!("{} + '_", snippet),
format!("{} + {}", snippet, lifetime_name),
);
}
err.emit();

2
src/librustc/infer/error_reporting/nice_region_error/util.rs
View file

@ -168,7 +168,7 @@ impl<'a, 'gcx, 'tcx> NiceRegionError<'a, 'gcx, 'tcx> {
None
}
pub(super) fn _is_return_type_impl_trait(
pub(super) fn is_return_type_impl_trait(
&self,
scope_def_id: DefId,
) -> bool {

2
src/test/ui/impl-trait/static-return-lifetime-infered.stderr
View file

@ -37,7 +37,7 @@ LL | fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
help: you can add a constraint to the return type to make it last less than `'static` and match the lifetime 'a as defined on the method body at 20:5
|
LL | fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> + '_ {
LL | fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> + 'a {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: aborting due to 2 previous errors