File tree 3 files changed +35
-2
lines changed
3 files changed +35
-2
lines changed Original file line number Diff line number Diff line change @@ -2161,8 +2161,12 @@ impl Path {
2161
2161
self . res . def_id ( )
2162
2162
}
2163
2163
2164
+ pub ( crate ) fn last_opt ( & self ) -> Option < Symbol > {
2165
+ self . segments . last ( ) . map ( |s| s. name )
2166
+ }
2167
+
2164
2168
pub ( crate ) fn last ( & self ) -> Symbol {
2165
- self . segments . last ( ) . expect ( "segments were empty" ) . name
2169
+ self . last_opt ( ) . expect ( "segments were empty" )
2166
2170
}
2167
2171
2168
2172
pub ( crate ) fn whole_name ( & self ) -> String {
Original file line number Diff line number Diff line change @@ -666,7 +666,12 @@ impl FromWithTcx<clean::Import> for Import {
666
666
} ,
667
667
Glob => Import {
668
668
source : import. source . path . whole_name ( ) ,
669
- name : import. source . path . last ( ) . to_string ( ) ,
669
+ name : import
670
+ . source
671
+ . path
672
+ . last_opt ( )
673
+ . unwrap_or_else ( || Symbol :: intern ( "*" ) )
674
+ . to_string ( ) ,
670
675
id : import. source . did . map ( ItemId :: from) . map ( |i| from_item_id ( i, tcx) ) ,
671
676
glob : true ,
672
677
} ,
Original file line number Diff line number Diff line change
1
+ // This is a regression test for <https://github.com/rust-lang/rust/issues/98003>.
2
+
3
+ #![ feature( no_core) ]
4
+ #![ no_std]
5
+ #![ no_core]
6
+
7
+ // @has glob_import.json
8
+ // @has - "$.index[*][?(@.name=='glob')]"
9
+ // @has - "$.index[*][?(@.kind=='import')].inner.name" \"*\"
10
+
11
+
12
+ mod m1 {
13
+ pub fn f ( ) { }
14
+ }
15
+ mod m2 {
16
+ pub fn f ( _: u8 ) { }
17
+ }
18
+
19
+ pub use m1:: * ;
20
+ pub use m2:: * ;
21
+
22
+ pub mod glob {
23
+ pub use * ;
24
+ }
You can’t perform that action at this time.
0 commit comments