about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-12-14 06:52:19 +0000
committerbors <bors@rust-lang.org>2018-12-14 06:52:19 +0000
commit664ede88faf57b8fc09715fc66cd9e46490ce64d (patch)
treea3e57a948123750226a0fed966826221420039c2 /src/liballoc
parent97a0bd60820374165427962e9802f4f3c3f7ff7b (diff)
parentcf47a19305d929d1870414dd6911ca3191597668 (diff)
downloadrust-664ede88faf57b8fc09715fc66cd9e46490ce64d.tar.gz
rust-664ede88faf57b8fc09715fc66cd9e46490ce64d.zip
Auto merge of #56536 - alexcrichton:update-master, r=Mark-Simulacrum
Bump to 1.33.0

* Update bootstrap compiler
* Update version to 1.33.0
* Remove some `#[cfg(stage0)]` annotations
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/tests/str.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/liballoc/tests/str.rs b/src/liballoc/tests/str.rs
index 683ce2bf112..9ad8ad1fc07 100644
--- a/src/liballoc/tests/str.rs
+++ b/src/liballoc/tests/str.rs
@@ -1514,9 +1514,9 @@ fn contains_weird_cases() {
 
 #[test]
 fn trim_ws() {
-    assert_eq!(" \t  a \t  ".trim_left_matches(|c: char| c.is_whitespace()),
+    assert_eq!(" \t  a \t  ".trim_start_matches(|c: char| c.is_whitespace()),
                     "a \t  ");
-    assert_eq!(" \t  a \t  ".trim_right_matches(|c: char| c.is_whitespace()),
+    assert_eq!(" \t  a \t  ".trim_end_matches(|c: char| c.is_whitespace()),
                " \t  a");
     assert_eq!(" \t  a \t  ".trim_start_matches(|c: char| c.is_whitespace()),
                     "a \t  ");
@@ -1524,9 +1524,9 @@ fn trim_ws() {
                " \t  a");
     assert_eq!(" \t  a \t  ".trim_matches(|c: char| c.is_whitespace()),
                     "a");
-    assert_eq!(" \t   \t  ".trim_left_matches(|c: char| c.is_whitespace()),
+    assert_eq!(" \t   \t  ".trim_start_matches(|c: char| c.is_whitespace()),
                          "");
-    assert_eq!(" \t   \t  ".trim_right_matches(|c: char| c.is_whitespace()),
+    assert_eq!(" \t   \t  ".trim_end_matches(|c: char| c.is_whitespace()),
                "");
     assert_eq!(" \t   \t  ".trim_start_matches(|c: char| c.is_whitespace()),
                          "");