---

yaml
---
r: 35499
b: refs/heads/master
c: 7ca9436
h: refs/heads/master
i:
  35497: b77ed30
  35495: 17d6b3b
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: e71ec06118fee49a86063c5eb7386f1000f56237
+refs/heads/master: 7ca94369dad596421276c26ab98bdaa7bb1787cf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/librustc/metadata/encoder.rs

@@ -768,6 +768,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: writer::Serializer,
         for traits.each |associated_trait| {
            encode_trait_ref(ebml_w, ecx, *associated_trait)
         }
+
         ebml_w.end_tag();
 
         // Now, output all of the static methods as items.  Note that for the
@@ -789,7 +790,9 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: writer::Serializer,
             let polyty = ecx.tcx.tcache.get(local_def(ty_m.id));
             encode_ty_type_param_bounds(ebml_w, ecx, polyty.bounds);
             encode_type(ecx, ebml_w, polyty.ty);
-            encode_path(ecx, ebml_w, path, ast_map::path_name(ty_m.ident));
+            let m_path = vec::append_one(path,
+                                         ast_map::path_name(item.ident));
+            encode_path(ecx, ebml_w, m_path, ast_map::path_name(ty_m.ident));
             ebml_w.end_tag();
         }
 

trunk/src/test/auxiliary/static_fn_trait_xc_aux.rs

@@ -0,0 +1,11 @@
+pub mod num {
+    pub trait Num2 {
+        static pure fn from_int2(n: int) -> self;
+    }
+}
+
+pub mod float {
+    impl float: num::Num2 {
+        static pure fn from_int2(n: int) -> float { return n as float;  }
+    }
+}

trunk/src/test/run-pass/static-fn-trait-xc.rs

@@ -0,0 +1,9 @@
+// aux-build:static_fn_trait_xc_aux.rs
+
+extern mod mycore(name ="static_fn_trait_xc_aux");
+
+use mycore::num;
+
+fn main() {
+    let _1:float = num::from_int2(1i);
+}