-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Warnings for issue #32330 #33137
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
bors
merged 4 commits into
rust-lang:master
from
nikomatsakis:issue-32330-lbr-in-return-type-warning-2
May 18, 2016
+760
−233
Merged
Warnings for issue #32330 #33137
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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
66 changes: 66 additions & 0 deletions
66
src/test/compile-fail/associated-types/bound-lifetime-constrained.rs
This file contains hidden or 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,66 @@ | ||
| // Copyright 2012 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. | ||
|
|
||
| // revisions: func object clause | ||
|
|
||
| #![allow(dead_code)] | ||
| #![feature(rustc_attrs)] | ||
| #![feature(unboxed_closures)] | ||
| #![deny(hr_lifetime_in_assoc_type)] | ||
|
|
||
| trait Foo<'a> { | ||
| type Item; | ||
| } | ||
|
|
||
| impl<'a> Foo<'a> for() { | ||
| type Item = (); | ||
| } | ||
|
|
||
| // Check that appearing in a projection input in the argument is not enough: | ||
| #[cfg(func)] | ||
| fn func1(_: for<'a> fn(<() as Foo<'a>>::Item) -> &'a i32) { | ||
| //[func]~^ ERROR return type references lifetime `'a` | ||
| //[func]~| WARNING previously accepted | ||
| } | ||
|
|
||
| // Check that appearing in a projection input in the return still | ||
| // causes an error: | ||
| #[cfg(func)] | ||
| fn func2(_: for<'a> fn() -> <() as Foo<'a>>::Item) { | ||
| //[func]~^ ERROR return type references lifetime `'a` | ||
| //[func]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(object)] | ||
| fn object1(_: Box<for<'a> Fn(<() as Foo<'a>>::Item) -> &'a i32>) { | ||
| //[object]~^ ERROR `Output` references lifetime `'a` | ||
| //[object]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(object)] | ||
| fn object2(_: Box<for<'a> Fn() -> <() as Foo<'a>>::Item>) { | ||
| //[object]~^ ERROR `Output` references lifetime `'a` | ||
| //[object]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(clause)] | ||
| fn clause1<T>() where T: for<'a> Fn(<() as Foo<'a>>::Item) -> &'a i32 { | ||
| //[clause]~^ ERROR `Output` references lifetime `'a` | ||
| //[clause]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(clause)] | ||
| fn clause2<T>() where T: for<'a> Fn() -> <() as Foo<'a>>::Item { | ||
| //[clause]~^ ERROR `Output` references lifetime `'a` | ||
| //[clause]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[rustc_error] | ||
| fn main() { } //[ok]~ ERROR compilation successful |
90 changes: 90 additions & 0 deletions
90
src/test/compile-fail/associated-types/bound-lifetime-in-binding-only.rs
This file contains hidden or 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,90 @@ | ||
| // Copyright 2012 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. | ||
|
|
||
| // revisions: angle paren ok elision | ||
|
|
||
| #![allow(dead_code)] | ||
| #![feature(rustc_attrs)] | ||
| #![feature(unboxed_closures)] | ||
| #![deny(hr_lifetime_in_assoc_type)] | ||
|
|
||
| trait Foo { | ||
| type Item; | ||
| } | ||
|
|
||
| #[cfg(angle)] | ||
| fn angle<T: for<'a> Foo<Item=&'a i32>>() { | ||
| //[angle]~^ ERROR binding for associated type `Item` references lifetime `'a` | ||
| //[angle]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(angle)] | ||
| fn angle1<T>() where T: for<'a> Foo<Item=&'a i32> { | ||
| //[angle]~^ ERROR binding for associated type `Item` references lifetime `'a` | ||
| //[angle]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(angle)] | ||
| fn angle2<T>() where for<'a> T: Foo<Item=&'a i32> { | ||
| //[angle]~^ ERROR binding for associated type `Item` references lifetime `'a` | ||
| //[angle]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(angle)] | ||
| fn angle3(_: &for<'a> Foo<Item=&'a i32>) { | ||
| //[angle]~^ ERROR binding for associated type `Item` references lifetime `'a` | ||
| //[angle]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(paren)] | ||
| fn paren<T: for<'a> Fn() -> &'a i32>() { | ||
| //[paren]~^ ERROR binding for associated type `Output` references lifetime `'a` | ||
| //[paren]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(paren)] | ||
| fn paren1<T>() where T: for<'a> Fn() -> &'a i32 { | ||
| //[paren]~^ ERROR binding for associated type `Output` references lifetime `'a` | ||
| //[paren]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(paren)] | ||
| fn paren2<T>() where for<'a> T: Fn() -> &'a i32 { | ||
| //[paren]~^ ERROR binding for associated type `Output` references lifetime `'a` | ||
| //[paren]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(paren)] | ||
| fn paren3(_: &for<'a> Fn() -> &'a i32) { | ||
| //[paren]~^ ERROR binding for associated type `Output` references lifetime `'a` | ||
| //[paren]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(elision)] | ||
| fn elision<T: Fn() -> &i32>() { | ||
| //[elision]~^ ERROR E0106 | ||
| } | ||
|
|
||
| struct Parameterized<'a> { x: &'a str } | ||
|
|
||
| #[cfg(ok)] | ||
| fn ok1<T: for<'a> Fn(&Parameterized<'a>) -> &'a i32>() { | ||
| } | ||
|
|
||
| #[cfg(ok)] | ||
| fn ok2<T: for<'a,'b> Fn<(&'b Parameterized<'a>,), Output=&'a i32>>() { | ||
| } | ||
|
|
||
| #[cfg(ok)] | ||
| fn ok3<T>() where for<'a> Parameterized<'a>: Foo<Item=&'a i32> { | ||
| } | ||
|
|
||
| #[rustc_error] | ||
| fn main() { } //[ok]~ ERROR compilation successful |
64 changes: 64 additions & 0 deletions
64
src/test/compile-fail/associated-types/bound-lifetime-in-return-only.rs
This file contains hidden or 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,64 @@ | ||
| // Copyright 2012 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. | ||
|
|
||
| // revisions: sig local structure ok elision | ||
|
|
||
| #![allow(dead_code)] | ||
| #![feature(rustc_attrs)] | ||
| #![feature(unboxed_closures)] | ||
| #![deny(hr_lifetime_in_assoc_type)] | ||
|
|
||
| trait Foo { | ||
| type Item; | ||
| } | ||
|
|
||
| #[cfg(sig)] | ||
| fn sig1(_: for<'a> fn() -> &'a i32) { | ||
| //[sig]~^ ERROR return type references lifetime `'a` | ||
| //[sig]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(sig)] | ||
| fn sig2(_: for<'a, 'b> fn(&'b i32) -> &'a i32) { | ||
| //[sig]~^ ERROR return type references lifetime `'a` | ||
| //[sig]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(local)] | ||
| fn local1() { | ||
| let _: for<'a> fn() -> &'a i32 = loop { }; | ||
| //[local]~^ ERROR return type references lifetime `'a` | ||
| //[local]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(structure)] | ||
| struct Struct1 { | ||
| x: for<'a> fn() -> &'a i32 | ||
| //[structure]~^ ERROR return type references lifetime `'a` | ||
| //[structure]~| WARNING previously accepted | ||
| } | ||
|
|
||
| #[cfg(elision)] | ||
| fn elision(_: fn() -> &i32) { | ||
| //[elision]~^ ERROR E0106 | ||
| } | ||
|
|
||
| struct Parameterized<'a> { x: &'a str } | ||
|
|
||
| #[cfg(ok)] | ||
| fn ok1(_: &for<'a> Fn(&Parameterized<'a>) -> &'a i32) { | ||
| } | ||
|
|
||
| #[cfg(ok)] | ||
| fn ok2(_: &for<'a,'b> Fn<(&'b Parameterized<'a>,), Output=&'a i32>) { | ||
| } | ||
|
|
||
| #[rustc_error] | ||
| fn main() { } //[ok]~ ERROR compilation successful |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment might want to live on the public function instead.