From 1c1e760cfd2ea8d423a58ed96b1f4b04f7cbcc76 Mon Sep 17 00:00:00 2001 From: Wang Xuerui Date: Sat, 7 May 2016 15:00:49 +0800 Subject: [PATCH 1/2] trans: callee: normalize trait_ref before use Fixes #33436 and #33461. Test case is from #33461. --- src/librustc_trans/callee.rs | 1 + src/test/run-pass/issue-33461.rs | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 src/test/run-pass/issue-33461.rs diff --git a/src/librustc_trans/callee.rs b/src/librustc_trans/callee.rs index 5a4a5022dfc54..f86dd2d281b4f 100644 --- a/src/librustc_trans/callee.rs +++ b/src/librustc_trans/callee.rs @@ -156,6 +156,7 @@ impl<'tcx> Callee<'tcx> { 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 0000000000000..ac7f7ff422985 --- /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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use std::marker::PhantomData; + +struct TheType { + t: PhantomData +} + +pub trait TheTrait { + type TheAssociatedType; +} + +impl TheTrait for () { + type TheAssociatedType = (); +} + +pub trait Shape { + fn doit(&self) { + } +} + +impl Shape

for TheType { +} + +fn main() { + let ball = TheType { t: PhantomData }; + let handle: &Shape<()> = &ball; +} From 680c6c45aee0482a7786cb459b896e1785d84d28 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Wed, 18 May 2016 09:32:03 -0700 Subject: [PATCH 2/2] Bump beta version to 3 --- mk/main.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/main.mk b/mk/main.mk index 204de6067c452..fc537d3b7da46 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.9.0 # 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