Skip to content

Commit

Permalink
Rollup merge of rust-lang#65753 - csmoe:derive_fold, r=Centril
Browse files Browse the repository at this point in the history
Don't assert for different instance on impl trait alias

Closes rust-lang#65679
r? @Centril @nikomatsakis
  • Loading branch information
Centril authored Oct 24, 2019
2 parents 1e4a2ee + 184a61f commit 1b03671
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
3 changes: 1 addition & 2 deletions src/librustc_typeck/check/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2767,8 +2767,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {

let mut opaque_types = self.opaque_types.borrow_mut();
for (ty, decl) in opaque_type_map {
let old_value = opaque_types.insert(ty, decl);
assert!(old_value.is_none(), "instantiated twice: {:?}/{:?}", ty, decl);
let _ = opaque_types.insert(ty, decl);
}

value
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// check-pass

#![feature(type_alias_impl_trait)]

type T = impl Sized;
// The concrete type referred by impl-trait-type-alias(`T`) is guaranteed
// to be the same as where it occurs, whereas `impl Trait`'s instance is location sensitive;
// so difference assertion should not be declared on impl-trait-type-alias's instances.
// for details, check RFC-2515:
// https://github.com/rust-lang/rfcs/blob/master/text/2515-type_alias_impl_trait.md

fn take(_: fn() -> T) {}

fn main() {
take(|| {});
take(|| {});
}

0 comments on commit 1b03671

Please sign in to comment.