nits

rust-lang · May 4, 2022 · 2b149c2 · 2b149c2
1 parent f37ed5d
commit 2b149c2
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/clippy_lints/src/strings.rs b/clippy_lints/src/strings.rs
@@ -491,10 +491,10 @@ impl<'tcx> LateLintPass<'tcx> for TrimSplitWhitespace {
                 span_lint_and_sugg(
                     cx,
                     TRIM_SPLIT_WHITESPACE,
-                    split_ws_span.with_lo(trim_span.lo()),
-                    format!("found call to `str::{}` before `str::split_whitespace`", trim_fn_name).as_str(),
-                    format!("remove `{}()`", trim_fn_name).as_str(),
-                    "split_whitespace()".to_string(),
+                    trim_span.with_hi(split_ws_span.lo()),
+                    &format!("found call to `str::{}` before `str::split_whitespace`", trim_fn_name),
+                    &format!("remove `{}()`", trim_fn_name),
+                    String::new(),
                     Applicability::MachineApplicable,
                 );
             }

diff --git a/tests/ui/trim_split_whitespace.fixed b/tests/ui/trim_split_whitespace.fixed
@@ -2,7 +2,7 @@
 #![warn(clippy::trim_split_whitespace)]
 #![allow(clippy::let_unit_value)]
 
-struct Custom();
+struct Custom;
 impl Custom {
     fn trim(self) -> Self {
         self
@@ -69,7 +69,7 @@ fn main() {
     let _ = (" A B C ").to_string().split_whitespace(); // should trigger lint
 
     // Custom
-    let _ = Custom().trim().split_whitespace(); // should not trigger lint
+    let _ = Custom.trim().split_whitespace(); // should not trigger lint
 
     // Deref<Target=str>
     let s = DerefStr(" A B C ");

diff --git a/tests/ui/trim_split_whitespace.rs b/tests/ui/trim_split_whitespace.rs
@@ -2,7 +2,7 @@
 #![warn(clippy::trim_split_whitespace)]
 #![allow(clippy::let_unit_value)]
 
-struct Custom();
+struct Custom;
 impl Custom {
     fn trim(self) -> Self {
         self
@@ -69,7 +69,7 @@ fn main() {
     let _ = (" A B C ").to_string().trim_end().split_whitespace(); // should trigger lint
 
     // Custom
-    let _ = Custom().trim().split_whitespace(); // should not trigger lint
+    let _ = Custom.trim().split_whitespace(); // should not trigger lint
 
     // Deref<Target=str>
     let s = DerefStr(" A B C ");

diff --git a/tests/ui/trim_split_whitespace.stderr b/tests/ui/trim_split_whitespace.stderr
@@ -2,51 +2,51 @@ error: found call to `str::trim` before `str::split_whitespace`
   --> $DIR/trim_split_whitespace.rs:62:23
    |
 LL |     let _ = " A B C ".trim().split_whitespace(); // should trigger lint
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `trim()`: `split_whitespace()`
+   |                       ^^^^^^^ help: remove `trim()`
    |
    = note: `-D clippy::trim-split-whitespace` implied by `-D warnings`
 
 error: found call to `str::trim_start` before `str::split_whitespace`
   --> $DIR/trim_split_whitespace.rs:63:23
    |
 LL |     let _ = " A B C ".trim_start().split_whitespace(); // should trigger lint
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `trim_start()`: `split_whitespace()`
+   |                       ^^^^^^^^^^^^^ help: remove `trim_start()`
 
 error: found call to `str::trim_end` before `str::split_whitespace`
   --> $DIR/trim_split_whitespace.rs:64:23
    |
 LL |     let _ = " A B C ".trim_end().split_whitespace(); // should trigger lint
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `trim_end()`: `split_whitespace()`
+   |                       ^^^^^^^^^^^ help: remove `trim_end()`
 
 error: found call to `str::trim` before `str::split_whitespace`
   --> $DIR/trim_split_whitespace.rs:67:37
    |
 LL |     let _ = (" A B C ").to_string().trim().split_whitespace(); // should trigger lint
-   |                                     ^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `trim()`: `split_whitespace()`
+   |                                     ^^^^^^^ help: remove `trim()`
 
 error: found call to `str::trim_start` before `str::split_whitespace`
   --> $DIR/trim_split_whitespace.rs:68:37
    |
 LL |     let _ = (" A B C ").to_string().trim_start().split_whitespace(); // should trigger lint
-   |                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `trim_start()`: `split_whitespace()`
+   |                                     ^^^^^^^^^^^^^ help: remove `trim_start()`
 
 error: found call to `str::trim_end` before `str::split_whitespace`
   --> $DIR/trim_split_whitespace.rs:69:37
    |
 LL |     let _ = (" A B C ").to_string().trim_end().split_whitespace(); // should trigger lint
-   |                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `trim_end()`: `split_whitespace()`
+   |                                     ^^^^^^^^^^^ help: remove `trim_end()`
 
 error: found call to `str::trim` before `str::split_whitespace`
   --> $DIR/trim_split_whitespace.rs:76:15
    |
 LL |     let _ = s.trim().split_whitespace(); // should trigger lint
-   |               ^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `trim()`: `split_whitespace()`
+   |               ^^^^^^^ help: remove `trim()`
 
 error: found call to `str::trim` before `str::split_whitespace`
   --> $DIR/trim_split_whitespace.rs:84:15
    |
 LL |     let _ = s.trim().split_whitespace(); // should trigger lint
-   |               ^^^^^^^^^^^^^^^^^^^^^^^^^ help: remove `trim()`: `split_whitespace()`
+   |               ^^^^^^^ help: remove `trim()`
 
 error: aborting due to 8 previous errors