---

yaml
---
r: 39349
b: refs/heads/incoming
c: 6047dd3
h: refs/heads/master
i:
  39347: 70a787c
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: 0494b078a9555f77d9cd4fbe2a4ff910bfba29b8
+refs/heads/incoming: 6047dd35bbe5b0b7c14cab6184bd39c607be19c1
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/librustc/middle/trans/meth.rs

@@ -515,15 +515,7 @@ fn combine_impl_and_methods_origins(bcx: block,
     let m_boundss = vec::view(*r_m_bounds, n_r_m_tps - n_m_tps, n_r_m_tps);
 
     // Flatten out to find the number of vtables the method expects.
-    let m_vtables = m_boundss.foldl(0, |sum, m_bounds| {
-        m_bounds.foldl(*sum, |sum, m_bound| {
-            (*sum) + match (*m_bound) {
-                ty::bound_copy | ty::bound_owned |
-                ty::bound_send | ty::bound_const => 0,
-                ty::bound_trait(_) => 1
-            }
-        })
-    });
+    let m_vtables = ty::count_traits_and_supertraits(tcx, m_boundss);
 
     // Find the vtables we computed at type check time and monomorphize them
     let r_m_origins = match node_vtables(bcx, callee_id) {

branches/incoming/src/test/run-pass/static-methods-in-traits2.rs

@@ -0,0 +1,19 @@
+pub trait Number: NumConv {
+    static pure fn from<T:Number>(n: T) -> self;
+}
+
+pub impl float: Number {
+    static pure fn from<T:Number>(n: T) -> float { n.to_float() }
+}
+
+pub trait NumConv {
+    pure fn to_float(&self) -> float;
+}
+
+pub impl float: NumConv {
+    pure fn to_float(&self) -> float { *self }
+}
+
+fn main() {
+    let _: float = Number::from(0.0f);
+}