Skip to content

Commit 4c7bc17

Browse files
Centri3Centri3
committed
ignore more type aliases in unnecessary_cast
ignore more type aliases in unnecessary_cast
1 parent f93df98 commit 4c7bc17

File tree

4 files changed

+72
-27
lines changed

4 files changed

+72
-27
lines changed

‎clippy_lints/src/casts/unnecessary_cast.rs‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ use if_chain::if_chain;
66
use rustc_ast::{LitFloatType, LitIntType, LitKind};
77
use rustc_errors::Applicability;
88
use rustc_hir::def::Res;
9-
use rustc_hir::{Expr, ExprKind, Lit, QPath, TyKind, UnOp};
9+
use rustc_hir::{Expr, ExprKind, Lit, Node, Path, QPath, TyKind, UnOp};
1010
use rustc_lint::{LateContext, LintContext};
1111
use rustc_middle::lint::in_external_macro;
1212
use rustc_middle::ty::{self, FloatTy, InferTy, Ty};
1313

1414
use super::UNNECESSARY_CAST;
1515

16+
#[expect(clippy::too_many_lines)]
1617
pub(super) fn check<'tcx>(
1718
cx: &LateContext<'tcx>,
1819
expr: &Expr<'tcx>,
@@ -58,7 +59,31 @@ pub(super) fn check<'tcx>(
5859
}
5960
}
6061

