-
Notifications
You must be signed in to change notification settings - Fork 12.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #110982 - cjgillot:elided-self-const, r=petrochenkov
Do not recurse into const generic args when resolving self lifetime elision. Fixes #110899 r? `@petrochenkov`
- Loading branch information
Showing
3 changed files
with
55 additions
and
0 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
// Regression test for #110899. | ||
// When looking for the elided lifetime for `wrap`, | ||
// we must not consider the lifetimes in `bar` as candidates. | ||
|
||
fn wrap(self: Wrap<{ fn bar(&self) {} }>) -> &() { | ||
//~^ ERROR `self` parameter is only allowed in associated functions | ||
//~| ERROR `self` parameter is only allowed in associated functions | ||
//~| ERROR missing lifetime specifier | ||
//~| ERROR cannot find type `Wrap` in this scope | ||
&() | ||
} | ||
|
||
fn main() {} |
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,38 @@ | ||
error: `self` parameter is only allowed in associated functions | ||
--> $DIR/nested-item.rs:5:9 | ||
| | ||
LL | fn wrap(self: Wrap<{ fn bar(&self) {} }>) -> &() { | ||
| ^^^^ not semantically valid as function parameter | ||
| | ||
= note: associated functions are those in `impl` or `trait` definitions | ||
|
||
error: `self` parameter is only allowed in associated functions | ||
--> $DIR/nested-item.rs:5:29 | ||
| | ||
LL | fn wrap(self: Wrap<{ fn bar(&self) {} }>) -> &() { | ||
| ^^^^^ not semantically valid as function parameter | ||
| | ||
= note: associated functions are those in `impl` or `trait` definitions | ||
|
||
error[E0106]: missing lifetime specifier | ||
--> $DIR/nested-item.rs:5:46 | ||
| | ||
LL | fn wrap(self: Wrap<{ fn bar(&self) {} }>) -> &() { | ||
| ^ expected named lifetime parameter | ||
| | ||
= help: this function's return type contains a borrowed value, but there is no value for it to be borrowed from | ||
help: consider using the `'static` lifetime | ||
| | ||
LL | fn wrap(self: Wrap<{ fn bar(&self) {} }>) -> &'static () { | ||
| +++++++ | ||
|
||
error[E0412]: cannot find type `Wrap` in this scope | ||
--> $DIR/nested-item.rs:5:15 | ||
| | ||
LL | fn wrap(self: Wrap<{ fn bar(&self) {} }>) -> &() { | ||
| ^^^^ not found in this scope | ||
|
||
error: aborting due to 4 previous errors | ||
|
||
Some errors have detailed explanations: E0106, E0412. | ||
For more information about an error, try `rustc --explain E0106`. |