---

yaml
---
r: 30350
b: refs/heads/incoming
c: 0ddae5e
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 15b4734d0c1b6e8689d6715ef8b808f5ce6f546c
+refs/heads/incoming: 0ddae5ec7dc2c1a4237bb091e52fff5940f18b48
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/AUTHORS.txt

@@ -21,6 +21,7 @@ Brendan Eich <[email protected]>
 Brian Anderson <[email protected]>
 Chris Double <[email protected]>
 Chris Peterson <[email protected]>
+Coppola Ivano <[email protected]>
 Damian Gryski <[email protected]>
 Damien Grassart <[email protected]>
 Daniel Brooks <[email protected]>

branches/incoming/src/libcore/str.rs

@@ -39,6 +39,9 @@ export
    trim_left,
    trim_right,
    trim,
+   trim_left_chars,
+   trim_right_chars,
+   trim_chars,
 
    // Transforming strings
    to_bytes,
@@ -350,6 +353,58 @@ fn view_shift_char(s: &a/str) -> (char, &a/str) {
 /// Prepend a char to a string
 fn unshift_char(&s: ~str, ch: char) { s = from_char(ch) + s; }
 
+/**
+ * Returns a string with leading `chars_to_trim` removed.
+ *
+ * # Arguments
+ *
+ * * s - A string
+ * * chars_to_trim - A vector of chars
+ *
+ */
+pure fn trim_left_chars(s: &str, chars_to_trim: &[char]) -> ~str {
+    if chars_to_trim.is_empty() { return from_slice(s); }
+
+    match find(s, |c| !chars_to_trim.contains(c)) {
+      None => ~"",
+      Some(first) => unsafe { unsafe::slice_bytes(s, first, s.len()) }
+    }
+}
+
+/**
+ * Returns a string with trailing `chars_to_trim` removed.
+ *
+ * # Arguments
+ *
+ * * s - A string
+ * * chars_to_trim - A vector of chars
+ *
+ */
+pure fn trim_right_chars(s: &str, chars_to_trim: &[char]) -> ~str {
+    if chars_to_trim.is_empty() { return str::from_slice(s); }
+
+    match rfind(s, |c| !chars_to_trim.contains(c)) {
+      None => ~"",
+      Some(last) => {
+        let {next, _} = char_range_at(s, last);
+        unsafe { unsafe::slice_bytes(s, 0u, next) }
+      }
+    }
+}
+
+/**
+ * Returns a string with leading and trailing `chars_to_trim` removed.
+ *
+ * # Arguments
+ *
+ * * s - A string
+ * * chars_to_trim - A vector of chars
+ *
+ */
+pure fn trim_chars(s: &str, chars_to_trim: &[char]) -> ~str {
+    trim_left_chars(trim_right_chars(s, chars_to_trim), chars_to_trim)
+}
+
 /// Returns a string with leading whitespace removed
 pure fn trim_left(s: &str) -> ~str {
     match find(s, |c| !char::is_whitespace(c)) {
@@ -2731,6 +2786,30 @@ mod tests {
         slice(~"中华Việt Nam", 0u, 2u);
     }
 
+    #[test]
+    fn test_trim_left_chars() {
+        assert trim_left_chars(~" *** foo *** ", ~[]) == ~" *** foo *** ";
+        assert trim_left_chars(~" *** foo *** ", ~['*', ' ']) == ~"foo *** ";
+        assert trim_left_chars(~" ***  *** ", ~['*', ' ']) == ~"";
+        assert trim_left_chars(~"foo *** ", ~['*', ' ']) == ~"foo *** ";
+    }
+
+    #[test]
+    fn test_trim_right_chars() {
+        assert trim_right_chars(~" *** foo *** ", ~[]) == ~" *** foo *** ";
+        assert trim_right_chars(~" *** foo *** ", ~['*', ' ']) == ~" *** foo";
+        assert trim_right_chars(~" ***  *** ", ~['*', ' ']) == ~"";
+        assert trim_right_chars(~" *** foo", ~['*', ' ']) == ~" *** foo";
+    }
+
+    #[test]
+    fn test_trim_chars() {
+        assert trim_chars(~" *** foo *** ", ~[]) == ~" *** foo *** ";
+        assert trim_chars(~" *** foo *** ", ~['*', ' ']) == ~"foo";
+        assert trim_chars(~" ***  *** ", ~['*', ' ']) == ~"";
+        assert trim_chars(~"foo", ~['*', ' ']) == ~"foo";
+    }
+
     #[test]
     fn test_trim_left() {
         assert (trim_left(~"") == ~"");