---

yaml
---
r: 36152
b: refs/heads/try2
c: 675c272
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: b7872fa13eb561956455eefbb06a63411cb4ad14
+refs/heads/try2: 675c272dadc8cd7e529fda64904c87e8243fe94f
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/rustc/metadata/encoder.rs

@@ -556,6 +556,9 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::Serializer,
     }
     let add_to_index = |copy ebml_w| add_to_index_(item, ebml_w, index);
 
+    debug!("encoding info for item at %s",
+           syntax::codemap::span_to_str(item.span, ecx.tcx.sess.codemap));
+
     match item.node {
       item_const(_, _) => {
         add_to_index();
@@ -738,7 +741,7 @@ fn encode_info_for_item(ecx: @encode_ctxt, ebml_w: ebml::Serializer,
             }
         }
         do opt_trait.iter() |associated_trait| {
-           encode_trait_ref(ebml_w, ecx, *associated_trait)
+           encode_trait_ref(ebml_w, ecx, *associated_trait);
         }
         encode_path(ecx, ebml_w, path, ast_map::path_name(item.ident));
         ebml_w.end_tag();

branches/try2/src/rustc/middle/typeck/collect.rs

@@ -522,10 +522,20 @@ fn convert(ccx: @crate_ctxt, it: @ast::item) {
                            region_param: rp,
                            ty: selfty});
 
-        for ms_opt.each |ms| {
-            let cms = convert_methods(ccx, *ms, rp, i_bounds);
-            for trait_ref.each |t| {
-                check_methods_against_trait(ccx, tps, rp, selfty, *t, cms);
+        match ms_opt {
+            Some(ref ms) => {
+                let cms = convert_methods(ccx, *ms, rp, i_bounds);
+                for trait_ref.each |t| {
+                    check_methods_against_trait(ccx, tps, rp, selfty, *t,
+                                                cms);
+                }
+            }
+            None => {
+                // We still need to instantiate the trait ref here so that
+                // metadata encoding will find the type.
+                for trait_ref.each |trait_ref| {
+                    let _ = instantiate_trait_ref(ccx, *trait_ref, rp);
+                }
             }
         }
       }