---

yaml
---
r: 30162
b: refs/heads/incoming
c: a70e37b
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: a19dce6c162f0dc24c615e8e667f190117126293
+refs/heads/incoming: a70e37b214407743ba9ac7e688e13d7a9d644ad5
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/rustc/middle/ty.rs

@@ -2826,22 +2826,11 @@ fn impl_traits(cx: ctxt, id: ast::def_id) -> ~[t] {
                     node_id_to_type(cx, trait_ref.ref_id)
                 }
            }
-           Some(ast_map::node_item(@{node: ast::item_class(*),
+           Some(ast_map::node_item(@{node: ast::item_class(sd,_),
                            _},_)) => {
-             match cx.def_map.find(id.node) {
-               Some(def_ty(trait_id)) => {
-                   // XXX: Doesn't work cross-crate.
-                   debug!("(impl_traits) found trait id %?", trait_id);
-                   ~[node_id_to_type(cx, trait_id.node)]
-               }
-               Some(x) => {
-                 cx.sess.bug(fmt!("impl_traits: trait ref is in trait map \
-                                   but is bound to %?", x));
-               }
-               None => {
-                 ~[]
-               }
-             }
+               do vec::map(sd.traits) |trait_ref| {
+                    node_id_to_type(cx, trait_ref.ref_id)
+                }
            }
            _ => ~[]
         }

branches/incoming/src/test/run-pass/issue-2936.rs

@@ -0,0 +1,20 @@
+trait bar<T> {
+    fn get_bar() -> T;
+}
+
+fn foo<T, U: bar<T>>(b: U) -> T {
+    b.get_bar()
+}
+
+struct cbar : bar<int> {
+    x: int;
+    new(x: int) { self.x = x; }
+    fn get_bar() -> int {
+        self.x
+    }
+}
+
+fn main() {
+    let x: int = foo::<int, cbar>(cbar(5));
+    assert x == 5;
+}