---

yaml
---
r: 39357
b: refs/heads/incoming
c: 7ca9436
h: refs/heads/master
i:
  39355: 3f0452a
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: e71ec06118fee49a86063c5eb7386f1000f56237
+refs/heads/incoming: 7ca94369dad596421276c26ab98bdaa7bb1787cf
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/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();
         }
 

branches/incoming/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;  }
+    }
+}

branches/incoming/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);
+}