---

yaml
---
r: 40247
b: refs/heads/dist-snap
c: 675c272
h: refs/heads/master
i:
  40245: f6ec045
  40243: f2e8eef
  40239: 9f62be0
v: v3

Author: pcwalton

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: b7872fa13eb561956455eefbb06a63411cb4ad14
+refs/heads/dist-snap: 675c272dadc8cd7e529fda64904c87e8243fe94f
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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/dist-snap/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);
+                }
             }
         }
       }