Auto merge of #54671 - petrochenkov:extpre2015, r=nikomatsakis

[rust.git] / src / librustc / ty / item_path.rs

diff --git a/src/librustc/ty/item_path.rs b/src/librustc/ty/item_path.rs
index ca4cafd0a73912e3efdec339cd68fc6da2f43231..2e635c6ecdecb7475de13c383f96a1eac5f26332 100644 (file)
--- a/src/librustc/ty/item_path.rs
+++ b/src/librustc/ty/item_path.rs
@@ -436,7 +436,7 @@ pub fn characteristic_def_id_of_type(ty: Ty<'_>) -> Option<DefId> {
     match ty.sty {
         ty::Adt(adt_def, _) => Some(adt_def.did),
 
-        ty::Dynamic(data, ..) => data.principal().map(|p| p.def_id()),
+        ty::Dynamic(data, ..) => Some(data.principal().def_id()),
 
         ty::Array(subty, _) |
         ty::Slice(subty) => characteristic_def_id_of_type(subty),