@@ -1631,6 +1631,18 @@ impl From<ast::IntTy> for PrimitiveType {
16311631 }
16321632}
16331633
1634+ impl From < ast:: UintTy > for PrimitiveType {
1635+ fn from ( uint_ty : ast:: UintTy ) -> PrimitiveType {
1636+ match uint_ty {
1637+ ast:: UintTy :: Us => PrimitiveType :: Usize ,
1638+ ast:: UintTy :: U8 => PrimitiveType :: U8 ,
1639+ ast:: UintTy :: U16 => PrimitiveType :: U16 ,
1640+ ast:: UintTy :: U32 => PrimitiveType :: U32 ,
1641+ ast:: UintTy :: U64 => PrimitiveType :: U64 ,
1642+ }
1643+ }
1644+ }
1645+
16341646// Poor man's type parameter substitution at HIR level.
16351647// Used to replace private type aliases in public signatures with their aliased types.
16361648struct SubstAlias < ' a , ' tcx : ' a > {
@@ -1784,11 +1796,7 @@ impl<'tcx> Clean<Type> for ty::Ty<'tcx> {
17841796 ty:: TyBool => Primitive ( PrimitiveType :: Bool ) ,
17851797 ty:: TyChar => Primitive ( PrimitiveType :: Char ) ,
17861798 ty:: TyInt ( int_ty) => Primitive ( int_ty. into ( ) ) ,
1787- ty:: TyUint ( ast:: UintTy :: Us ) => Primitive ( PrimitiveType :: Usize ) ,
1788- ty:: TyUint ( ast:: UintTy :: U8 ) => Primitive ( PrimitiveType :: U8 ) ,
1789- ty:: TyUint ( ast:: UintTy :: U16 ) => Primitive ( PrimitiveType :: U16 ) ,
1790- ty:: TyUint ( ast:: UintTy :: U32 ) => Primitive ( PrimitiveType :: U32 ) ,
1791- ty:: TyUint ( ast:: UintTy :: U64 ) => Primitive ( PrimitiveType :: U64 ) ,
1799+ ty:: TyUint ( uint_ty) => Primitive ( uint_ty. into ( ) ) ,
17921800 ty:: TyFloat ( ast:: FloatTy :: F32 ) => Primitive ( PrimitiveType :: F32 ) ,
17931801 ty:: TyFloat ( ast:: FloatTy :: F64 ) => Primitive ( PrimitiveType :: F64 ) ,
17941802 ty:: TyStr => Primitive ( PrimitiveType :: Str ) ,
@@ -2749,11 +2757,7 @@ fn resolve_type(cx: &DocContext,
27492757 hir:: TyBool => return Primitive ( PrimitiveType :: Bool ) ,
27502758 hir:: TyChar => return Primitive ( PrimitiveType :: Char ) ,
27512759 hir:: TyInt ( int_ty) => return Primitive ( int_ty. into ( ) ) ,
2752- hir:: TyUint ( ast:: UintTy :: Us ) => return Primitive ( PrimitiveType :: Usize ) ,
2753- hir:: TyUint ( ast:: UintTy :: U8 ) => return Primitive ( PrimitiveType :: U8 ) ,
2754- hir:: TyUint ( ast:: UintTy :: U16 ) => return Primitive ( PrimitiveType :: U16 ) ,
2755- hir:: TyUint ( ast:: UintTy :: U32 ) => return Primitive ( PrimitiveType :: U32 ) ,
2756- hir:: TyUint ( ast:: UintTy :: U64 ) => return Primitive ( PrimitiveType :: U64 ) ,
2760+ hir:: TyUint ( uint_ty) => return Primitive ( uint_ty. into ( ) ) ,
27572761 hir:: TyFloat ( ast:: FloatTy :: F32 ) => return Primitive ( PrimitiveType :: F32 ) ,
27582762 hir:: TyFloat ( ast:: FloatTy :: F64 ) => return Primitive ( PrimitiveType :: F64 ) ,
27592763 } ,
0 commit comments