Skip to content

Commit 8a6f7a5

Browse files
committed
Implement From<ast::IntTy> for PrimitiveType.
1 parent 5c849f4 commit 8a6f7a5

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

src/librustdoc/clean/mod.rs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1619,6 +1619,17 @@ impl PrimitiveType {
16191619
}
16201620
}
16211621

1622+
impl From<ast::IntTy> for PrimitiveType {
1623+
fn from(int_ty: ast::IntTy) -> PrimitiveType {
1624+
match int_ty {
1625+
ast::IntTy::Is => PrimitiveType::Isize,
1626+
ast::IntTy::I8 => PrimitiveType::I8,
1627+
ast::IntTy::I16 => PrimitiveType::I16,
1628+
ast::IntTy::I32 => PrimitiveType::I32,
1629+
ast::IntTy::I64 => PrimitiveType::I64,
1630+
}
1631+
}
1632+
}
16221633

16231634
// Poor man's type parameter substitution at HIR level.
16241635
// Used to replace private type aliases in public signatures with their aliased types.
@@ -1772,11 +1783,7 @@ impl<'tcx> Clean<Type> for ty::Ty<'tcx> {
17721783
ty::TyNever => Never,
17731784
ty::TyBool => Primitive(PrimitiveType::Bool),
17741785
ty::TyChar => Primitive(PrimitiveType::Char),
1775-
ty::TyInt(ast::IntTy::Is) => Primitive(PrimitiveType::Isize),
1776-
ty::TyInt(ast::IntTy::I8) => Primitive(PrimitiveType::I8),
1777-
ty::TyInt(ast::IntTy::I16) => Primitive(PrimitiveType::I16),
1778-
ty::TyInt(ast::IntTy::I32) => Primitive(PrimitiveType::I32),
1779-
ty::TyInt(ast::IntTy::I64) => Primitive(PrimitiveType::I64),
1786+
ty::TyInt(int_ty) => Primitive(int_ty.into()),
17801787
ty::TyUint(ast::UintTy::Us) => Primitive(PrimitiveType::Usize),
17811788
ty::TyUint(ast::UintTy::U8) => Primitive(PrimitiveType::U8),
17821789
ty::TyUint(ast::UintTy::U16) => Primitive(PrimitiveType::U16),
@@ -2741,11 +2748,7 @@ fn resolve_type(cx: &DocContext,
27412748
hir::TyStr => return Primitive(PrimitiveType::Str),
27422749
hir::TyBool => return Primitive(PrimitiveType::Bool),
27432750
hir::TyChar => return Primitive(PrimitiveType::Char),
2744-
hir::TyInt(ast::IntTy::Is) => return Primitive(PrimitiveType::Isize),
2745-
hir::TyInt(ast::IntTy::I8) => return Primitive(PrimitiveType::I8),
2746-
hir::TyInt(ast::IntTy::I16) => return Primitive(PrimitiveType::I16),
2747-
hir::TyInt(ast::IntTy::I32) => return Primitive(PrimitiveType::I32),
2748-
hir::TyInt(ast::IntTy::I64) => return Primitive(PrimitiveType::I64),
2751+
hir::TyInt(int_ty) => return Primitive(int_ty.into()),
27492752
hir::TyUint(ast::UintTy::Us) => return Primitive(PrimitiveType::Usize),
27502753
hir::TyUint(ast::UintTy::U8) => return Primitive(PrimitiveType::U8),
27512754
hir::TyUint(ast::UintTy::U16) => return Primitive(PrimitiveType::U16),

0 commit comments

Comments
 (0)