rustup rust-lang/rust#52994

s/trim_left/trim_start/

s/trim_right/trim_end/

diff --git a/clippy_lints/src/collapsible_if.rs b/clippy_lints/src/collapsible_if.rs
index 80f0267a981a322410c27a3d879e817f73593195..a4d834da13ff409474e9c6aadcc98660ba213ada 100644 (file)
--- a/clippy_lints/src/collapsible_if.rs
+++ b/clippy_lints/src/collapsible_if.rs
@@ -116,7 +116,7 @@ fn check_if(cx: &EarlyContext<'_>, expr: &ast::Expr) {
 fn block_starts_with_comment(cx: &EarlyContext<'_>, expr: &ast::Block) -> bool {
     // We trim all opening braces and whitespaces and then check if the next string is a comment.
     let trimmed_block_text = snippet_block(cx, expr.span, "..")
-        .trim_left_matches(|c: char| c.is_whitespace() || c == '{')
+        .trim_start_matches(|c: char| c.is_whitespace() || c == '{')
         .to_owned();
     trimmed_block_text.starts_with("//") || trimmed_block_text.starts_with("/*")
 }

diff --git a/clippy_lints/src/doc.rs b/clippy_lints/src/doc.rs
index 030c56cb81b15a03101787c951ac1b67a7e902bc..f8e31a4b2e767a649b1770c9df0bce21ece4cae0 100644 (file)
--- a/clippy_lints/src/doc.rs
+++ b/clippy_lints/src/doc.rs
@@ -116,7 +116,7 @@ pub fn strip_doc_comment_decoration(comment: &str, span: Span) -> (String, Vec<(
         for line in doc.lines() {
             let offset = line.as_ptr() as usize - comment.as_ptr() as usize;
             debug_assert_eq!(offset as u32 as usize, offset);
-            contains_initial_stars |= line.trim_left().starts_with('*');
+            contains_initial_stars |= line.trim_start().starts_with('*');
             // +1 for the newline
             sizes.push((line.len() + 1, span.with_lo(span.lo() + BytePos(offset as u32))));
         }

diff --git a/clippy_lints/src/methods/mod.rs b/clippy_lints/src/methods/mod.rs
index 384e027db276b64055ff3c90b456319ca0fe73bd..06d2f2cb5fc6eeb0f54a0a50ad97e5435b7d4f05 100644 (file)
--- a/clippy_lints/src/methods/mod.rs
+++ b/clippy_lints/src/methods/mod.rs
@@ -2350,8 +2350,8 @@ enum Convention {
     ("rmatches", 1),
     ("match_indices", 1),
     ("rmatch_indices", 1),
-    ("trim_left_matches", 1),
-    ("trim_right_matches", 1),
+    ("trim_start_matches", 1),
+    ("trim_end_matches", 1),
 ];
 
 #[derive(Clone, Copy, PartialEq, Debug)]

diff --git a/clippy_lints/src/misc_early.rs b/clippy_lints/src/misc_early.rs
index 53da89dfcb0bd7d73b9a6a38b98addab704e9e91..9319ada13f46d4144a3cb37512012c11578b5275 100644 (file)
--- a/clippy_lints/src/misc_early.rs
+++ b/clippy_lints/src/misc_early.rs
@@ -446,13 +446,13 @@ fn check_lit(self, cx: &EarlyContext<'_>, lit: &Lit) {
                         db.span_suggestion_with_applicability(
                             lit.span,
                             "if you mean to use a decimal constant, remove the `0` to remove confusion",
-                            src.trim_left_matches(|c| c == '_' || c == '0').to_string(),
+                            src.trim_start_matches(|c| c == '_' || c == '0').to_string(),
                             Applicability::MaybeIncorrect,
                         );
                         db.span_suggestion_with_applicability(
                             lit.span,
                             "if you mean to use an octal constant, use `0o`",
-                            format!("0o{}", src.trim_left_matches(|c| c == '_' || c == '0')),
+                            format!("0o{}", src.trim_start_matches(|c| c == '_' || c == '0')),
                             Applicability::MaybeIncorrect,
                         );
                     });

diff --git a/tests/ui/single_char_pattern.rs b/tests/ui/single_char_pattern.rs
index 5277841fe325cabd9553a0db749a45d4537a1faf..eeee953ab844cfcc9eda1bf48b1d1d2317c84dc3 100644 (file)
--- a/tests/ui/single_char_pattern.rs
+++ b/tests/ui/single_char_pattern.rs
@@ -42,8 +42,8 @@ fn main() {
     x.rmatches("x");
     x.match_indices("x");
     x.rmatch_indices("x");
-    x.trim_left_matches("x");
-    x.trim_right_matches("x");
+    x.trim_start_matches("x");
+    x.trim_end_matches("x");
     // Make sure we escape characters correctly.
     x.split("\n");
 

diff --git a/tests/ui/single_char_pattern.stderr b/tests/ui/single_char_pattern.stderr
index 273bf77964011e01faa7d273c2c198b1de89cfbc..353796b39282f0f54c968e182066f29e74437cf2 100644 (file)
--- a/tests/ui/single_char_pattern.stderr
+++ b/tests/ui/single_char_pattern.stderr
@@ -91,16 +91,16 @@ error: single-character string constant used as pattern
    |                      ^^^ help: try using a char instead: `'x'`
 
 error: single-character string constant used as pattern
-  --> $DIR/single_char_pattern.rs:45:25
+  --> $DIR/single_char_pattern.rs:45:26
    |
-45 |     x.trim_left_matches("x");
-   |                         ^^^ help: try using a char instead: `'x'`
+45 |     x.trim_start_matches("x");
+   |                          ^^^ help: try using a char instead: `'x'`
 
 error: single-character string constant used as pattern
-  --> $DIR/single_char_pattern.rs:46:26
+  --> $DIR/single_char_pattern.rs:46:24
    |
-46 |     x.trim_right_matches("x");
-   |                          ^^^ help: try using a char instead: `'x'`
+46 |     x.trim_end_matches("x");
+   |                        ^^^ help: try using a char instead: `'x'`
 
 error: single-character string constant used as pattern
   --> $DIR/single_char_pattern.rs:48:13