Skip to content

Commit e0d64b9

Browse files
LeSeulArtichautLeSeulArtichaut
committed
Use ty::{IntTy,UintTy,FloatTy} in rustdoc and clippy
1 parent 50e1ae1 commit e0d64b9

File tree

9 files changed

+61
-32
lines changed

9 files changed

+61
-32
lines changed

‎src/librustdoc/clean/types.rs‎

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use std::{slice, vec};
1111
use rustc_ast::attr;
1212
use rustc_ast::util::comments::beautify_doc_string;
1313
use rustc_ast::{self as ast, AttrStyle};
14-
use rustc_ast::{FloatTy, IntTy, UintTy};
1514
use rustc_attr::{ConstStability, Deprecation, Stability, StabilityLevel};
1615
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
1716
use rustc_feature::UnstableFeatures;
@@ -21,7 +20,7 @@ use rustc_hir::def_id::{CrateNum, DefId};
2120
use rustc_hir::lang_items::LangItem;
2221
use rustc_hir::Mutability;
2322
use rustc_index::vec::IndexVec;
24-
use rustc_middle::ty::TyCtxt;
23+
use rustc_middle::ty::{self, TyCtxt};
2524
use rustc_session::Session;
2625
use rustc_span::hygiene::MacroKind;
2726
use rustc_span::source_map::DUMMY_SP;
@@ -1423,6 +1422,7 @@ impl GetDefId for Type {
14231422

14241423
impl PrimitiveType {
14251424
crate fn from_hir(prim: hir::PrimTy) -> PrimitiveType {
1425+
use ast::{FloatTy, IntTy, UintTy};
14261426
match prim {
14271427
hir::PrimTy::Int(IntTy::Isize) => PrimitiveType::Isize,
14281428
hir::PrimTy::Int(IntTy::I8) => PrimitiveType::I8,
@@ -1657,6 +1657,41 @@ impl From<ast::FloatTy> for PrimitiveType {
16571657
}
16581658
}
16591659

1660+
impl From<ty::IntTy> for PrimitiveType {
1661+
fn from(int_ty: ty::IntTy) -> PrimitiveType {
1662+
match int_ty {
1663+
ty::IntTy::Isize => PrimitiveType::Isize,
1664+
ty::IntTy::I8 => PrimitiveType::I8,
1665+
ty::IntTy::I16 => PrimitiveType::I16,
1666+
ty::IntTy::I32 => PrimitiveType::I32,
1667+
ty::IntTy::I64 => PrimitiveType::I64,
1668+
ty::IntTy::I128 => PrimitiveType::I128,
1669+
}
1670+
}
1671+
}
1672+
1673+
impl From<ty::UintTy> for PrimitiveType {
1674+
fn from(uint_ty: ty::UintTy) -> PrimitiveType {
1675+
match uint_ty {
1676+
ty::UintTy::Usize => PrimitiveType::Usize,
1677+
ty::UintTy::U8 => PrimitiveType::U8,
1678+
ty::UintTy::U16 => PrimitiveType::U16,
1679+
ty::UintTy::U32 => PrimitiveType::U32,
1680+
ty::UintTy::U64 => PrimitiveType::U64,
1681+
ty::UintTy::U128 => PrimitiveType::U128,
1682+
}
1683+
}
1684+
}
1685+
1686+
impl From<ty::FloatTy> for PrimitiveType {
1687+
fn from(float_ty: ty::FloatTy) -> PrimitiveType {
1688+
match float_ty {
1689+
ty::FloatTy::F32 => PrimitiveType::F32,
1690+
ty::FloatTy::F64 => PrimitiveType::F64,
1691+
}
1692+
}
1693+
}
1694+
16601695
impl From<hir::PrimTy> for PrimitiveType {
16611696
fn from(prim_ty: hir::PrimTy) -> PrimitiveType {
16621697
match prim_ty {

‎src/tools/clippy/clippy_lints/src/bytecount.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@ use crate::utils::{
22
contains_name, get_pat_name, match_type, paths, single_segment_path, snippet_with_applicability, span_lint_and_sugg,
33
};
44
use if_chain::if_chain;
5-
use rustc_ast::ast::UintTy;
65
use rustc_errors::Applicability;
76
use rustc_hir::{BinOpKind, BorrowKind, Expr, ExprKind, UnOp};
87
use rustc_lint::{LateContext, LateLintPass};
9-
use rustc_middle::ty;
8+
use rustc_middle::ty::{self, UintTy};
109
use rustc_session::{declare_lint_pass, declare_tool_lint};
1110
use rustc_span::sym;
1211
use rustc_span::Symbol;

‎src/tools/clippy/clippy_lints/src/consts.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
use crate::utils::{clip, sext, unsext};
44
use if_chain::if_chain;
5-
use rustc_ast::ast::{FloatTy, LitFloatType, LitKind};
5+
use rustc_ast::ast::{self, LitFloatType, LitKind};
66
use rustc_data_structures::sync::Lrc;
77
use rustc_hir::def::{DefKind, Res};
88
use rustc_hir::{BinOp, BinOpKind, Block, Expr, ExprKind, HirId, QPath, UnOp};
99
use rustc_lint::LateContext;
1010
use rustc_middle::mir::interpret::Scalar;
1111
use rustc_middle::ty::subst::{Subst, SubstsRef};
12-
use rustc_middle::ty::{self, ScalarInt, Ty, TyCtxt};
12+
use rustc_middle::ty::{self, FloatTy, ScalarInt, Ty, TyCtxt};
1313
use rustc_middle::{bug, span_bug};
1414
use rustc_span::symbol::Symbol;
1515
use std::cmp::Ordering::{self, Equal};
@@ -167,8 +167,8 @@ pub fn lit_to_constant(lit: &LitKind, ty: Option<Ty<'_>>) -> Constant {
167167
LitKind::Char(c) => Constant::Char(c),
168168
LitKind::Int(n, _) => Constant::Int(n),
169169
LitKind::Float(ref is, LitFloatType::Suffixed(fty)) => match fty {
170-
FloatTy::F32 => Constant::F32(is.as_str().parse().unwrap()),
171-
FloatTy::F64 => Constant::F64(is.as_str().parse().unwrap()),
170+
ast::FloatTy::F32 => Constant::F32(is.as_str().parse().unwrap()),
171+
ast::FloatTy::F64 => Constant::F64(is.as_str().parse().unwrap()),
172172
},
173173
LitKind::Float(ref is, LitFloatType::Unsuffixed) => match ty.expect("type of float is known").kind() {
174174
ty::Float(FloatTy::F32) => Constant::F32(is.as_str().parse().unwrap()),

‎src/tools/clippy/clippy_lints/src/enum_clike.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
44
use crate::consts::{miri_to_const, Constant};
55
use crate::utils::span_lint;
6-
use rustc_ast::ast::{IntTy, UintTy};
76
use rustc_hir::{Item, ItemKind};
87
use rustc_lint::{LateContext, LateLintPass};
9-
use rustc_middle::ty;
8+
use rustc_middle::ty::{self, IntTy, UintTy};
109
use rustc_middle::ty::util::IntTypeExt;
1110
use rustc_session::{declare_lint_pass, declare_tool_lint};
1211
use std::convert::TryFrom;

‎src/tools/clippy/clippy_lints/src/float_literal.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use crate::utils::{numeric_literal, span_lint_and_sugg};
22
use if_chain::if_chain;
3-
use rustc_ast::ast::{FloatTy, LitFloatType, LitKind};
3+
use rustc_ast::ast::{self, LitFloatType, LitKind};
44
use rustc_errors::Applicability;
55
use rustc_hir as hir;
66
use rustc_lint::{LateContext, LateLintPass};
7-
use rustc_middle::ty;
7+
use rustc_middle::ty::{self, FloatTy};
88
use rustc_session::{declare_lint_pass, declare_tool_lint};
99
use std::fmt;
1010

@@ -75,8 +75,8 @@ impl<'tcx> LateLintPass<'tcx> for FloatLiteral {
7575
let digits = count_digits(&sym_str);
7676
let max = max_digits(fty);
7777
let type_suffix = match lit_float_ty {
78-
LitFloatType::Suffixed(FloatTy::F32) => Some("f32"),
79-
LitFloatType::Suffixed(FloatTy::F64) => Some("f64"),
78+
LitFloatType::Suffixed(ast::FloatTy::F32) => Some("f32"),
79+
LitFloatType::Suffixed(ast::FloatTy::F64) => Some("f64"),
8080
LitFloatType::Unsuffixed => None
8181
};
8282
let (is_whole, mut float_str) = match fty {

‎src/tools/clippy/clippy_lints/src/mutex_atomic.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
//! This lint is **warn** by default
44
55
use crate::utils::{is_type_diagnostic_item, span_lint};
6-
use rustc_ast::ast;
76
use rustc_hir::Expr;
87
use rustc_lint::{LateContext, LateLintPass};
98
use rustc_middle::ty::{self, Ty};
@@ -77,8 +76,8 @@ impl<'tcx> LateLintPass<'tcx> for Mutex {
7776
atomic_name
7877
);
7978
match *mutex_param.kind() {
80-
ty::Uint(t) if t != ast::UintTy::Usize => span_lint(cx, MUTEX_INTEGER, expr.span, &msg),
81-
ty::Int(t) if t != ast::IntTy::Isize => span_lint(cx, MUTEX_INTEGER, expr.span, &msg),
79+
ty::Uint(t) if t != ty::UintTy::Usize => span_lint(cx, MUTEX_INTEGER, expr.span, &msg),
80+
ty::Int(t) if t != ty::IntTy::Isize => span_lint(cx, MUTEX_INTEGER, expr.span, &msg),
8281
_ => span_lint(cx, MUTEX_ATOMIC, expr.span, &msg),
8382
};
8483
}

‎src/tools/clippy/clippy_lints/src/transmute.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ impl<'tcx> LateLintPass<'tcx> for Transmute {
443443
);
444444
},
445445
),
446-
(ty::Int(ast::IntTy::I32) | ty::Uint(ast::UintTy::U32), &ty::Char) => {
446+
(ty::Int(ty::IntTy::I32) | ty::Uint(ty::UintTy::U32), &ty::Char) => {
447447
span_lint_and_then(
448448
cx,
449449
TRANSMUTE_INT_TO_CHAR,
@@ -468,7 +468,7 @@ impl<'tcx> LateLintPass<'tcx> for Transmute {
468468
(ty::Ref(_, ty_from, from_mutbl), ty::Ref(_, ty_to, to_mutbl)) => {
469469
if_chain! {
470470
if let (&ty::Slice(slice_ty), &ty::Str) = (&ty_from.kind(), &ty_to.kind());
471-
if let ty::Uint(ast::UintTy::U8) = slice_ty.kind();
471+
if let ty::Uint(ty::UintTy::U8) = slice_ty.kind();
472472
if from_mutbl == to_mutbl;
473473
then {
474474
let postfix = if *from_mutbl == Mutability::Mut {
@@ -536,7 +536,7 @@ impl<'tcx> LateLintPass<'tcx> for Transmute {
536536
}
537537
},
538538
),
539-
(ty::Int(ast::IntTy::I8) | ty::Uint(ast::UintTy::U8), ty::Bool) => {
539+
(ty::Int(ty::IntTy::I8) | ty::Uint(ty::UintTy::U8), ty::Bool) => {
540540
span_lint_and_then(
541541
cx,
542542
TRANSMUTE_INT_TO_BOOL,

‎src/tools/clippy/clippy_lints/src/types.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use std::cmp::Ordering;
55
use std::collections::BTreeMap;
66

77
use if_chain::if_chain;
8-
use rustc_ast::{FloatTy, IntTy, LitFloatType, LitIntType, LitKind, UintTy};
8+
use rustc_ast::{LitFloatType, LitIntType, LitKind};
99
use rustc_errors::{Applicability, DiagnosticBuilder};
1010
use rustc_hir as hir;
1111
use rustc_hir::intravisit::{walk_body, walk_expr, walk_ty, FnKind, NestedVisitorMap, Visitor};
@@ -18,7 +18,7 @@ use rustc_lint::{LateContext, LateLintPass, LintContext};
1818
use rustc_middle::hir::map::Map;
1919
use rustc_middle::lint::in_external_macro;
2020
use rustc_middle::ty::TypeFoldable;
21-
use rustc_middle::ty::{self, InferTy, Ty, TyCtxt, TyS, TypeAndMut, TypeckResults};
21+
use rustc_middle::ty::{self, FloatTy, InferTy, IntTy, Ty, TyCtxt, TyS, TypeAndMut, TypeckResults, UintTy};
2222
use rustc_semver::RustcVersion;
2323
use rustc_session::{declare_lint_pass, declare_tool_lint, impl_lint_pass};
2424
use rustc_span::hygiene::{ExpnKind, MacroKind};
@@ -1106,9 +1106,7 @@ fn is_empty_block(expr: &Expr<'_>) -> bool {
11061106
expr.kind,
11071107
ExprKind::Block(
11081108
Block {
1109-
stmts: &[],
1110-
expr: None,
1111-
..
1109+
stmts: &[], expr: None, ..
11121110
},
11131111
_,
11141112
)

‎src/tools/clippy/clippy_lints/src/utils/mod.rs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use std::mem;
3535

3636
use if_chain::if_chain;
3737
use rustc_ast::ast::{self, Attribute, LitKind};
38-
use rustc_attr as attr;
3938
use rustc_data_structures::fx::FxHashMap;
4039
use rustc_errors::Applicability;
4140
use rustc_hir as hir;
@@ -1224,27 +1223,27 @@ pub fn get_arg_name(pat: &Pat<'_>) -> Option<Symbol> {
12241223
}
12251224
}
12261225

1227-
pub fn int_bits(tcx: TyCtxt<'_>, ity: ast::IntTy) -> u64 {
1228-
Integer::from_attr(&tcx, attr::IntType::SignedInt(ity)).size().bits()
1226+
pub fn int_bits(tcx: TyCtxt<'_>, ity: ty::IntTy) -> u64 {
1227+
Integer::from_int_ty(&tcx, ity).size().bits()
12291228
}
12301229

12311230
#[allow(clippy::cast_possible_wrap)]
12321231
/// Turn a constant int byte representation into an i128
1233-
pub fn sext(tcx: TyCtxt<'_>, u: u128, ity: ast::IntTy) -> i128 {
1232+
pub fn sext(tcx: TyCtxt<'_>, u: u128, ity: ty::IntTy) -> i128 {
12341233
let amt = 128 - int_bits(tcx, ity);
12351234
((u as i128) << amt) >> amt
12361235
}
12371236

12381237
#[allow(clippy::cast_sign_loss)]
12391238
/// clip unused bytes
1240-
pub fn unsext(tcx: TyCtxt<'_>, u: i128, ity: ast::IntTy) -> u128 {
1239+
pub fn unsext(tcx: TyCtxt<'_>, u: i128, ity: ty::IntTy) -> u128 {
12411240
let amt = 128 - int_bits(tcx, ity);
12421241
((u as u128) << amt) >> amt
12431242
}
12441243

12451244
/// clip unused bytes
1246-
pub fn clip(tcx: TyCtxt<'_>, u: u128, ity: ast::UintTy) -> u128 {
1247-
let bits = Integer::from_attr(&tcx, attr::IntType::UnsignedInt(ity)).size().bits();
1245+
pub fn clip(tcx: TyCtxt<'_>, u: u128, ity: ty::UintTy) -> u128 {
1246+
let bits = Integer::from_uint_ty(&tcx, ity).size().bits();
12481247
let amt = 128 - bits;
12491248
(u << amt) >> amt
12501249
}

0 commit comments

Comments
 (0)