---

yaml
---
r: 32259
b: refs/heads/dist-snap
c: 1f056ed
h: refs/heads/master
i:
  32257: 9df80f7
  32255: 5359ee3
v: v3

Author: pcwalton

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 65b05a6ce8e486e085e6a58634f66a27cc631cfb
+refs/heads/dist-snap: 1f056eda8eb553d3c7d690017b3872db2cc8fdf1
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/trans/foreign.rs

@@ -794,7 +794,10 @@ fn trans_foreign_mod(ccx: @crate_ctxt,
               }
           }
         }
-        ast::foreign_item_const(*) => {}
+        ast::foreign_item_const(*) => {
+            let ident = ccx.sess.parse_sess.interner.get(foreign_item.ident);
+            ccx.item_symbols.insert(foreign_item.id, copy *ident);
+        }
       }
     }
 }

branches/dist-snap/src/rustc/middle/typeck/check/method.rs

@@ -306,7 +306,10 @@ struct lookup {
             };
 
             let trt_methods = ty::trait_methods(tcx, trait_id);
-            match vec::position(*trt_methods, |m| m.ident == self.m_name) {
+            let match_fn: &fn(m: ty::method) -> bool = |m| {
+                m.self_ty != ast::sty_static && m.ident == self.m_name
+            };
+            match vec::position(*trt_methods, match_fn) {
               None => {
                 /* check next bound */
                 trait_bnd_idx += 1u;