Skip to content

fix for https://github.com/mozilla/rust/issues/9394 #9464

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

Merged
merged 1 commit into from
Sep 26, 2013
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
11 changes: 5 additions & 6 deletions src/librustc/middle/typeck/check/method.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ impl<'self> LookupContext<'self> {
// to a trait and its supertraits.
fn get_method_index(&self,
trait_ref: @TraitRef,
subtrait_id: ast::DefId,
subtrait: @TraitRef,
n_method: uint) -> uint {
let tcx = self.tcx();

Expand All @@ -382,15 +382,14 @@ impl<'self> LookupContext<'self> {
// we find the trait the method came from, counting up the
// methods from them.
let mut method_count = 0;
do ty::each_bound_trait_and_supertraits(tcx, &[trait_ref])
do ty::each_bound_trait_and_supertraits(tcx, &[subtrait])
|bound_ref| {
if bound_ref.def_id == subtrait_id { false }
if bound_ref.def_id == trait_ref.def_id { false }
else {
method_count += ty::trait_methods(tcx, bound_ref.def_id).len();
true
}
};

return method_count + n_method;
}

Expand Down Expand Up @@ -418,9 +417,9 @@ impl<'self> LookupContext<'self> {
let trait_ref = @TraitRef { def_id: did, substs: rcvr_substs.clone() };

do self.push_inherent_candidates_from_bounds_inner(&[trait_ref])
|trait_ref, m, method_num, _bound_num| {
|new_trait_ref, m, method_num, _bound_num| {
let vtable_index =
self.get_method_index(trait_ref, trait_ref.def_id, method_num);
self.get_method_index(new_trait_ref, trait_ref, method_num);
// We need to fix up the transformed self type.
let transformed_self_ty =
self.construct_transformed_self_ty_for_object(
Expand Down
61 changes: 61 additions & 0 deletions src/test/run-pass/issue-9394-inherited-trait-calls.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
// Copyright 2012 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.

trait Base: Base2 + Base3{
fn foo(&self) -> ~str;
}

trait Base2: Base3{
fn baz(&self) -> ~str;
}

trait Base3{
fn root(&self) -> ~str;
}

trait Super: Base{
fn bar(&self) -> ~str;
}

struct X;

impl Base for X {
fn foo(&self) -> ~str{
~"base foo"
}

}

impl Base2 for X {
fn baz(&self) -> ~str{
~"base2 baz"
}
}

impl Base3 for X {
fn root(&self) -> ~str{
~"base3 root"
}
}

impl Super for X {
fn bar(&self) -> ~str{
~"super bar"
}
}

pub fn main() {
let n = X;
let s = &n as &Super;
assert_eq!(s.bar(),~"super bar");
assert_eq!(s.foo(),~"base foo");
assert_eq!(s.baz(),~"base2 baz");
assert_eq!(s.root(),~"base3 root");
}