Add redundant_as_str lint
This lint checks for `as_str` on a `String` immediately followed by `as_bytes` or `is_empty` as those methods are available on `String` too. This could possibly also be extended to `&[u8]` in the future.
This commit is contained in:
parent
251a475b72
commit
1c9f3bef8b
@ -5281,6 +5281,7 @@ Released 2018-09-13
|
|||||||
[`readonly_write_lock`]: https://rust-lang.github.io/rust-clippy/master/index.html#readonly_write_lock
|
[`readonly_write_lock`]: https://rust-lang.github.io/rust-clippy/master/index.html#readonly_write_lock
|
||||||
[`recursive_format_impl`]: https://rust-lang.github.io/rust-clippy/master/index.html#recursive_format_impl
|
[`recursive_format_impl`]: https://rust-lang.github.io/rust-clippy/master/index.html#recursive_format_impl
|
||||||
[`redundant_allocation`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_allocation
|
[`redundant_allocation`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_allocation
|
||||||
|
[`redundant_as_str`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_as_str
|
||||||
[`redundant_async_block`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_async_block
|
[`redundant_async_block`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_async_block
|
||||||
[`redundant_at_rest_pattern`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_at_rest_pattern
|
[`redundant_at_rest_pattern`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_at_rest_pattern
|
||||||
[`redundant_clone`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_clone
|
[`redundant_clone`]: https://rust-lang.github.io/rust-clippy/master/index.html#redundant_clone
|
||||||
|
@ -403,6 +403,7 @@
|
|||||||
crate::methods::RANGE_ZIP_WITH_LEN_INFO,
|
crate::methods::RANGE_ZIP_WITH_LEN_INFO,
|
||||||
crate::methods::READONLY_WRITE_LOCK_INFO,
|
crate::methods::READONLY_WRITE_LOCK_INFO,
|
||||||
crate::methods::READ_LINE_WITHOUT_TRIM_INFO,
|
crate::methods::READ_LINE_WITHOUT_TRIM_INFO,
|
||||||
|
crate::methods::REDUNDANT_AS_STR_INFO,
|
||||||
crate::methods::REPEAT_ONCE_INFO,
|
crate::methods::REPEAT_ONCE_INFO,
|
||||||
crate::methods::RESULT_MAP_OR_INTO_OPTION_INFO,
|
crate::methods::RESULT_MAP_OR_INTO_OPTION_INFO,
|
||||||
crate::methods::SEARCH_IS_SOME_INFO,
|
crate::methods::SEARCH_IS_SOME_INFO,
|
||||||
|
@ -78,6 +78,7 @@
|
|||||||
mod range_zip_with_len;
|
mod range_zip_with_len;
|
||||||
mod read_line_without_trim;
|
mod read_line_without_trim;
|
||||||
mod readonly_write_lock;
|
mod readonly_write_lock;
|
||||||
|
mod redundant_as_str;
|
||||||
mod repeat_once;
|
mod repeat_once;
|
||||||
mod search_is_some;
|
mod search_is_some;
|
||||||
mod seek_from_current;
|
mod seek_from_current;
|
||||||
@ -3605,6 +3606,32 @@
|
|||||||
"attempting to compare file extensions using `Path::ends_with`"
|
"attempting to compare file extensions using `Path::ends_with`"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
declare_clippy_lint! {
|
||||||
|
/// ### What it does
|
||||||
|
/// Checks for usage of `as_str()` on a `String`` chained with a method available on the `String` itself.
|
||||||
|
///
|
||||||
|
/// ### Why is this bad?
|
||||||
|
/// The `as_str()` conversion is pointless and can be removed for simplicity and cleanliness.
|
||||||
|
///
|
||||||
|
/// ### Example
|
||||||
|
/// ```rust
|
||||||
|
/// # #![allow(unused)]
|
||||||
|
/// let owned_string = "This is a string".to_owned();
|
||||||
|
/// owned_string.as_str().as_bytes()
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
|
/// Use instead:
|
||||||
|
/// ```rust
|
||||||
|
/// # #![allow(unused)]
|
||||||
|
/// let owned_string = "This is a string".to_owned();
|
||||||
|
/// owned_string.as_bytes()
|
||||||
|
/// ```
|
||||||
|
#[clippy::version = "1.74.0"]
|
||||||
|
pub REDUNDANT_AS_STR,
|
||||||
|
complexity,
|
||||||
|
"`as_str` used to call a method on `str` that is also available on `String`"
|
||||||
|
}
|
||||||
|
|
||||||
pub struct Methods {
|
pub struct Methods {
|
||||||
avoid_breaking_exported_api: bool,
|
avoid_breaking_exported_api: bool,
|
||||||
msrv: Msrv,
|
msrv: Msrv,
|
||||||
@ -3749,6 +3776,7 @@ pub fn new(
|
|||||||
READONLY_WRITE_LOCK,
|
READONLY_WRITE_LOCK,
|
||||||
ITER_OUT_OF_BOUNDS,
|
ITER_OUT_OF_BOUNDS,
|
||||||
PATH_ENDS_WITH_EXT,
|
PATH_ENDS_WITH_EXT,
|
||||||
|
REDUNDANT_AS_STR,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
/// Extracts a method call name, args, and `Span` of the method name.
|
/// Extracts a method call name, args, and `Span` of the method name.
|
||||||
@ -3975,6 +4003,7 @@ fn check_methods<'tcx>(&self, cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>) {
|
|||||||
("as_deref" | "as_deref_mut", []) => {
|
("as_deref" | "as_deref_mut", []) => {
|
||||||
needless_option_as_deref::check(cx, expr, recv, name);
|
needless_option_as_deref::check(cx, expr, recv, name);
|
||||||
},
|
},
|
||||||
|
("as_bytes" | "is_empty", []) => if let Some(("as_str", recv, [], as_str_span, _)) = method_call(recv) { redundant_as_str::check(cx, expr, recv, as_str_span, span); },
|
||||||
("as_mut", []) => useless_asref::check(cx, expr, "as_mut", recv),
|
("as_mut", []) => useless_asref::check(cx, expr, "as_mut", recv),
|
||||||
("as_ref", []) => useless_asref::check(cx, expr, "as_ref", recv),
|
("as_ref", []) => useless_asref::check(cx, expr, "as_ref", recv),
|
||||||
("assume_init", []) => uninit_assumed_init::check(cx, expr, recv),
|
("assume_init", []) => uninit_assumed_init::check(cx, expr, recv),
|
||||||
|
34
clippy_lints/src/methods/redundant_as_str.rs
Normal file
34
clippy_lints/src/methods/redundant_as_str.rs
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
use super::REDUNDANT_AS_STR;
|
||||||
|
use clippy_utils::diagnostics::span_lint_and_sugg;
|
||||||
|
use clippy_utils::source::snippet_with_applicability;
|
||||||
|
use rustc_errors::Applicability;
|
||||||
|
use rustc_hir::Expr;
|
||||||
|
use rustc_lint::LateContext;
|
||||||
|
use rustc_middle::query::Key;
|
||||||
|
use rustc_span::Span;
|
||||||
|
|
||||||
|
pub(super) fn check(
|
||||||
|
cx: &LateContext<'_>,
|
||||||
|
_expr: &Expr<'_>,
|
||||||
|
recv: &Expr<'_>,
|
||||||
|
as_str_span: Span,
|
||||||
|
other_method_span: Span,
|
||||||
|
) {
|
||||||
|
if cx
|
||||||
|
.tcx
|
||||||
|
.lang_items()
|
||||||
|
.string()
|
||||||
|
.is_some_and(|id| Some(id) == cx.typeck_results().expr_ty(recv).ty_adt_id())
|
||||||
|
{
|
||||||
|
let mut applicability = Applicability::MachineApplicable;
|
||||||
|
span_lint_and_sugg(
|
||||||
|
cx,
|
||||||
|
REDUNDANT_AS_STR,
|
||||||
|
as_str_span.to(other_method_span),
|
||||||
|
"this `as_str` is redundant and can be removed as the method immediately following exists on `String` too",
|
||||||
|
"try",
|
||||||
|
snippet_with_applicability(cx, other_method_span, "..", &mut applicability).into_owned(),
|
||||||
|
applicability,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
6
tests/ui/redundant_as_str.fixed
Normal file
6
tests/ui/redundant_as_str.fixed
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
#![warn(clippy::redundant_as_str)]
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let _redundant = "Hello, world!".to_owned().as_bytes();
|
||||||
|
let _redundant = "Hello, world!".to_owned().is_empty();
|
||||||
|
}
|
6
tests/ui/redundant_as_str.rs
Normal file
6
tests/ui/redundant_as_str.rs
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
#![warn(clippy::redundant_as_str)]
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
let _redundant = "Hello, world!".to_owned().as_str().as_bytes();
|
||||||
|
let _redundant = "Hello, world!".to_owned().as_str().is_empty();
|
||||||
|
}
|
17
tests/ui/redundant_as_str.stderr
Normal file
17
tests/ui/redundant_as_str.stderr
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
error: this `as_str` is redundant and can be removed as the method immediately following exists on `String` too
|
||||||
|
--> $DIR/redundant_as_str.rs:4:49
|
||||||
|
|
|
||||||
|
LL | let _redundant = "Hello, world!".to_owned().as_str().as_bytes();
|
||||||
|
| ^^^^^^^^^^^^^^^^^ help: try: `as_bytes`
|
||||||
|
|
|
||||||
|
= note: `-D clippy::redundant-as-str` implied by `-D warnings`
|
||||||
|
= help: to override `-D warnings` add `#[allow(clippy::redundant_as_str)]`
|
||||||
|
|
||||||
|
error: this `as_str` is redundant and can be removed as the method immediately following exists on `String` too
|
||||||
|
--> $DIR/redundant_as_str.rs:5:49
|
||||||
|
|
|
||||||
|
LL | let _redundant = "Hello, world!".to_owned().as_str().is_empty();
|
||||||
|
| ^^^^^^^^^^^^^^^^^ help: try: `is_empty`
|
||||||
|
|
||||||
|
error: aborting due to 2 previous errors
|
||||||
|
|
Loading…
Reference in New Issue
Block a user