forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Suggestion for 'static impl Trait return
When encountering a named or anonymous sup requirement (for example, `&'a self`) and a `'static` impl Trait return type, suggest adding the `'_` lifetime constraing to the return type.
- Loading branch information
Showing
7 changed files
with
175 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
src/librustc/infer/error_reporting/nice_region_error/static_impl_trait.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
//! Error Reporting for static impl Traits. | ||
use infer::error_reporting::nice_region_error::NiceRegionError; | ||
use infer::lexical_region_resolve::RegionResolutionError; | ||
use ty::RegionKind; | ||
use util::common::ErrorReported; | ||
|
||
impl<'a, 'gcx, 'tcx> NiceRegionError<'a, 'gcx, 'tcx> { | ||
/// Print the error message for lifetime errors when the return type is a static impl Trait. | ||
pub(super) fn try_report_static_impl_trait(&self) -> Option<ErrorReported> { | ||
if let Some(ref error) = self.error { | ||
match error.clone() { | ||
RegionResolutionError::SubSupConflict( | ||
var_origin, | ||
sub_origin, | ||
sub_r, | ||
sup_origin, | ||
sup_r, | ||
) => { | ||
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) | ||
{ | ||
let sp = var_origin.span(); | ||
let return_sp = sub_origin.span(); | ||
let mut err = self.tcx.sess.struct_span_err( | ||
sp, | ||
"can't infer an appropriate lifetime", | ||
); | ||
err.span_label(sp, "can't infer an appropriate lifetime"); | ||
err.span_label( | ||
return_sp, | ||
"this return type evaluates to the `'static` lifetime...", | ||
); | ||
err.span_label( | ||
sup_origin.span(), | ||
"...but this borrow...", | ||
); | ||
|
||
let (lifetime, lt_sp_opt) = self.tcx.msg_span_from_free_region(sup_r); | ||
if let Some(lifetime_sp) = lt_sp_opt { | ||
err.span_note( | ||
lifetime_sp, | ||
&format!("...can't outlive {}", lifetime), | ||
); | ||
} | ||
|
||
if let Ok(snippet) = self.tcx.sess.codemap().span_to_snippet(return_sp) { | ||
err.span_suggestion( | ||
return_sp, | ||
&format!( | ||
"you can add a constraint to the return type to make it last \ | ||
less than `'static` and match {}", | ||
lifetime, | ||
), | ||
format!("{} + '_", snippet), | ||
); | ||
} | ||
err.emit(); | ||
return Some(ErrorReported); | ||
} | ||
} | ||
_ => {} | ||
} | ||
} | ||
None | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
struct A { | ||
x: [(u32, u32); 10] | ||
} | ||
|
||
impl A { | ||
fn iter_values_anon(&self) -> impl Iterator<Item=u32> { | ||
self.x.iter().map(|a| a.0) | ||
} | ||
//~^^^ ERROR can't infer an appropriate lifetime | ||
fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> { | ||
self.x.iter().map(|a| a.0) | ||
} | ||
//~^^^ ERROR can't infer an appropriate lifetime | ||
} | ||
|
||
fn main() {} |
44 changes: 44 additions & 0 deletions
44
src/test/ui/impl-trait/static-return-lifetime-infered.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
error: can't infer an appropriate lifetime | ||
--> $DIR/static-return-lifetime-infered.rs:17:16 | ||
| | ||
LL | fn iter_values_anon(&self) -> impl Iterator<Item=u32> { | ||
| ----------------------- this return type evaluates to the `'static` lifetime... | ||
LL | self.x.iter().map(|a| a.0) | ||
| ------ ^^^^ can't infer an appropriate lifetime | ||
| | | ||
| ...but this borrow... | ||
| | ||
note: ...can't outlive the anonymous lifetime #1 defined on the method body at 16:5 | ||
--> $DIR/static-return-lifetime-infered.rs:16:5 | ||
| | ||
LL | / fn iter_values_anon(&self) -> impl Iterator<Item=u32> { | ||
LL | | self.x.iter().map(|a| a.0) | ||
LL | | } | ||
| |_____^ | ||
help: you can add a constraint to the return type to make it last less than `'static` and match the anonymous lifetime #1 defined on the method body at 16:5 | ||
| | ||
LL | fn iter_values_anon(&self) -> impl Iterator<Item=u32> + '_ { | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: can't infer an appropriate lifetime | ||
--> $DIR/static-return-lifetime-infered.rs:21:16 | ||
| | ||
LL | fn iter_values<'a>(&'a self) -> impl Iterator<Item=u32> { | ||
| ----------------------- this return type evaluates to the `'static` lifetime... | ||
LL | self.x.iter().map(|a| a.0) | ||
| ------ ^^^^ can't infer an appropriate lifetime | ||
| | | ||
| ...but this borrow... | ||
| | ||
note: ...can't outlive the lifetime 'a as defined on the method body at 20:5 | ||
--> $DIR/static-return-lifetime-infered.rs:20:5 | ||
| | ||
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> + '_ { | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
||
error: aborting due to 2 previous errors | ||
|