about summary refs log tree commit diff
path: root/src/librustdoc/json
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume.gomez@huawei.com>2022-06-28 11:46:03 +0200
committerGuillaume Gomez <guillaume.gomez@huawei.com>2022-06-28 11:46:03 +0200
commitb7e62000ddced5d8bd4b7e21d9e247bbc1912723 (patch)
tree11d80be1a3eacc52772888e5c0fa6d38efbda4d2 /src/librustdoc/json
parentbd2e51a338e36372b200a22f3e0e22189a1063e6 (diff)
downloadrust-b7e62000ddced5d8bd4b7e21d9e247bbc1912723.tar.gz
rust-b7e62000ddced5d8bd4b7e21d9e247bbc1912723.zip
Fix glob import ICE in rustdoc JSON format
Diffstat (limited to 'src/librustdoc/json')
-rw-r--r--src/librustdoc/json/conversions.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/librustdoc/json/conversions.rs b/src/librustdoc/json/conversions.rs
index c627dcc30d6..84b3d7431cf 100644
--- a/src/librustdoc/json/conversions.rs
+++ b/src/librustdoc/json/conversions.rs
@@ -663,7 +663,12 @@ impl FromWithTcx<clean::Import> for Import {
             },
             Glob => Import {
                 source: import.source.path.whole_name(),
-                name: import.source.path.last().to_string(),
+                name: import
+                    .source
+                    .path
+                    .last_opt()
+                    .unwrap_or_else(|| Symbol::intern("*"))
+                    .to_string(),
                 id: import.source.did.map(ItemId::from).map(|i| from_item_id(i, tcx)),
                 glob: true,
             },