14
14
pub use self :: Type :: * ;
15
15
pub use self :: VariantKind :: * ;
16
16
pub use self :: Mutability :: * ;
17
- pub use self :: Import :: * ;
18
17
pub use self :: ItemEnum :: * ;
19
18
pub use self :: Attribute :: * ;
20
19
pub use self :: TyParamBound :: * ;
@@ -2527,7 +2526,7 @@ impl Clean<Vec<Item>> for doctree::Import {
2527
2526
} ) ;
2528
2527
let ( mut ret, inner) = match self . node {
2529
2528
hir:: ViewPathGlob ( ref p) => {
2530
- ( vec ! [ ] , GlobImport ( resolve_use_source ( cx, p. clean ( cx) , self . id ) ) )
2529
+ ( vec ! [ ] , Import :: Glob ( resolve_use_source ( cx, p. clean ( cx) , self . id ) ) )
2531
2530
}
2532
2531
hir:: ViewPathList ( ref p, ref list) => {
2533
2532
// Attempt to inline all reexported items, but be sure
@@ -2553,17 +2552,17 @@ impl Clean<Vec<Item>> for doctree::Import {
2553
2552
if remaining. is_empty ( ) {
2554
2553
return ret;
2555
2554
}
2556
- ( ret, ImportList ( resolve_use_source ( cx, p. clean ( cx) , self . id ) ,
2557
- remaining) )
2555
+ ( ret, Import :: List ( resolve_use_source ( cx, p. clean ( cx) , self . id ) ,
2556
+ remaining) )
2558
2557
}
2559
2558
hir:: ViewPathSimple ( name, ref p) => {
2560
2559
if !denied {
2561
2560
if let Some ( items) = inline:: try_inline ( cx, self . id , Some ( name) ) {
2562
2561
return items;
2563
2562
}
2564
2563
}
2565
- ( vec ! [ ] , SimpleImport ( name. clean ( cx) ,
2566
- resolve_use_source ( cx, p. clean ( cx) , self . id ) ) )
2564
+ ( vec ! [ ] , Import :: Simple ( name. clean ( cx) ,
2565
+ resolve_use_source ( cx, p. clean ( cx) , self . id ) ) )
2567
2566
}
2568
2567
} ;
2569
2568
ret. push ( Item {
@@ -2583,11 +2582,11 @@ impl Clean<Vec<Item>> for doctree::Import {
2583
2582
#[ derive( Clone , RustcEncodable , RustcDecodable , Debug ) ]
2584
2583
pub enum Import {
2585
2584
// use source as str;
2586
- SimpleImport ( String , ImportSource ) ,
2585
+ Simple ( String , ImportSource ) ,
2587
2586
// use source::*;
2588
- GlobImport ( ImportSource ) ,
2587
+ Glob ( ImportSource ) ,
2589
2588
// use source::{a, b, c};
2590
- ImportList ( ImportSource , Vec < ViewListIdent > ) ,
2589
+ List ( ImportSource , Vec < ViewListIdent > ) ,
2591
2590
}
2592
2591
2593
2592
#[ derive( Clone , RustcEncodable , RustcDecodable , Debug ) ]
0 commit comments