Merge pull request #33719 from alexcrichton/beta-next
Backport #33478 to beta, bump version
diff --git a/mk/main.mk b/mk/main.mk
index 204de60..fc537d3 100644
--- a/mk/main.mk
+++ b/mk/main.mk
@@ -18,7 +18,7 @@
# An optional number to put after the label, e.g. '.2' -> '-beta.2'
# NB Make sure it starts with a dot to conform to semver pre-release
# versions (section 9)
-CFG_PRERELEASE_VERSION=.2
+CFG_PRERELEASE_VERSION=.3
# Append a version-dependent hash to each library, so we can install different
# versions in the same place
diff --git a/src/librustc_trans/callee.rs b/src/librustc_trans/callee.rs
index 5a4a502..f86dd2d 100644
--- a/src/librustc_trans/callee.rs
+++ b/src/librustc_trans/callee.rs
@@ -156,6 +156,7 @@
let method_item = tcx.impl_or_trait_item(def_id);
let trait_id = method_item.container().id();
let trait_ref = ty::Binder(substs.to_trait_ref(tcx, trait_id));
+ let trait_ref = infer::normalize_associated_type(tcx, &trait_ref);
match common::fulfill_obligation(ccx, DUMMY_SP, trait_ref) {
traits::VtableImpl(vtable_impl) => {
let impl_did = vtable_impl.impl_def_id;
diff --git a/src/test/run-pass/issue-33461.rs b/src/test/run-pass/issue-33461.rs
new file mode 100644
index 0000000..ac7f7ff
--- /dev/null
+++ b/src/test/run-pass/issue-33461.rs
@@ -0,0 +1,36 @@
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use std::marker::PhantomData;
+
+struct TheType<T> {
+ t: PhantomData<T>
+}
+
+pub trait TheTrait {
+ type TheAssociatedType;
+}
+
+impl TheTrait for () {
+ type TheAssociatedType = ();
+}
+
+pub trait Shape<P: TheTrait> {
+ fn doit(&self) {
+ }
+}
+
+impl<P: TheTrait> Shape<P> for TheType<P::TheAssociatedType> {
+}
+
+fn main() {
+ let ball = TheType { t: PhantomData };
+ let handle: &Shape<()> = &ball;
+}
