forked from rust-lang/rust
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
in which the elided-lifetimes-in-paths lint undergoes a revolution
The existing elided-lifetimes-in-paths lint (introduced in Nov. 2017's accd997 / rust-lang#46254) lacked stuctured suggestions and—much more alarmingly—produced false positives on associated functions (like `Ref::clone`) and on anonymous '_ lifetimes (!!—yes, the very anonymous lifetimes that we meant to suggest "instead"). That this went apparently unnoticed for so long maybe tells you something about how many people actually bother to flip on allow-by-default lints. After many hours of good old-fashioned American elbow grease—and a little help from expert reviewers—it turns out that getting the right answer is a lot easier if we fire the lint while lowering the Higher Intermediate Representation. The lint is promoted to the idioms-2018 group. Also, in the matter of test filenames, "elided" only has one 'l' (see, e.g., https://en.wiktionary.org/wiki/elide). Resolves rust-lang#52041.
- Loading branch information
1 parent
d3b3bc5
commit 41d5c0c
Showing
9 changed files
with
324 additions
and
53 deletions.
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
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,97 @@ | ||
| // 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. | ||
|
|
||
| // run-rustfix | ||
| // compile-flags: --edition 2018 | ||
|
|
||
| #![allow(unused)] | ||
| #![deny(elided_lifetimes_in_paths)] | ||
| //~^ NOTE lint level defined here | ||
|
|
||
| use std::cell::{RefCell, Ref}; | ||
|
|
||
|
|
||
| struct Foo<'a> { x: &'a u32 } | ||
|
|
||
| fn foo(x: &Foo<'_>) { | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| } | ||
|
|
||
| fn bar(x: &Foo<'_>) {} | ||
|
|
||
|
|
||
| struct Wrapped<'a>(&'a str); | ||
|
|
||
| struct WrappedWithBow<'a> { | ||
| gift: &'a str | ||
| } | ||
|
|
||
| struct MatchedSet<'a, 'b> { | ||
| one: &'a str, | ||
| another: &'b str, | ||
| } | ||
|
|
||
| fn wrap_gift(gift: &str) -> Wrapped<'_> { | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| Wrapped(gift) | ||
| } | ||
|
|
||
| fn wrap_gift_with_bow(gift: &str) -> WrappedWithBow<'_> { | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| WrappedWithBow { gift } | ||
| } | ||
|
|
||
| fn inspect_matched_set(set: MatchedSet<'_, '_>) { | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| println!("{} {}", set.one, set.another); | ||
| } | ||
|
|
||
| macro_rules! autowrapper { | ||
| ($type_name:ident, $fn_name:ident, $lt:lifetime) => { | ||
| struct $type_name<$lt> { | ||
| gift: &$lt str | ||
| } | ||
|
|
||
| fn $fn_name(gift: &str) -> $type_name<'_> { | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| $type_name { gift } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| autowrapper!(Autowrapped, autowrap_gift, 'a); | ||
| //~^ NOTE in this expansion of autowrapper! | ||
| //~| NOTE in this expansion of autowrapper! | ||
|
|
||
| macro_rules! anytuple_ref_ty { | ||
| ($($types:ty),*) => { | ||
| Ref<'_, ($($types),*)> | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| } | ||
| } | ||
|
|
||
| fn main() { | ||
| let honesty = RefCell::new((4, 'e')); | ||
| let loyalty: Ref<'_, (u32, char)> = honesty.borrow(); | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| let generosity = Ref::map(loyalty, |t| &t.0); | ||
|
|
||
| let laughter = RefCell::new((true, "magic")); | ||
| let yellow: anytuple_ref_ty!(bool, &str) = laughter.borrow(); | ||
| //~^ NOTE in this expansion of anytuple_ref_ty! | ||
| //~| NOTE in this expansion of anytuple_ref_ty! | ||
| } |
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,97 @@ | ||
| // 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. | ||
|
|
||
| // run-rustfix | ||
| // compile-flags: --edition 2018 | ||
|
|
||
| #![allow(unused)] | ||
| #![deny(elided_lifetimes_in_paths)] | ||
| //~^ NOTE lint level defined here | ||
|
|
||
| use std::cell::{RefCell, Ref}; | ||
|
|
||
|
|
||
| struct Foo<'a> { x: &'a u32 } | ||
|
|
||
| fn foo(x: &Foo) { | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| } | ||
|
|
||
| fn bar(x: &Foo<'_>) {} | ||
|
|
||
|
|
||
| struct Wrapped<'a>(&'a str); | ||
|
|
||
| struct WrappedWithBow<'a> { | ||
| gift: &'a str | ||
| } | ||
|
|
||
| struct MatchedSet<'a, 'b> { | ||
| one: &'a str, | ||
| another: &'b str, | ||
| } | ||
|
|
||
| fn wrap_gift(gift: &str) -> Wrapped { | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| Wrapped(gift) | ||
| } | ||
|
|
||
| fn wrap_gift_with_bow(gift: &str) -> WrappedWithBow { | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| WrappedWithBow { gift } | ||
| } | ||
|
|
||
| fn inspect_matched_set(set: MatchedSet) { | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| println!("{} {}", set.one, set.another); | ||
| } | ||
|
|
||
| macro_rules! autowrapper { | ||
| ($type_name:ident, $fn_name:ident, $lt:lifetime) => { | ||
| struct $type_name<$lt> { | ||
| gift: &$lt str | ||
| } | ||
|
|
||
| fn $fn_name(gift: &str) -> $type_name { | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| $type_name { gift } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| autowrapper!(Autowrapped, autowrap_gift, 'a); | ||
| //~^ NOTE in this expansion of autowrapper! | ||
| //~| NOTE in this expansion of autowrapper! | ||
|
|
||
| macro_rules! anytuple_ref_ty { | ||
| ($($types:ty),*) => { | ||
| Ref<($($types),*)> | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| } | ||
| } | ||
|
|
||
| fn main() { | ||
| let honesty = RefCell::new((4, 'e')); | ||
| let loyalty: Ref<(u32, char)> = honesty.borrow(); | ||
| //~^ ERROR hidden lifetime parameters in types are deprecated | ||
| //~| HELP indicate the anonymous lifetime | ||
| let generosity = Ref::map(loyalty, |t| &t.0); | ||
|
|
||
| let laughter = RefCell::new((true, "magic")); | ||
| let yellow: anytuple_ref_ty!(bool, &str) = laughter.borrow(); | ||
| //~^ NOTE in this expansion of anytuple_ref_ty! | ||
| //~| NOTE in this expansion of anytuple_ref_ty! | ||
| } |
Oops, something went wrong.