Skip to content
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

Enforce well formedness for type alias impl trait's hidden type #95519

Merged
merged 2 commits into from
Apr 8, 2022
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
2 changes: 1 addition & 1 deletion compiler/rustc_data_structures/src/vec_map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ impl<'a, K, V> IntoIterator for &'a VecMap<K, V> {
}
}

impl<'a, K, V> IntoIterator for &'a mut VecMap<K, V> {
impl<'a, K: 'a, V: 'a> IntoIterator for &'a mut VecMap<K, V> {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The reason this is required is that associated type alias impl trait does not imply bounds from the type that the impl is for.

Copy link
Contributor

Choose a reason for hiding this comment

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

Should we be concerned for breakage and get a lang team signoff?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, this is just a nightly feature. We can add more implicit magic later

Copy link
Member

Choose a reason for hiding this comment

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

yeah, i think this is something we can fix later

type Item = (&'a K, &'a mut V);
type IntoIter = impl Iterator<Item = Self::Item>;

Expand Down
10 changes: 9 additions & 1 deletion compiler/rustc_typeck/src/check/check.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ use rustc_hir::lang_items::LangItem;
use rustc_hir::{def::Res, ItemKind, Node, PathSegment};
use rustc_infer::infer::type_variable::{TypeVariableOrigin, TypeVariableOriginKind};
use rustc_infer::infer::{RegionVariableOrigin, TyCtxtInferExt};
use rustc_infer::traits::Obligation;
use rustc_middle::hir::nested_filter;
use rustc_middle::ty::fold::TypeFoldable;
use rustc_middle::ty::layout::{LayoutError, MAX_SIMD_LANES};
use rustc_middle::ty::subst::GenericArgKind;
use rustc_middle::ty::util::{Discr, IntTypeExt};
use rustc_middle::ty::{self, ParamEnv, Ty, TyCtxt};
use rustc_middle::ty::{self, ParamEnv, ToPredicate, Ty, TyCtxt};
use rustc_session::lint::builtin::{UNINHABITED_STATIC, UNSUPPORTED_CALLING_CONVENTIONS};
use rustc_span::symbol::sym;
use rustc_span::{self, MultiSpan, Span};
Expand Down Expand Up @@ -674,6 +675,13 @@ fn check_opaque_meets_bounds<'tcx>(
}
}

// Additionally require the hidden type to be well-formed with only the generics of the opaque type.
// Defining use functions may have more bounds than the opaque type, which is ok, as long as the
// hidden type is well formed even without those bounds.
let predicate =
ty::Binder::dummy(ty::PredicateKind::WellFormed(hidden_type.into())).to_predicate(tcx);
inh.register_predicate(Obligation::new(misc_cause, param_env, predicate));

// Check that all obligations are satisfied by the implementation's
// version.
let errors = inh.fulfillment_cx.borrow_mut().select_all_or_error(&infcx);
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_typeck/src/check/regionck.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {

/// Region checking during the WF phase for items. `wf_tys` are the
/// types from which we should derive implied bounds, if any.
#[instrument(level = "debug", skip(self))]
pub fn regionck_item(&self, item_id: hir::HirId, span: Span, wf_tys: FxHashSet<Ty<'tcx>>) {
debug!("regionck_item(item.id={:?}, wf_tys={:?})", item_id, wf_tys);
let subject = self.tcx.hir().local_def_id(item_id);
let mut rcx = RegionCtxt::new(self, item_id, Subject(subject), self.param_env);
rcx.outlives_environment.add_implied_bounds(self, wf_tys, item_id, span);
Expand Down
28 changes: 28 additions & 0 deletions src/test/ui/type-alias-impl-trait/underconstrained_generic.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#![feature(type_alias_impl_trait)]

use std::marker::PhantomData;

trait Trait {
fn foo<T, U>(t: T) -> U;
}

trait ProofForConversion<X> {
fn convert<T, U>(_: PhantomData<Self>, r: T) -> U;
}

impl<X: Trait> ProofForConversion<X> for () {
fn convert<T, U>(_: PhantomData<Self>, r: T) -> U {
X::foo(r)
}
}

type Converter<T> = impl ProofForConversion<T>;
//~^ ERROR the trait bound `T: Trait` is not satisfied

fn _defining_use<T: Trait>() -> Converter<T> {
()
}


fn main() {
}
19 changes: 19 additions & 0 deletions src/test/ui/type-alias-impl-trait/underconstrained_generic.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
error[E0277]: the trait bound `T: Trait` is not satisfied
--> $DIR/underconstrained_generic.rs:19:21
|
LL | type Converter<T> = impl ProofForConversion<T>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Trait` is not implemented for `T`
|
note: required because of the requirements on the impl of `ProofForConversion<T>` for `()`
--> $DIR/underconstrained_generic.rs:13:16
|
LL | impl<X: Trait> ProofForConversion<X> for () {
| ^^^^^^^^^^^^^^^^^^^^^ ^^
help: consider restricting type parameter `T`
|
LL | type Converter<T: Trait> = impl ProofForConversion<T>;
| +++++++

error: aborting due to previous error

For more information about this error, try `rustc --explain E0277`.
34 changes: 34 additions & 0 deletions src/test/ui/type-alias-impl-trait/underconstrained_lifetime.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#![feature(type_alias_impl_trait)]

use std::marker::PhantomData;

trait ProofForConversion<'a, 'b> {
fn convert<T: ?Sized>(_: PhantomData<Self>, r: &'a T) -> &'b T;
}

impl<'a, 'b> ProofForConversion<'a, 'b> for &'b &'a () {
fn convert<T: ?Sized>(_: PhantomData<Self>, r: &'a T) -> &'b T {
r
}
}

type Converter<'a, 'b> = impl ProofForConversion<'a, 'b>;
//~^ ERROR reference has a longer lifetime than the data it references

// Even _defining_use with an explicit `'a: 'b` compiles fine, too.
fn _defining_use<'a, 'b>(x: &'b &'a ()) -> Converter<'a, 'b> {
x
}

fn extend_lifetime<'a, 'b, T: ?Sized>(x: &'a T) -> &'b T {
Converter::<'a, 'b>::convert(PhantomData, x)
}

fn main() {
let d;
{
let x = "Hello World".to_string();
d = extend_lifetime(&x);
}
println!("{}", d);
}
20 changes: 20 additions & 0 deletions src/test/ui/type-alias-impl-trait/underconstrained_lifetime.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
error[E0491]: in type `&'b &'a ()`, reference has a longer lifetime than the data it references
--> $DIR/underconstrained_lifetime.rs:15:26
|
LL | type Converter<'a, 'b> = impl ProofForConversion<'a, 'b>;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
note: the pointer is valid for the lifetime `'b` as defined here
--> $DIR/underconstrained_lifetime.rs:15:20
|
LL | type Converter<'a, 'b> = impl ProofForConversion<'a, 'b>;
| ^^
note: but the referenced data is only valid for the lifetime `'a` as defined here
--> $DIR/underconstrained_lifetime.rs:15:16
|
LL | type Converter<'a, 'b> = impl ProofForConversion<'a, 'b>;
| ^^

error: aborting due to previous error

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