Skip to content

Commit

Permalink
Properly deal with missing/placeholder types inside GACs
Browse files Browse the repository at this point in the history
  • Loading branch information
fmease committed May 23, 2024
1 parent 791adf7 commit 24afa42
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 4 deletions.
13 changes: 9 additions & 4 deletions compiler/rustc_hir_typeck/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,11 +235,16 @@ fn infer_type_if_missing<'tcx>(fcx: &FnCtxt<'_, 'tcx>, node: Node<'tcx>) -> Opti
if let Some(item) = tcx.opt_associated_item(def_id.into())
&& let ty::AssocKind::Const = item.kind
&& let ty::ImplContainer = item.container
&& let Some(trait_item) = item.trait_item_def_id
&& let Some(trait_item_def_id) = item.trait_item_def_id
{
let args =
tcx.impl_trait_ref(item.container_id(tcx)).unwrap().instantiate_identity().args;
Some(tcx.type_of(trait_item).instantiate(tcx, args))
let impl_def_id = item.container_id(tcx);
let impl_trait_ref = tcx.impl_trait_ref(impl_def_id).unwrap().instantiate_identity();
let args = ty::GenericArgs::identity_for_item(tcx, def_id).rebase_onto(
tcx,
impl_def_id,
impl_trait_ref.args,
);
Some(tcx.type_of(trait_item_def_id).instantiate(tcx, args))
} else {
Some(fcx.next_ty_var(span))
}
Expand Down
17 changes: 17 additions & 0 deletions tests/ui/generic-const-items/assoc-const-missing-type.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Ensure that we properly deal with missing/placeholder types inside GACs.
// issue: rust-lang/rust#124833
#![feature(generic_const_items)]
#![allow(incomplete_features)]

trait Trait {
const K<T>: T;
}

impl Trait for () {
const K<T> = ();
//~^ ERROR missing type for `const` item
//~| ERROR mismatched types
//~| ERROR mismatched types
}

fn main() {}
32 changes: 32 additions & 0 deletions tests/ui/generic-const-items/assoc-const-missing-type.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
error[E0308]: mismatched types
--> $DIR/assoc-const-missing-type.rs:11:18
|
LL | const K<T> = ();
| - ^^ expected type parameter `T`, found `()`
| |
| expected this type parameter
|
= note: expected type parameter `T`
found unit type `()`

error: missing type for `const` item
--> $DIR/assoc-const-missing-type.rs:11:15
|
LL | const K<T> = ();
| ^ help: provide a type for the associated constant: `()`

error[E0308]: mismatched types
--> $DIR/assoc-const-missing-type.rs:11:18
|
LL | const K<T> = ();
| - ^^ expected type parameter `T`, found `()`
| |
| expected this type parameter
|
= note: expected type parameter `T`
found unit type `()`
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`

error: aborting due to 3 previous errors

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

0 comments on commit 24afa42

Please sign in to comment.