From 1ecd6a82abe992f547ec40b1aed1e4c59183a10f Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Sun, 22 May 2011 01:36:01 -0400 Subject: [PATCH] stdlib: Use if/alt expressions in std::str --- src/lib/str.rs | 16 ++++++++-------- 1 file 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 {