Skip to content

Commit

Permalink
Rollup merge of #111887 - fmease:inh-proj-pp-tests, r=compiler-errors
Browse files Browse the repository at this point in the history
Add regression tests for pretty-printing inherent projections

Tests for #111486.
Fixes #111879.

r? `@matthiaskrgr`
  • Loading branch information
matthiaskrgr committed May 24, 2023
2 parents 8227c4f + 4a63b07 commit d49d347
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 0 deletions.
14 changes: 14 additions & 0 deletions tests/ui/associated-inherent-types/issue-111879-0.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#![feature(inherent_associated_types)]
#![allow(incomplete_features)]

// Check that we don't crash when printing inherent projections in diagnostics.

pub struct Carrier<'a>(&'a ());

pub type User = for<'b> fn(Carrier<'b>::Focus<i32>);

impl<'a> Carrier<'a> {
pub type Focus<T> = &'a mut User; //~ ERROR overflow evaluating associated type
}

fn main() {}
8 changes: 8 additions & 0 deletions tests/ui/associated-inherent-types/issue-111879-0.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
error: overflow evaluating associated type `Carrier<'b>::Focus<i32>`
--> $DIR/issue-111879-0.rs:11:25
|
LL | pub type Focus<T> = &'a mut User;
| ^^^^^^^^^^^^

error: aborting due to previous error

12 changes: 12 additions & 0 deletions tests/ui/associated-inherent-types/issue-111879-1.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#![feature(inherent_associated_types)]
#![allow(incomplete_features)]

// Check that we don't crash when printing inherent projections in diagnostics.

struct Foo<T>(T);

impl<'a> Foo<fn(&'a ())> {
type Assoc = &'a ();
}

fn main(_: for<'a> fn(Foo<fn(&'a ())>::Assoc)) {} //~ ERROR `main` function has wrong type
12 changes: 12 additions & 0 deletions tests/ui/associated-inherent-types/issue-111879-1.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
error[E0580]: `main` function has wrong type
--> $DIR/issue-111879-1.rs:12:1
|
LL | fn main(_: for<'a> fn(Foo<fn(&'a ())>::Assoc)) {}
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ incorrect number of function parameters
|
= note: expected fn pointer `fn()`
found fn pointer `fn(for<'a> fn(Foo<fn(&'a ())>::Assoc))`

error: aborting due to previous error

For more information about this error, try `rustc --explain E0580`.

0 comments on commit d49d347

Please sign in to comment.