bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

fix

Browse source
This commit is contained in:
Deadbeef 2023-05-25 05:21:44 +00:00
parent 33ec4e4bb0
commit 626efab67f
11 changed files with 33 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_lint/messages.ftl
View file

@ -413,7 +413,7 @@ lint_non_upper_case_global = {$sort} `{$name}` should have an upper case name
lint_noop_method_call = call to `.{$method}()` on a reference in this situation does nothing lint_noop_method_call = call to `.{$method}()` on a reference in this situation does nothing
.label = unnecessary method call .label = unnecessary method call
.note = the type `{$receiver_ty}` which `{$method}` is being called on is the same as the type returned from `{$method}`, so the method call does not do anything and can be removed .note = the type `{$orig_ty}` does not implement `{$trait_}`, so calling `{$method}` on `&{$orig_ty}` copies the reference, which does not do anything and can be removed
lint_only_cast_u8_to_char = only `u8` can be cast into `char` lint_only_cast_u8_to_char = only `u8` can be cast into `char`
.suggestion = use a `char` literal instead .suggestion = use a `char` literal instead

3
compiler/rustc_lint/src/lints.rs
View file

@ -1231,7 +1231,8 @@ pub enum NonUpperCaseGlobalSub {
#[note] #[note]
pub struct NoopMethodCallDiag<'a> { pub struct NoopMethodCallDiag<'a> {
pub method: Symbol, pub method: Symbol,
pub receiver_ty: Ty<'a>, pub orig_ty: Ty<'a>,
pub trait_: Symbol,
#[label] #[label]
pub label: Span, pub label: Span,
} }

11
compiler/rustc_lint/src/noop_method_call.rs
View file

