From 68f5b34b2c516f66df3a709c33c8bd8a449a95b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20K=C3=BCber?= Date: Wed, 23 May 2018 19:24:57 -0700 Subject: [PATCH] Use crate name for reexported `extern crate` paths --- src/librustc/ty/item_path.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/librustc/ty/item_path.rs b/src/librustc/ty/item_path.rs index 93d78210b1ad..87ace45a905d 100644 --- a/src/librustc/ty/item_path.rs +++ b/src/librustc/ty/item_path.rs @@ -169,7 +169,11 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> { let data = cur_def_key.disambiguated_data.data; let symbol = data.get_opt_name().map(|n| n.as_str()).unwrap_or_else(|| { - Symbol::intern("").as_str() + if let DefPathData::CrateRoot = data { // reexported `extern crate` (#43189) + self.original_crate_name(cur_def.krate).as_str() + } else { + Symbol::intern("").as_str() + } }); cur_path.push(symbol);