61-
// skip non-primitive type cast
62+
// skip cast of local to type alias
63+
if let ExprKind::Cast(inner, ..) = expr.kind
64+
&& let ExprKind::Path(qpath) = inner.kind
65+
&& let QPath::Resolved(None, Path { res, .. }) = qpath
66+
&& let Res::Local(hir_id) = res
67+
&& let parent = cx.tcx.hir().get_parent(*hir_id)
68+
&& let Node::Local(local) = parent
69+
{
70+
if let Some(ty) = local.ty
71+
&& let TyKind::Path(qpath) = ty.kind
72+
&& is_ty_alias(&qpath)
73+
{
74+
return false;
75+
}
76+
77+
if let Some(expr) = local.init
78+
&& let ExprKind::Cast(.., cast_to) = expr.kind
79+
&& let TyKind::Path(qpath) = cast_to.kind
80+
&& is_ty_alias(&qpath)
81+
{
82+
return false;
83+
}
84+
}
85+
86+
// skip cast to non-primitive type
6287
if_chain! {
6388
if let ExprKind::Cast(_, cast_to) = expr.kind;
6489
if let TyKind::Path(QPath::Resolved(_, path)) = &cast_to.kind;

‎tests/ui/unnecessary_cast.fixed‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,22 @@ fn main() {
6666
foo!(b, f32);
6767
foo!(c, f64);
6868

69+
// do not lint cast from cfg-dependant type
70+
let x = 0 as std::ffi::c_ulong;
71+
let y = x as u64;
72+
let x: std::ffi::c_ulong = 0;
73+
let y = x as u64;
74+
6975
// do not lint cast to cfg-dependant type
70-
1 as std::os::raw::c_char;
76+
let x = 1 as std::os::raw::c_char;
77+
let y = x as u64;
7178

7279
// do not lint cast to alias type
7380
1 as I32Alias;
7481
&1 as &I32Alias;
82+
// or from
83+
let x: I32Alias = 1;
84+
let y = x as u64;
7585

7686
let i8_ptr: *const i8 = &1;
7787
let u8_ptr: *const u8 = &1;

‎tests/ui/unnecessary_cast.rs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,22 @@ fn main() {
6666
foo!(b, f32);
6767
foo!(c, f64);
6868

69+
// do not lint cast from cfg-dependant type
70+
let x = 0 as std::ffi::c_ulong;
71+
let y = x as u64;
72+
let x: std::ffi::c_ulong = 0;
73+
let y = x as u64;
74+
6975
// do not lint cast to cfg-dependant type
70-
1 as std::os::raw::c_char;
76+
let x = 1 as std::os::raw::c_char;
77+
let y = x as u64;
7178

7279
// do not lint cast to alias type
7380
1 as I32Alias;
7481
&1 as &I32Alias;
82+
// or from
83+
let x: I32Alias = 1;
84+
let y = x as u64;
7585

7686
let i8_ptr: *const i8 = &1;
7787
let u8_ptr: *const u8 = &1;

‎tests/ui/unnecessary_cast.stderr‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -91,139 +91,139 @@ LL | uwu::<u32, u32>([1u32].as_ptr()) as *const u32;
9191
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try: `uwu::<u32, u32>([1u32].as_ptr())`
9292

9393
error: casting integer literal to `f32` is unnecessary
94-
--> $DIR/unnecessary_cast.rs:106:9
94+
--> $DIR/unnecessary_cast.rs:117:9
9595
|
9696
LL | 100 as f32;
9797
| ^^^^^^^^^^ help: try: `100_f32`
9898

9999
error: casting integer literal to `f64` is unnecessary
100-
--> $DIR/unnecessary_cast.rs:107:9
100+
--> $DIR/unnecessary_cast.rs:118:9
101101
|
102102
LL | 100 as f64;
103103
| ^^^^^^^^^^ help: try: `100_f64`
104104

105105
error: casting integer literal to `f64` is unnecessary
106-
--> $DIR/unnecessary_cast.rs:108:9
106+
--> $DIR/unnecessary_cast.rs:119:9
107107
|
108108
LL | 100_i32 as f64;
109109
| ^^^^^^^^^^^^^^ help: try: `100_f64`
110110

111111
error: casting integer literal to `f32` is unnecessary
112-
--> $DIR/unnecessary_cast.rs:109:17
112+
--> $DIR/unnecessary_cast.rs:120:17
113113
|
114114
LL | let _ = -100 as f32;
115115
| ^^^^^^^^^^^ help: try: `-100_f32`
116116

117117
error: casting integer literal to `f64` is unnecessary
118-
--> $DIR/unnecessary_cast.rs:110:17
118+
--> $DIR/unnecessary_cast.rs:121:17
119119
|
120120
LL | let _ = -100 as f64;
121121
| ^^^^^^^^^^^ help: try: `-100_f64`
122122

123123
error: casting integer literal to `f64` is unnecessary
124-
--> $DIR/unnecessary_cast.rs:111:17
124+
--> $DIR/unnecessary_cast.rs:122:17
125125
|
126126
LL | let _ = -100_i32 as f64;
127127
| ^^^^^^^^^^^^^^^ help: try: `-100_f64`
128128

129129
error: casting float literal to `f32` is unnecessary
130-
--> $DIR/unnecessary_cast.rs:112:9
130+
--> $DIR/unnecessary_cast.rs:123:9
131131
|
132132
LL | 100. as f32;
133133
| ^^^^^^^^^^^ help: try: `100_f32`
134134

135135
error: casting float literal to `f64` is unnecessary
136-
--> $DIR/unnecessary_cast.rs:113:9
136+
--> $DIR/unnecessary_cast.rs:124:9
137137
|
138138
LL | 100. as f64;
139139
| ^^^^^^^^^^^ help: try: `100_f64`
140140

141141
error: casting integer literal to `u32` is unnecessary
142-
--> $DIR/unnecessary_cast.rs:125:9
142+
--> $DIR/unnecessary_cast.rs:136:9
143143
|
144144
LL | 1 as u32;
145145
| ^^^^^^^^ help: try: `1_u32`
146146

147147
error: casting integer literal to `i32` is unnecessary
148-
--> $DIR/unnecessary_cast.rs:126:9
148+
--> $DIR/unnecessary_cast.rs:137:9
149149
|
150150
LL | 0x10 as i32;
151151
| ^^^^^^^^^^^ help: try: `0x10_i32`
152152

153153
error: casting integer literal to `usize` is unnecessary
154-
--> $DIR/unnecessary_cast.rs:127:9
154+
--> $DIR/unnecessary_cast.rs:138:9
155155
|
156156
LL | 0b10 as usize;
157157
| ^^^^^^^^^^^^^ help: try: `0b10_usize`
158158

159159
error: casting integer literal to `u16` is unnecessary
160-
--> $DIR/unnecessary_cast.rs:128:9
160+
--> $DIR/unnecessary_cast.rs:139:9
161161
|
162162
LL | 0o73 as u16;
163163
| ^^^^^^^^^^^ help: try: `0o73_u16`
164164

165165
error: casting integer literal to `u32` is unnecessary
166-
--> $DIR/unnecessary_cast.rs:129:9
166+
--> $DIR/unnecessary_cast.rs:140:9
167167
|
168168
LL | 1_000_000_000 as u32;
169169
| ^^^^^^^^^^^^^^^^^^^^ help: try: `1_000_000_000_u32`
170170

171171
error: casting float literal to `f64` is unnecessary
172-
--> $DIR/unnecessary_cast.rs:131:9
172+
--> $DIR/unnecessary_cast.rs:142:9
173173
|
174174
LL | 1.0 as f64;
175175
| ^^^^^^^^^^ help: try: `1.0_f64`
176176

177177
error: casting float literal to `f32` is unnecessary
178-
--> $DIR/unnecessary_cast.rs:132:9
178+
--> $DIR/unnecessary_cast.rs:143:9
179179
|
180180
LL | 0.5 as f32;
181181
| ^^^^^^^^^^ help: try: `0.5_f32`
182182

183183
error: casting integer literal to `i32` is unnecessary
184-
--> $DIR/unnecessary_cast.rs:136:17
184+
--> $DIR/unnecessary_cast.rs:147:17
185185
|
186186
LL | let _ = -1 as i32;
187187
| ^^^^^^^^^ help: try: `-1_i32`
188188

189189
error: casting float literal to `f32` is unnecessary
190-
--> $DIR/unnecessary_cast.rs:137:17
190+
--> $DIR/unnecessary_cast.rs:148:17
191191
|
192192
LL | let _ = -1.0 as f32;
193193
| ^^^^^^^^^^^ help: try: `-1.0_f32`
194194

195195
error: casting to the same type is unnecessary (`i32` -> `i32`)
196-
--> $DIR/unnecessary_cast.rs:143:18
196+
--> $DIR/unnecessary_cast.rs:154:18
197197
|
198198
LL | let _ = &(x as i32);
199199
| ^^^^^^^^^^ help: try: `{ x }`
200200

201201
error: casting integer literal to `i32` is unnecessary
202-
--> $DIR/unnecessary_cast.rs:149:22
202+
--> $DIR/unnecessary_cast.rs:160:22
203203
|
204204
LL | let _: i32 = -(1) as i32;
205205
| ^^^^^^^^^^^ help: try: `-1_i32`
206206

207207
error: casting integer literal to `i64` is unnecessary
208-
--> $DIR/unnecessary_cast.rs:151:22
208+
--> $DIR/unnecessary_cast.rs:162:22
209209
|
210210
LL | let _: i64 = -(1) as i64;
211211
| ^^^^^^^^^^^ help: try: `-1_i64`
212212

213213
error: casting float literal to `f64` is unnecessary
214-
--> $DIR/unnecessary_cast.rs:158:22
214+
--> $DIR/unnecessary_cast.rs:169:22
215215
|
216216
LL | let _: f64 = (-8.0 as f64).exp();
217217
| ^^^^^^^^^^^^^ help: try: `(-8.0_f64)`
218218

219219
error: casting float literal to `f64` is unnecessary
220-
--> $DIR/unnecessary_cast.rs:160:23
220+
--> $DIR/unnecessary_cast.rs:171:23
221221
|
222222
LL | let _: f64 = -(8.0 as f64).exp(); // should suggest `-8.0_f64.exp()` here not to change code behavior
223223
| ^^^^^^^^^^^^ help: try: `8.0_f64`
224224

225225
error: casting to the same type is unnecessary (`f32` -> `f32`)
226-
--> $DIR/unnecessary_cast.rs:168:20
226+
--> $DIR/unnecessary_cast.rs:179:20
227227
|
228228
LL | let _num = foo() as f32;
229229
| ^^^^^^^^^^^^ help: try: `foo()`

0 commit comments

Comments
 (0)