diff options
| author | Brian Anderson <andersrb@gmail.com> | 2011-05-22 01:36:01 -0400 |
|---|---|---|
| committer | Brian Anderson <andersrb@gmail.com> | 2011-05-22 12:28:27 -0400 |
| commit | 1ecd6a82abe992f547ec40b1aed1e4c59183a10f (patch) | |
| tree | 5510f991effd939f8549a75abd9fc855348ac901 /src/lib | |
| parent | 10c904bc6aae5a3a912e396fbb5cd69c1604100c (diff) | |
| download | rust-1ecd6a82abe992f547ec40b1aed1e4c59183a10f.tar.gz rust-1ecd6a82abe992f547ec40b1aed1e4c59183a10f.zip | |
stdlib: Use if/alt expressions in std::str
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/str.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/str.rs b/src/lib/str.rs index 27049c83d13..d1e6448e549 100644 --- a/src/lib/str.rs +++ b/src/lib/str.rs @@ -368,16 +368,16 @@ fn starts_with(str haystack, str needle) -> bool { fn ends_with(str haystack, str needle) -> bool { let uint haystack_len = byte_len(haystack); let uint needle_len = byte_len(needle); - if (needle_len == 0u) { - ret true; - } - if (needle_len > haystack_len) { - ret false; - } - ret eq(substr(haystack, + ret if (needle_len == 0u) { + true + } else if (needle_len > haystack_len) { + false + } else { + eq(substr(haystack, haystack_len - needle_len, needle_len), - needle); + needle) + }; } fn substr(str s, uint begin, uint len) -> str { |