---

yaml
---
r: 21489
b: refs/heads/snap-stage3
c: 1f056ed
h: refs/heads/master
i:
  21487: 456f331
v: v3

Author: pcwalton

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 65b05a6ce8e486e085e6a58634f66a27cc631cfb
+refs/heads/snap-stage3: 1f056eda8eb553d3c7d690017b3872db2cc8fdf1
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

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