Skip to content

Commit a4bf97b

Browse files
flip1995flip1995
committed
Merge from rustc
2 parents a1c267b + 357887d commit a4bf97b

12 files changed

+31
-53
lines changed

‎clippy_lints/src/from_over_into.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,6 @@ fn convert_to_from(
181181
let from = snippet_opt(cx, self_ty.span)?;
182182
let into = snippet_opt(cx, target_ty.span)?;
183183

184-
let return_type = matches!(sig.decl.output, FnRetTy::Return(_))
185-
.then_some(String::from("Self"))
186-
.unwrap_or_default();
187184
let mut suggestions = vec![
188185
// impl Into<T> for U -> impl From<T> for U
189186
// ~~~~ ~~~~
@@ -200,10 +197,13 @@ fn convert_to_from(
200197
// fn into([mut] self) -> T -> fn into([mut] v: T) -> T
201198
// ~~~~ ~~~~
202199
(self_ident.span, format!("val: {from}")),
200+
];
201+
202+
if let FnRetTy::Return(_) = sig.decl.output {
203203
// fn into(self) -> T -> fn into(self) -> Self
204204
// ~ ~~~~
205-
(sig.decl.output.span(), return_type),
206-
];
205+
suggestions.push((sig.decl.output.span(), String::from("Self")));
206+
}
207207

208208
let mut finder = SelfFinder {
209209
cx,

‎clippy_lints/src/methods/unnecessary_sort_by.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ use clippy_utils::ty::implements_trait;
55
use rustc_errors::Applicability;
66
use rustc_hir::{Closure, Expr, ExprKind, Mutability, Param, Pat, PatKind, Path, PathSegment, QPath};
77
use rustc_lint::LateContext;
8-
use rustc_middle::ty;
9-
use rustc_middle::ty::GenericArgKind;
8+
use rustc_middle::ty::{self, GenericArgKind};
109
use rustc_span::sym;
1110
use rustc_span::symbol::Ident;
1211
use std::iter;

‎clippy_lints/src/mutable_debug_assertion.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@ impl<'a, 'tcx> Visitor<'tcx> for MutArgVisitor<'a, 'tcx> {
9696
self.found = true;
9797
return;
9898
},
99+
ExprKind::If(..) => {
100+
self.found = true;
101+
return;
102+
},
99103
ExprKind::Path(_) => {
100104
if let Some(adj) = self.cx.typeck_results().adjustments().get(expr.hir_id) {
101105
if adj

‎tests/ui-internal/unnecessary_def_path_hardcoded_path.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ LL | const DEREF_MUT_TRAIT: [&str; 4] = ["core", "ops", "deref", "DerefMut"]
1919
error: hardcoded path to a diagnostic item
2020
--> tests/ui-internal/unnecessary_def_path_hardcoded_path.rs:12:43
2121
|
22-
LL | const DEREF_TRAIT_METHOD: [&str; 5] = ["core", "ops", "deref", "Deref", "deref"];
23-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
22+
LL | const OPS_MOD: [&str; 5] = ["core", "ops"];
23+
| ^^^^^^^^^^^^^^^
2424
|
2525
= help: convert all references to use `sym::deref_method`
2626

‎tests/ui/derive.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![allow(clippy::non_canonical_clone_impl, clippy::non_canonical_partial_ord_impl, dead_code)]
22
#![warn(clippy::expl_impl_clone_on_copy)]
33

4+
45
#[derive(Copy)]
56
struct Qux;
67

‎tests/ui/derive.stderr‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: you are implementing `Clone` explicitly on a `Copy` type
2-
--> tests/ui/derive.rs:7:1
2+
--> tests/ui/derive.rs:8:1
33
|
44
LL | / impl Clone for Qux {
55
LL | |
@@ -10,7 +10,7 @@ LL | | }
1010
| |_^
1111
|
1212
note: consider deriving `Clone` or removing `Copy`
13-
--> tests/ui/derive.rs:7:1
13+
--> tests/ui/derive.rs:8:1
1414
|
1515
LL | / impl Clone for Qux {
1616
LL | |
@@ -23,7 +23,7 @@ LL | | }
2323
= help: to override `-D warnings` add `#[allow(clippy::expl_impl_clone_on_copy)]`
2424

2525
error: you are implementing `Clone` explicitly on a `Copy` type
26-
--> tests/ui/derive.rs:32:1
26+
--> tests/ui/derive.rs:33:1
2727
|
2828
LL | / impl<'a> Clone for Lt<'a> {
2929
LL | |
@@ -34,7 +34,7 @@ LL | | }
3434
| |_^
3535
|
3636
note: consider deriving `Clone` or removing `Copy`
37-
--> tests/ui/derive.rs:32:1
37+
--> tests/ui/derive.rs:33:1
3838
|
3939
LL | / impl<'a> Clone for Lt<'a> {
4040
LL | |
@@ -45,7 +45,7 @@ LL | | }
4545
| |_^
4646

4747
error: you are implementing `Clone` explicitly on a `Copy` type
48-
--> tests/ui/derive.rs:44:1
48+
--> tests/ui/derive.rs:45:1
4949
|
5050
LL | / impl Clone for BigArray {
5151
LL | |
@@ -56,7 +56,7 @@ LL | | }
5656
| |_^
5757
|
5858
note: consider deriving `Clone` or removing `Copy`
59-
--> tests/ui/derive.rs:44:1
59+
--> tests/ui/derive.rs:45:1
6060
|
6161
LL | / impl Clone for BigArray {
6262
LL | |
@@ -67,7 +67,7 @@ LL | | }
6767
| |_^
6868

6969
error: you are implementing `Clone` explicitly on a `Copy` type
70-
--> tests/ui/derive.rs:56:1
70+
--> tests/ui/derive.rs:57:1
7171
|
7272
LL | / impl Clone for FnPtr {
7373
LL | |
@@ -78,7 +78,7 @@ LL | | }
7878
| |_^
7979
|
8080
note: consider deriving `Clone` or removing `Copy`
81-
--> tests/ui/derive.rs:56:1
81+
--> tests/ui/derive.rs:57:1
8282
|
8383
LL | / impl Clone for FnPtr {
8484
LL | |
@@ -89,7 +89,7 @@ LL | | }
8989
| |_^
9090

9191
error: you are implementing `Clone` explicitly on a `Copy` type
92-
--> tests/ui/derive.rs:77:1
92+
--> tests/ui/derive.rs:78:1
9393
|
9494
LL | / impl<T: Clone> Clone for Generic2<T> {
9595
LL | |
@@ -100,7 +100,7 @@ LL | | }
100100
| |_^
101101
|
102102
note: consider deriving `Clone` or removing `Copy`
103-
--> tests/ui/derive.rs:77:1
103+
--> tests/ui/derive.rs:78:1
104104
|
105105
LL | / impl<T: Clone> Clone for Generic2<T> {
106106
LL | |

‎tests/ui/needless_doc_main.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@
1010
/// unimplemented!();
1111
/// }
1212
/// ```
13-
///
13+
///
1414
/// With an explicit return type it should lint too
1515
/// ```edition2015
1616
/// fn main() -> () {
1717
//~^ ERROR: needless `fn main` in doctest
1818
/// unimplemented!();
1919
/// }
2020
/// ```
21-
///
21+
///
2222
/// This should, too.
2323
/// ```rust
2424
/// fn main() {
2525
//~^ ERROR: needless `fn main` in doctest
2626
/// unimplemented!();
2727
/// }
2828
/// ```
29-
///
29+
///
3030
/// This one too.
3131
/// ```no_run
3232
/// // the fn is not always the first line

‎tests/ui/temporary_assignment.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![warn(clippy::temporary_assignment)]
2+
#![allow(const_item_mutation)]
23

34
use std::ops::{Deref, DerefMut};
45

‎tests/ui/temporary_assignment.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: assignment to temporary
2-
--> tests/ui/temporary_assignment.rs:47:5
2+
--> tests/ui/temporary_assignment.rs:48:5
33
|
44
LL | Struct { field: 0 }.field = 1;
55
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -8,7 +8,7 @@ LL | Struct { field: 0 }.field = 1;
88
= help: to override `-D warnings` add `#[allow(clippy::temporary_assignment)]`
99

1010
error: assignment to temporary
11-
--> tests/ui/temporary_assignment.rs:50:5
11+
--> tests/ui/temporary_assignment.rs:51:5
1212
|
1313
LL | / MultiStruct {
1414
LL | |
@@ -19,13 +19,13 @@ LL | | .field = 1;
1919
| |______________^
2020

2121
error: assignment to temporary
22-
--> tests/ui/temporary_assignment.rs:56:5
22+
--> tests/ui/temporary_assignment.rs:57:5
2323
|
2424
LL | ArrayStruct { array: [0] }.array[0] = 1;
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2626

2727
error: assignment to temporary
28-
--> tests/ui/temporary_assignment.rs:58:5
28+
--> tests/ui/temporary_assignment.rs:59:5
2929
|
3030
LL | (0, 0).0 = 1;
3131
| ^^^^^^^^^^^^

‎tests/ui/to_string_in_format_args_incremental.fixed‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)