---

yaml
---
r: 82680
b: refs/heads/auto
c: a4b7474
h: refs/heads/master
v: v3

Author: Branimir

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 0f9bcaf7fe0cebf0d1be0e17025c0e3b76e14507
+refs/heads/auto: a4b7474461f5ea96eb895adef7f17a079b42bad5
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libextra/crypto/md5.rs

@@ -156,7 +156,7 @@ static C4: [u32, ..16] = [
 
 
 /// The MD5 Digest algorithm
-pub struct Md5 {
+struct Md5 {
     priv length_bytes: u64,
     priv buffer: FixedBuffer64,
     priv state: Md5State,

branches/auto/src/libextra/crypto/sha2.rs

@@ -230,8 +230,7 @@ impl Engine512 {
 }
 
 
-/// The SHA-512 hash algorithm
-pub struct Sha512 {
+struct Sha512 {
     priv engine: Engine512
 }
 
@@ -283,8 +282,7 @@ static H512: [u64, ..8] = [
 ];
 
 
-/// The SHA-384 hash algorithm
-pub struct Sha384 {
+struct Sha384 {
     priv engine: Engine512
 }
 
@@ -334,8 +332,7 @@ static H384: [u64, ..8] = [
 ];
 
 
-/// The SHA-512 hash algorithm with digest truncated to 256 bits
-pub struct Sha512Trunc256 {
+struct Sha512Trunc256 {
     priv engine: Engine512
 }
 
@@ -383,8 +380,7 @@ static H512_TRUNC_256: [u64, ..8] = [
 ];
 
 
-/// The SHA-512 hash algorithm with digest truncated to 224 bits
-pub struct Sha512Trunc224 {
+struct Sha512Trunc224 {
     priv engine: Engine512
 }
 
@@ -639,8 +635,7 @@ impl Engine256 {
 }
 
 
-/// The SHA-256 hash algorithm
-pub struct Sha256 {
+struct Sha256 {
     priv engine: Engine256
 }
 
@@ -692,8 +687,7 @@ static H256: [u32, ..8] = [
 ];
 
 
-/// The SHA-224 hash algorithm
-pub struct Sha224 {
+struct Sha224 {
     priv engine: Engine256
 }
 

branches/auto/src/librustc/middle/typeck/check/method.rs

@@ -431,10 +431,10 @@ impl<'self> LookupContext<'self> {
 
             Candidate {
                 rcvr_match_condition: RcvrMatchesIfObject(did),
-                rcvr_substs: trait_ref.substs.clone(),
+                rcvr_substs: new_trait_ref.substs.clone(),
                 method_ty: m,
                 origin: method_object(method_object {
-                        trait_id: trait_ref.def_id,
+                        trait_id: new_trait_ref.def_id,
                         object_trait_id: did,
                         method_num: method_num,
                         real_index: vtable_index

branches/auto/src/test/run-pass/issue-9394-inherited-trait-calls.rs

@@ -10,6 +10,10 @@
 
 trait Base: Base2 + Base3{
     fn foo(&self) -> ~str;
+    fn foo1(&self) -> ~str;
+    fn foo2(&self) -> ~str{
+        ~"base foo2"
+    }
 }
 
 trait Base2: Base3{
@@ -30,6 +34,9 @@ impl Base for X {
     fn foo(&self) -> ~str{
         ~"base foo"
     }
+    fn foo1(&self) -> ~str{
+        ~"base foo1"
+    }
 
 }
 
@@ -56,6 +63,8 @@ pub fn main() {
     let s = &n as &Super;
     assert_eq!(s.bar(),~"super bar");
     assert_eq!(s.foo(),~"base foo");
+    assert_eq!(s.foo1(),~"base foo1");
+    assert_eq!(s.foo2(),~"base foo2");
     assert_eq!(s.baz(),~"base2 baz");
     assert_eq!(s.root(),~"base3 root");
 }