Fix rebasing fallout.

Author: michaelwoerister

src/librustc_metadata/decoder.rs

@@ -385,7 +385,7 @@ pub fn get_trait_def<'a, 'tcx>(cdata: Cmd,
     let unsafety = parse_unsafety(item_doc);
     let associated_type_names = parse_associated_type_names(item_doc);
     let paren_sugar = parse_paren_sugar(item_doc);
-    let def_path = def_path(cdata, item_id);
+    let def_path = def_path(cdata, item_id).unwrap();
 
     ty::TraitDef::new(unsafety,
                       paren_sugar,