---

yaml
---
r: 60509
b: refs/heads/auto
c: e3a91f6
h: refs/heads/master
i:
  60507: ca493fd
v: v3

Author: thomaslee

[refs]

@@ -14,6 +14,6 @@ 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: cac97d7ee565eef14b9e7385d1c088c1eb0a9295
+refs/heads/auto: e3a91f60c58d537945abc4c83b1b9f6ddcbe21fe
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustc/metadata/encoder.rs

@@ -388,6 +388,17 @@ fn encode_reexported_static_methods(ecx: @EncodeContext,
             match ecx.tcx.items.find(&exp.def_id.node) {
                 Some(&ast_map::node_item(item, path)) => {
                     let original_name = ecx.tcx.sess.str_of(item.ident);
+
+                    //
+                    // We don't need to reexport static methods on traits
+                    // declared in the same module as our `pub use ...` since
+                    // that's done when we encode the trait item.
+                    //
+                    // The only exception is when the reexport *changes* the
+                    // name e.g. `pub use Foo = self::Bar` -- we have
+                    // encoded metadata for static methods relative to Bar,
+                    // but not yet for Foo.
+                    //
                     if mod_path != *path || *exp.name != *original_name {
                         for methods.each |&m| {
                             if m.explicit_self == ast::sty_static {