Skip to content

Don't perform selection if inherent associated types are not enabled #113286

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
merged 1 commit into from
Jul 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions compiler/rustc_hir_analysis/src/astconv/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1893,6 +1893,15 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
) -> Result<Option<(Ty<'tcx>, DefId)>, ErrorGuaranteed> {
let tcx = self.tcx();

// Don't attempt to look up inherent associated types when the feature is not enabled.
// Theoretically it'd be fine to do so since we feature-gate their definition site.
// However, due to current limitations of the implementation (caused by us performing
// selection in AstConv), IATs can lead to cycle errors (#108491, #110106) which mask the
// feature-gate error, needlessly confusing users that use IATs by accident (#113265).
if !tcx.features().inherent_associated_types {
return Ok(None);
}

let candidates: Vec<_> = tcx
.inherent_impls(adt_did)
.iter()
Expand All @@ -1903,11 +1912,6 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
return Ok(None);
}

if !tcx.features().inherent_associated_types {
tcx.sess
.delay_span_bug(span, "found inherent assoc type without the feature being gated");
}

//
// Select applicable inherent associated type candidates modulo regions.
//
Expand Down
3 changes: 3 additions & 0 deletions tests/ui/associated-inherent-types/assoc-inherent-unstable.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
// aux-crate:aux=assoc-inherent-unstable.rs
// edition: 2021

#![feature(inherent_associated_types)]
#![allow(incomplete_features)]

type Data = aux::Owner::Data; //~ ERROR use of unstable library feature 'data'

fn main() {}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0658]: use of unstable library feature 'data'
--> $DIR/assoc-inherent-unstable.rs:4:13
--> $DIR/assoc-inherent-unstable.rs:7:13
|
LL | type Data = aux::Owner::Data;
| ^^^^^^^^^^^^^^^^
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
// known-bug: #108491

#![feature(inherent_associated_types)]
#![allow(incomplete_features)]
// FIXME(inherent_associated_types): This should pass.