@ -85,10 +85,9 @@ impl<'tcx> LateLintPass<'tcx> for NoopMethodCall {
let Some(trait_id) = cx.tcx.trait_of_item(did) else { return }; let Some(trait_id) = cx.tcx.trait_of_item(did) else { return };
if !matches!( let Some(trait_) = cx.tcx.get_diagnostic_name(trait_id) else { return };
cx.tcx.get_diagnostic_name(trait_id),
Some(sym::Borrow | sym::Clone | sym::Deref) if !matches!(trait_, sym::Borrow | sym::Clone | sym::Deref) {
) {
return; return;
}; };
@ -113,11 +112,13 @@ impl<'tcx> LateLintPass<'tcx> for NoopMethodCall {
let expr_span = expr.span; let expr_span = expr.span;
let span = expr_span.with_lo(receiver.span.hi()); let span = expr_span.with_lo(receiver.span.hi());
let orig_ty = expr_ty.peel_refs();
if receiver_ty == expr_ty { if receiver_ty == expr_ty {
cx.emit_spanned_lint( cx.emit_spanned_lint(
NOOP_METHOD_CALL, NOOP_METHOD_CALL,
span, span,
NoopMethodCallDiag { method: call.ident.name, receiver_ty, label: span }, NoopMethodCallDiag { method: call.ident.name, orig_ty, trait_, label: span },
); );
} else { } else {
match name { match name {

3
compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs
View file

@ -41,7 +41,6 @@ use rustc_span::{BytePos, DesugaringKind, ExpnKind, MacroKind, Span, DUMMY_SP};
use rustc_target::spec::abi; use rustc_target::spec::abi;
use std::borrow::Cow; use std::borrow::Cow;
use std::iter; use std::iter;
use std::ops::Deref;
use super::InferCtxtPrivExt; use super::InferCtxtPrivExt;
use crate::infer::InferCtxtExt as _; use crate::infer::InferCtxtExt as _;
@ -3580,7 +3579,7 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
// to an associated type (as seen from `trait_pred`) in the predicate. Like in // to an associated type (as seen from `trait_pred`) in the predicate. Like in
// trait_pred `S: Sum<<Self as Iterator>::Item>` and predicate `i32: Sum<&()>` // trait_pred `S: Sum<<Self as Iterator>::Item>` and predicate `i32: Sum<&()>`
let mut type_diffs = vec![]; let mut type_diffs = vec![];
if let ObligationCauseCode::ExprBindingObligation(def_id, _, _, idx) = parent_code.deref() if let ObligationCauseCode::ExprBindingObligation(def_id, _, _, idx) = parent_code
&& let Some(node_args) = typeck_results.node_args_opt(call_hir_id) && let Some(node_args) = typeck_results.node_args_opt(call_hir_id)
&& let where_clauses = self.tcx.predicates_of(def_id).instantiate(self.tcx, node_args) && let where_clauses = self.tcx.predicates_of(def_id).instantiate(self.tcx, node_args)
&& let Some(where_pred) = where_clauses.predicates.get(*idx) && let Some(where_pred) = where_clauses.predicates.get(*idx)

1
library/core/benches/iter.rs
View file

@ -473,6 +473,7 @@ fn bench_next_chunk_copied(b: &mut Bencher) {
/// Exercises the TrustedRandomAccess specialization in ArrayChunks /// Exercises the TrustedRandomAccess specialization in ArrayChunks
#[bench] #[bench]
#[allow(noop_method_call)]
fn bench_next_chunk_trusted_random_access(b: &mut Bencher) { fn bench_next_chunk_trusted_random_access(b: &mut Bencher) {
let v = vec![1u8; 1024]; let v = vec![1u8; 1024];

1
src/tools/clippy/tests/ui/explicit_deref_methods.fixed
View file

@ -4,6 +4,7 @@
#![allow( #![allow(
clippy::borrow_deref_ref, clippy::borrow_deref_ref,
suspicious_double_ref_op, suspicious_double_ref_op,
noop_method_call,
clippy::explicit_auto_deref, clippy::explicit_auto_deref,
clippy::needless_borrow, clippy::needless_borrow,
clippy::no_effect, clippy::no_effect,

1
src/tools/clippy/tests/ui/explicit_deref_methods.rs
View file

@ -4,6 +4,7 @@
#![allow( #![allow(
clippy::borrow_deref_ref, clippy::borrow_deref_ref,
suspicious_double_ref_op, suspicious_double_ref_op,
noop_method_call,
clippy::explicit_auto_deref, clippy::explicit_auto_deref,
clippy::needless_borrow, clippy::needless_borrow,
clippy::no_effect, clippy::no_effect,

24
src/tools/clippy/tests/ui/explicit_deref_methods.stderr
View file

@ -1,5 +1,5 @@
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:54:19 --> $DIR/explicit_deref_methods.rs:55:19
| |
LL | let b: &str = a.deref(); LL | let b: &str = a.deref();
| ^^^^^^^^^ help: try: `&*a` | ^^^^^^^^^ help: try: `&*a`
@ -7,67 +7,67 @@ LL | let b: &str = a.deref();
= note: `-D clippy::explicit-deref-methods` implied by `-D warnings` = note: `-D clippy::explicit-deref-methods` implied by `-D warnings`
error: explicit `deref_mut` method call error: explicit `deref_mut` method call
--> $DIR/explicit_deref_methods.rs:56:23 --> $DIR/explicit_deref_methods.rs:57:23
| |
LL | let b: &mut str = a.deref_mut(); LL | let b: &mut str = a.deref_mut();
| ^^^^^^^^^^^^^ help: try: `&mut **a` | ^^^^^^^^^^^^^ help: try: `&mut **a`
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:59:39 --> $DIR/explicit_deref_methods.rs:60:39
| |
LL | let b: String = format!("{}, {}", a.deref(), a.deref()); LL | let b: String = format!("{}, {}", a.deref(), a.deref());
| ^^^^^^^^^ help: try: `&*a` | ^^^^^^^^^ help: try: `&*a`
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:59:50 --> $DIR/explicit_deref_methods.rs:60:50
| |
LL | let b: String = format!("{}, {}", a.deref(), a.deref()); LL | let b: String = format!("{}, {}", a.deref(), a.deref());
| ^^^^^^^^^ help: try: `&*a` | ^^^^^^^^^ help: try: `&*a`
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:61:20 --> $DIR/explicit_deref_methods.rs:62:20
| |
LL | println!("{}", a.deref()); LL | println!("{}", a.deref());
| ^^^^^^^^^ help: try: `&*a` | ^^^^^^^^^ help: try: `&*a`
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:64:11 --> $DIR/explicit_deref_methods.rs:65:11
| |
LL | match a.deref() { LL | match a.deref() {
| ^^^^^^^^^ help: try: `&*a` | ^^^^^^^^^ help: try: `&*a`
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:68:28 --> $DIR/explicit_deref_methods.rs:69:28
| |
LL | let b: String = concat(a.deref()); LL | let b: String = concat(a.deref());
| ^^^^^^^^^ help: try: `&*a` | ^^^^^^^^^ help: try: `&*a`
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:70:13 --> $DIR/explicit_deref_methods.rs:71:13
| |
LL | let b = just_return(a).deref(); LL | let b = just_return(a).deref();
| ^^^^^^^^^^^^^^^^^^^^^^ help: try: `just_return(a)` | ^^^^^^^^^^^^^^^^^^^^^^ help: try: `just_return(a)`
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:72:28 --> $DIR/explicit_deref_methods.rs:73:28
| |
LL | let b: String = concat(just_return(a).deref()); LL | let b: String = concat(just_return(a).deref());
| ^^^^^^^^^^^^^^^^^^^^^^ help: try: `just_return(a)` | ^^^^^^^^^^^^^^^^^^^^^^ help: try: `just_return(a)`
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:74:19 --> $DIR/explicit_deref_methods.rs:75:19
| |
LL | let b: &str = a.deref().deref(); LL | let b: &str = a.deref().deref();
| ^^^^^^^^^^^^^^^^^ help: try: `&**a` | ^^^^^^^^^^^^^^^^^ help: try: `&**a`
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:77:13 --> $DIR/explicit_deref_methods.rs:78:13
| |
LL | let b = opt_a.unwrap().deref(); LL | let b = opt_a.unwrap().deref();
| ^^^^^^^^^^^^^^^^^^^^^^ help: try: `&*opt_a.unwrap()` | ^^^^^^^^^^^^^^^^^^^^^^ help: try: `&*opt_a.unwrap()`
error: explicit `deref` method call error: explicit `deref` method call
--> $DIR/explicit_deref_methods.rs:114:31 --> $DIR/explicit_deref_methods.rs:115:31
| |
LL | let b: &str = expr_deref!(a.deref()); LL | let b: &str = expr_deref!(a.deref());
| ^^^^^^^^^ help: try: `&*a` | ^^^^^^^^^ help: try: `&*a`

2
src/tools/compiletest/src/lib.rs
View file

@ -1119,7 +1119,7 @@ fn check_overlapping_tests(found_paths: &BTreeSet<PathBuf>) {
for path in found_paths { for path in found_paths {
for ancestor in path.ancestors().skip(1) { for ancestor in path.ancestors().skip(1) {
if found_paths.contains(ancestor) { if found_paths.contains(ancestor) {
collisions.push((path, ancestor.clone())); collisions.push((path, ancestor));
} }
} }
} }

10
tests/ui/lint/noop-method-call.stderr
View file

@ -4,7 +4,7 @@ warning: call to `.clone()` on a reference in this situation does nothing
LL | let non_clone_type_ref_clone: &PlainType<u32> = non_clone_type_ref.clone(); LL | let non_clone_type_ref_clone: &PlainType<u32> = non_clone_type_ref.clone();
| ^^^^^^^^ unnecessary method call | ^^^^^^^^ unnecessary method call
| |
= note: the type `&PlainType<u32>` which `clone` is being called on is the same as the type returned from `clone`, so the method call does not do anything and can be removed = note: the type `PlainType<u32>` does not implement `Clone`, so calling `clone` on `&PlainType<u32>` copies the reference, which does not do anything and can be removed
= note: `#[warn(noop_method_call)]` on by default = note: `#[warn(noop_method_call)]` on by default
warning: using `.clone()` on a double reference, which returns `&CloneType<u32>` instead of cloning the inner type warning: using `.clone()` on a double reference, which returns `&CloneType<u32>` instead of cloning the inner type
@ -21,7 +21,7 @@ warning: call to `.deref()` on a reference in this situation does nothing
LL | let non_deref_type_deref: &PlainType<u32> = non_deref_type.deref(); LL | let non_deref_type_deref: &PlainType<u32> = non_deref_type.deref();
| ^^^^^^^^ unnecessary method call | ^^^^^^^^ unnecessary method call
| |
= note: the type `&PlainType<u32>` which `deref` is being called on is the same as the type returned from `deref`, so the method call does not do anything and can be removed = note: the type `PlainType<u32>` does not implement `Deref`, so calling `deref` on `&PlainType<u32>` copies the reference, which does not do anything and can be removed
warning: using `.deref()` on a double reference, which returns `&PlainType<u32>` instead of dereferencing the inner type warning: using `.deref()` on a double reference, which returns `&PlainType<u32>` instead of dereferencing the inner type
--> $DIR/noop-method-call.rs:30:63 --> $DIR/noop-method-call.rs:30:63
@ -35,7 +35,7 @@ warning: call to `.borrow()` on a reference in this situation does nothing
LL | let non_borrow_type_borrow: &PlainType<u32> = non_borrow_type.borrow(); LL | let non_borrow_type_borrow: &PlainType<u32> = non_borrow_type.borrow();
| ^^^^^^^^^ unnecessary method call | ^^^^^^^^^ unnecessary method call
| |
= note: the type `&PlainType<u32>` which `borrow` is being called on is the same as the type returned from `borrow`, so the method call does not do anything and can be removed = note: the type `PlainType<u32>` does not implement `Borrow`, so calling `borrow` on `&PlainType<u32>` copies the reference, which does not do anything and can be removed
warning: using `.clone()` on a double reference, which returns `&str` instead of cloning the inner type warning: using `.clone()` on a double reference, which returns `&str` instead of cloning the inner type
--> $DIR/noop-method-call.rs:42:44 --> $DIR/noop-method-call.rs:42:44
@ -49,7 +49,7 @@ warning: call to `.clone()` on a reference in this situation does nothing
LL | non_clone_type.clone(); LL | non_clone_type.clone();
| ^^^^^^^^ unnecessary method call | ^^^^^^^^ unnecessary method call
| |
= note: the type `&PlainType<T>` which `clone` is being called on is the same as the type returned from `clone`, so the method call does not do anything and can be removed = note: the type `PlainType<T>` does not implement `Clone`, so calling `clone` on `&PlainType<T>` copies the reference, which does not do anything and can be removed
warning: call to `.clone()` on a reference in this situation does nothing warning: call to `.clone()` on a reference in this situation does nothing
--> $DIR/noop-method-call.rs:52:19 --> $DIR/noop-method-call.rs:52:19
@ -57,7 +57,7 @@ warning: call to `.clone()` on a reference in this situation does nothing
LL | non_clone_type.clone(); LL | non_clone_type.clone();
| ^^^^^^^^ unnecessary method call | ^^^^^^^^ unnecessary method call
| |
= note: the type `&PlainType<u32>` which `clone` is being called on is the same as the type returned from `clone`, so the method call does not do anything and can be removed = note: the type `PlainType<u32>` does not implement `Clone`, so calling `clone` on `&PlainType<u32>` copies the reference, which does not do anything and can be removed
warning: 8 warnings emitted warning: 8 warnings emitted

4
tests/ui/lint/suspicious-double-ref-op.stderr
View file

@ -16,7 +16,7 @@ error: call to `.clone()` on a reference in this situation does nothing
LL | let _ = &mut encoded.clone(); LL | let _ = &mut encoded.clone();
| ^^^^^^^^ unnecessary method call | ^^^^^^^^ unnecessary method call
| |
= note: the type `&[u8]` which `clone` is being called on is the same as the type returned from `clone`, so the method call does not do anything and can be removed = note: the type `[u8]` does not implement `Clone`, so calling `clone` on `&[u8]` copies the reference, which does not do anything and can be removed
note: the lint level is defined here note: the lint level is defined here
--> $DIR/suspicious-double-ref-op.rs:2:35 --> $DIR/suspicious-double-ref-op.rs:2:35
| |
@ -29,7 +29,7 @@ error: call to `.clone()` on a reference in this situation does nothing
LL | let _ = &encoded.clone(); LL | let _ = &encoded.clone();
| ^^^^^^^^ unnecessary method call | ^^^^^^^^ unnecessary method call
| |
= note: the type `&[u8]` which `clone` is being called on is the same as the type returned from `clone`, so the method call does not do anything and can be removed = note: the type `[u8]` does not implement `Clone`, so calling `clone` on `&[u8]` copies the reference, which does not do anything and can be removed
error: aborting due to 3 previous errors error: aborting due to 3 previous errors