Skip to content

Commit 2dfab75

Browse files
committed
fix ci/cd error
1 parent bf1a276 commit 2dfab75

File tree

4 files changed

+40
-10
lines changed

4 files changed

+40
-10
lines changed

clippy_lints/src/operators/identity_op.rs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,12 +262,18 @@ fn is_expr_used_with_type_annotation<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx E
262262
/// Check if the expression is an associated function without a type instance.
263263
/// Example:
264264
/// ```
265-
/// Default::default()
266-
/// // Or
267265
/// trait Def {
268-
/// fn def() -> Self;
266+
/// fn def() -> Self;
267+
/// }
268+
/// impl Def for usize {
269+
/// fn def() -> Self {
270+
/// 0
271+
/// }
272+
/// }
273+
/// fn test() {
274+
/// let _ = 0usize + &Default::default();
275+
/// let _ = 0usize + &Def::def();
269276
/// }
270-
/// Def::def()
271277
/// ```
272278
fn is_assoc_fn_without_type_instance<'tcx>(cx: &LateContext<'tcx>, expr: &Expr<'tcx>) -> bool {
273279
if let ExprKind::Call(func, _) = peel_hir_expr_refs(expr).0.kind

tests/ui/identity_op.fixed

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,9 @@ fn issue_14932() {
318318

319319
0usize + &Default::default(); // no error
320320

321+
<usize as Default>::default();
322+
//~^ identity_op
323+
321324
let _ = usize::default();
322325
//~^ identity_op
323326

@@ -346,6 +349,9 @@ fn issue_14932_3() {
346349

347350
0usize + &Def::def(); // no error
348351

352+
<usize as Def>::def();
353+
//~^ identity_op
354+
349355
let _ = usize::def();
350356
//~^ identity_op
351357

tests/ui/identity_op.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,9 @@ fn issue_14932() {
318318

319319
0usize + &Default::default(); // no error
320320

321+
0usize + &<usize as Default>::default();
322+
//~^ identity_op
323+
321324
let _ = 0usize + &usize::default();
322325
//~^ identity_op
323326

@@ -346,6 +349,9 @@ fn issue_14932_3() {
346349

347350
0usize + &Def::def(); // no error
348351

352+
0usize + &<usize as Def>::def();
353+
//~^ identity_op
354+
349355
let _ = 0usize + &usize::def();
350356
//~^ identity_op
351357

tests/ui/identity_op.stderr

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -380,34 +380,46 @@ LL | let _: u64 = 1u64 + ((x as i32 + y as i32) as u64 + 0u64);
380380
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider reducing it to: `((x as i32 + y as i32) as u64)`
381381

382382
error: this operation has no effect
383-
--> tests/ui/identity_op.rs:321:13
383+
--> tests/ui/identity_op.rs:321:5
384+
|
385+
LL | 0usize + &<usize as Default>::default();
386+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider reducing it to: `<usize as Default>::default()`
387+
388+
error: this operation has no effect
389+
--> tests/ui/identity_op.rs:324:13
384390
|
385391
LL | let _ = 0usize + &usize::default();
386392
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider reducing it to: `usize::default()`
387393

388394
error: this operation has no effect
389-
--> tests/ui/identity_op.rs:324:21
395+
--> tests/ui/identity_op.rs:327:21
390396
|
391397
LL | let _n: usize = 0usize + &Default::default();
392398
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider reducing it to: `Default::default()`
393399

394400
error: this operation has no effect
395-
--> tests/ui/identity_op.rs:330:5
401+
--> tests/ui/identity_op.rs:333:5
396402
|
397403
LL | 0usize + &Default::default()
398404
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider reducing it to: `Default::default()`
399405

400406
error: this operation has no effect
401-
--> tests/ui/identity_op.rs:349:13
407+
--> tests/ui/identity_op.rs:352:5
408+
|
409+
LL | 0usize + &<usize as Def>::def();
410+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider reducing it to: `<usize as Def>::def()`
411+
412+
error: this operation has no effect
413+
--> tests/ui/identity_op.rs:355:13
402414
|
403415
LL | let _ = 0usize + &usize::def();
404416
| ^^^^^^^^^^^^^^^^^^^^^^ help: consider reducing it to: `usize::def()`
405417

406418
error: this operation has no effect
407-
--> tests/ui/identity_op.rs:352:21
419+
--> tests/ui/identity_op.rs:358:21
408420
|
409421
LL | let _n: usize = 0usize + &Def::def();
410422
| ^^^^^^^^^^^^^^^^^^^^ help: consider reducing it to: `Def::def()`
411423

412-
error: aborting due to 68 previous errors
424+
error: aborting due to 70 previous errors
413425

0 commit comments

Comments
 (0)