Incorporate fix from japaric for cross-crate ICE

nikomatsakis · nikomatsakis · commit 23eec0c955c3 · 2014-12-31T11:15:42.000-05:00
diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs
@@ -1402,6 +1402,7 @@ fn encode_info_for_item(ecx: &EncodeContext,
                 }
                 ty::TypeTraitItem(associated_type) => {
                     encode_name(rbml_w, associated_type.name);
+                    encode_def_id(rbml_w, associated_type.def_id);
 
                     let elem = ast_map::PathName(associated_type.name);
                     encode_path(rbml_w,

Original file line number	Diff line number	Diff line change
`@@ -1402,6 +1402,7 @@ fn encode_info_for_item(ecx: &EncodeContext,`
`1402`	`1402`	`}`
`1403`	`1403`	`ty::TypeTraitItem(associated_type) => {`
`1404`	`1404`	`encode_name(rbml_w, associated_type.name);`
	`1405`	`+ encode_def_id(rbml_w, associated_type.def_id);`
`1405`	`1406`
`1406`	`1407`	`let elem = ast_map::PathName(associated_type.name);`
`1407`	`1408`	`encode_path(rbml_w,`