---

yaml
---
r: 62506
b: refs/heads/snap-stage3
c: e3a91f6
h: refs/heads/master
v: v3

Author: thomaslee

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: cac97d7ee565eef14b9e7385d1c088c1eb0a9295
+refs/heads/snap-stage3: e3a91f60c58d537945abc4c83b1b9f6ddcbe21fe
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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 {