Fixed typos and updated to matches! where applicable

This commit is contained in:
boolean_coercion 2021-02-12 11:53:52 +02:00
parent 9194c11d69
commit 642efabfbb
2 changed files with 7 additions and 15 deletions

View file

@ -46,7 +46,7 @@ impl LateLintPass<'tcx> for FromStrRadix10 {
if let TyKind::Path(ty_qpath) = &ty.kind; if let TyKind::Path(ty_qpath) = &ty.kind;
let ty_res = cx.qpath_res(ty_qpath, ty.hir_id); let ty_res = cx.qpath_res(ty_qpath, ty.hir_id);
if let def::Res::PrimTy(prim_ty) = ty_res; if let def::Res::PrimTy(prim_ty) = ty_res;
if is_primitive_integer_ty(prim_ty); if matches!(prim_ty, PrimTy::Int(_) | PrimTy::Uint(_));
// check if the second part of the path indeed calls the associated // check if the second part of the path indeed calls the associated
// function `from_str_radix` // function `from_str_radix`
@ -63,7 +63,7 @@ impl LateLintPass<'tcx> for FromStrRadix10 {
cx, cx,
FROM_STR_RADIX_10, FROM_STR_RADIX_10,
exp.span, exp.span,
"This call to `from_str_radix` can be shortened to a call to str::parse", "this call to `from_str_radix` can be replaced with a call to `str::parse`",
"try", "try",
format!("({}).parse()", orig_string), format!("({}).parse()", orig_string),
Applicability::MaybeIncorrect Applicability::MaybeIncorrect
@ -72,11 +72,3 @@ impl LateLintPass<'tcx> for FromStrRadix10 {
} }
} }
} }
fn is_primitive_integer_ty(ty: PrimTy) -> bool {
match ty {
PrimTy::Int(_) => true,
PrimTy::Uint(_) => true,
_ => false,
}
}

View file

@ -1,4 +1,4 @@
error: This call to `from_str_radix` can be shortened to a call to str::parse error: this call to `from_str_radix` can be replaced with a call to `str::parse`
--> $DIR/from_str_radix_10.rs:17:5 --> $DIR/from_str_radix_10.rs:17:5
| |
LL | u32::from_str_radix("30", 10)?; LL | u32::from_str_radix("30", 10)?;
@ -6,25 +6,25 @@ LL | u32::from_str_radix("30", 10)?;
| |
= note: `-D clippy::from-str-radix-10` implied by `-D warnings` = note: `-D clippy::from-str-radix-10` implied by `-D warnings`
error: This call to `from_str_radix` can be shortened to a call to str::parse error: this call to `from_str_radix` can be replaced with a call to `str::parse`
--> $DIR/from_str_radix_10.rs:18:5 --> $DIR/from_str_radix_10.rs:18:5
| |
LL | i64::from_str_radix("24", 10)?; LL | i64::from_str_radix("24", 10)?;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `("24").parse()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `("24").parse()`
error: This call to `from_str_radix` can be shortened to a call to str::parse error: this call to `from_str_radix` can be replaced with a call to `str::parse`
--> $DIR/from_str_radix_10.rs:19:5 --> $DIR/from_str_radix_10.rs:19:5
| |
LL | isize::from_str_radix("100", 10)?; LL | isize::from_str_radix("100", 10)?;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `("100").parse()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `("100").parse()`
error: This call to `from_str_radix` can be shortened to a call to str::parse error: this call to `from_str_radix` can be replaced with a call to `str::parse`
--> $DIR/from_str_radix_10.rs:20:5 --> $DIR/from_str_radix_10.rs:20:5
| |
LL | u8::from_str_radix("7", 10)?; LL | u8::from_str_radix("7", 10)?;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `("7").parse()` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `("7").parse()`
error: This call to `from_str_radix` can be shortened to a call to str::parse error: this call to `from_str_radix` can be replaced with a call to `str::parse`
--> $DIR/from_str_radix_10.rs:23:5 --> $DIR/from_str_radix_10.rs:23:5
| |
LL | i32::from_str_radix(string, 10)?; LL | i32::from_str_radix(string, 10)?;