struct Foo {
Expand All @@ -8,3 +10,5 @@ struct Foo {
impl Foo {
pub type Bar = usize;
}

fn main() {}
Original file line number Diff line number Diff line change
@@ -1,49 +1,43 @@
error[E0601]: `main` function not found in crate `cycle_iat_inside_of_adt`
--> $DIR/cycle-iat-inside-of-adt.rs:10:2
|
LL | }
| ^ consider adding a `main` function to `$DIR/cycle-iat-inside-of-adt.rs`

error[E0391]: cycle detected when computing predicates of `Foo`
--> $DIR/cycle-iat-inside-of-adt.rs:5:1
--> $DIR/cycle-iat-inside-of-adt.rs:7:1
|
LL | struct Foo {
| ^^^^^^^^^^
|
note: ...which requires computing predicates of `Foo`...
--> $DIR/cycle-iat-inside-of-adt.rs:5:1
--> $DIR/cycle-iat-inside-of-adt.rs:7:1
|
LL | struct Foo {
| ^^^^^^^^^^
note: ...which requires computing inferred outlives predicates of `Foo`...
--> $DIR/cycle-iat-inside-of-adt.rs:5:1
--> $DIR/cycle-iat-inside-of-adt.rs:7:1
|
LL | struct Foo {
| ^^^^^^^^^^
= note: ...which requires computing the inferred outlives predicates for items in this crate...
note: ...which requires computing type of `Foo::bar`...
--> $DIR/cycle-iat-inside-of-adt.rs:6:5
--> $DIR/cycle-iat-inside-of-adt.rs:8:5
|
LL | bar: Self::Bar,
| ^^^^^^^^^^^^^^
note: ...which requires computing normalized predicates of `Foo`...
--> $DIR/cycle-iat-inside-of-adt.rs:5:1
--> $DIR/cycle-iat-inside-of-adt.rs:7:1
|
LL | struct Foo {
| ^^^^^^^^^^
= note: ...which again requires computing predicates of `Foo`, completing the cycle
note: cycle used when collecting item types in top-level module
--> $DIR/cycle-iat-inside-of-adt.rs:5:1
|
LL | / struct Foo {
LL | | bar: Self::Bar,
LL | | }
LL | | impl Foo {
LL | | pub type Bar = usize;
LL | | }
| |_^
--> $DIR/cycle-iat-inside-of-adt.rs:3:1
|
LL | / #![feature(inherent_associated_types)]
LL | | #![allow(incomplete_features)]
LL | | // FIXME(inherent_associated_types): This should pass.
LL | |
... |
LL | |
LL | | fn main() {}
| |____________^

error: aborting due to 2 previous errors
error: aborting due to previous error

Some errors have detailed explanations: E0391, E0601.
For more information about an error, try `rustc --explain E0391`.
For more information about this error, try `rustc --explain E0391`.
17 changes: 17 additions & 0 deletions tests/ui/associated-inherent-types/dont-select-if-disabled.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Regression test for #113265.

// Don't perform selection if the feature is not enabled to prevent cycle errors
// that exist due to current limitations of the implementation from masking the
// feature-gate error. See the aforementioned issue.
// This does lead to rustc not mentioning inherent associated types at usage-sites of
// IATs that were defined in an external crate but that's acceptable for now.

// FIXME(inherent_associated_types): Revisit this decision once the implementation is smarter.

// The following program would currently lead to a cycle if IATs were enabled.

struct S(S::P); //~ ERROR ambiguous associated type

impl S { type P = (); } //~ ERROR inherent associated types are unstable

fn main() {}
24 changes: 24 additions & 0 deletions tests/ui/associated-inherent-types/dont-select-if-disabled.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
error[E0223]: ambiguous associated type
--> $DIR/dont-select-if-disabled.rs:13:10
|
LL | struct S(S::P);
| ^^^^
|
help: if there were a trait named `Example` with associated type `P` implemented for `S`, you could use the fully-qualified path
|
LL | struct S(<S as Example>::P);
| ~~~~~~~~~~~~~~~~~

error[E0658]: inherent associated types are unstable
--> $DIR/dont-select-if-disabled.rs:15:10
|
LL | impl S { type P = (); }
| ^^^^^^^^^^^^
|
= note: see issue #8995 <https://github.com/rust-lang/rust/issues/8995> for more information
= help: add `#![feature(inherent_associated_types)]` to the crate attributes to enable

error: aborting due to 2 previous errors

Some errors have detailed explanations: E0223, E0658.
For more information about an error, try `rustc --explain E0223`.
10 changes: 8 additions & 2 deletions tests/ui/associated-inherent-types/issue-109071.no_gate.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ LL | type Item = &[T];
= note: see issue #8995 <https://github.com/rust-lang/rust/issues/8995> for more information
= help: add `#![feature(inherent_associated_types)]` to the crate attributes to enable

error: aborting due to 3 previous errors
error[E0223]: ambiguous associated type
--> $DIR/issue-109071.rs:15:22
|
LL | fn T() -> Option<Self::Item> {}
| ^^^^^^^^^^ help: use the fully-qualified path: `<Windows<T> as IntoIterator>::Item`

error: aborting due to 4 previous errors

Some errors have detailed explanations: E0107, E0637, E0658.
Some errors have detailed explanations: E0107, E0223, E0637, E0658.
For more information about an error, try `rustc --explain E0107`.
1 change: 1 addition & 0 deletions tests/ui/associated-inherent-types/issue-109071.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ impl<T> Windows { //~ ERROR: missing generics for struct `Windows`

impl<T> Windows<T> {
fn T() -> Option<Self::Item> {}
//[no_gate]~^ ERROR: ambiguous associated type
}

fn main() {}
30 changes: 15 additions & 15 deletions tests/ui/resolve/resolve-self-in-impl.stderr
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
error: `Self` is not valid in the self type of an impl block
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason my change leads to a reordering of diagnostics. Shouldn't matter too much.

--> $DIR/resolve-self-in-impl.rs:16:6
--> $DIR/resolve-self-in-impl.rs:14:13
|
LL | impl Self {}
| ^^^^
LL | impl Tr for Self {}
| ^^^^
|
= note: replace `Self` with a different type

error: `Self` is not valid in the self type of an impl block
--> $DIR/resolve-self-in-impl.rs:17:8
--> $DIR/resolve-self-in-impl.rs:15:15
|
LL | impl S<Self> {}
| ^^^^
LL | impl Tr for S<Self> {}
| ^^^^
|
= note: replace `Self` with a different type

error: `Self` is not valid in the self type of an impl block
--> $DIR/resolve-self-in-impl.rs:18:7
--> $DIR/resolve-self-in-impl.rs:16:6
|
LL | impl (Self, Self) {}
| ^^^^ ^^^^
LL | impl Self {}
| ^^^^
|
= note: replace `Self` with a different type

error: `Self` is not valid in the self type of an impl block
--> $DIR/resolve-self-in-impl.rs:14:13
--> $DIR/resolve-self-in-impl.rs:17:8
|
LL | impl Tr for Self {}
| ^^^^
LL | impl S<Self> {}
| ^^^^
|
= note: replace `Self` with a different type

error: `Self` is not valid in the self type of an impl block
--> $DIR/resolve-self-in-impl.rs:15:15
--> $DIR/resolve-self-in-impl.rs:18:7
|
LL | impl Tr for S<Self> {}
| ^^^^
LL | impl (Self, Self) {}
| ^^^^ ^^^^
|
= note: replace `Self` with a different type

Expand Down