Skip to content

Commit 1ecd6a8

Browse files
committed
stdlib: Use if/alt expressions in std::str
1 parent 10c904b commit 1ecd6a8

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/lib/str.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -368,16 +368,16 @@ fn starts_with(str haystack, str needle) -> bool {
368368
fn ends_with(str haystack, str needle) -> bool {
369369
let uint haystack_len = byte_len(haystack);
370370
let uint needle_len = byte_len(needle);
371-
if (needle_len == 0u) {
372-
ret true;
373-
}
374-
if (needle_len > haystack_len) {
375-
ret false;
376-
}
377-
ret eq(substr(haystack,
371+
ret if (needle_len == 0u) {
372+
true
373+
} else if (needle_len > haystack_len) {
374+
false
375+
} else {
376+
eq(substr(haystack,
378377
haystack_len - needle_len,
379378
needle_len),
380-
needle);
379+
needle)
380+
};
381381
}
382382

383383
fn substr(str s, uint begin, uint len) -> str {

0 commit comments

Comments
 (0)