diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-07 15:32:04 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-07 17:39:03 -0700 |
| commit | 2810ea9a687df32064dc3fa7db48f52e27d39ed5 (patch) | |
| tree | 4fb386e360cc050a7a05afe564cec58fe65a245a /src/libstd | |
| parent | 073df63c72faed7a773cb9ad0ad5e27edcb4f9f1 (diff) | |
Convert 'again' to 'loop'. Remove 'again' keyword
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net_url.rs | 8 | ||||
| -rw-r--r-- | src/libstd/rope.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs index a8872e13f0b..a0eab69fb35 100644 --- a/src/libstd/net_url.rs +++ b/src/libstd/net_url.rs @@ -347,12 +347,12 @@ fn query_to_str(+query: Query) -> ~str { fn get_scheme(rawurl: &str) -> result::Result<(~str, ~str), @~str> { for str::each_chari(rawurl) |i,c| { match c { - 'A' .. 'Z' | 'a' .. 'z' => again, + 'A' .. 'Z' | 'a' .. 'z' => loop, '0' .. '9' | '+' | '-' | '.' => { if i == 0 { return result::Err(@~"url: Scheme must begin with a letter."); } - again; + loop; } ':' => { if i == 0 { @@ -419,7 +419,7 @@ fn get_authority(rawurl: &str) -> let mut pos : uint = 0, begin : uint = 2, end : uint = len; for str::each_chari(rawurl) |i,c| { - if i < 2 { again; } // ignore the leading // + if i < 2 { loop; } // ignore the leading // // deal with input class first match c { @@ -569,7 +569,7 @@ fn get_path(rawurl: &str, authority : bool) -> 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '&' |'\'' | '(' | ')' | '.' | '@' | ':' | '%' | '/' | '+' | '!' | '*' | ',' | ';' | '=' | '_' | '-' => { - again; + loop; } '?' | '#' => { end = i; diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs index 49d061ecd72..213a6ec8865 100644 --- a/src/libstd/rope.rs +++ b/src/libstd/rope.rs @@ -1171,7 +1171,7 @@ mod node { option::Some(_) => { let next_char = get_next_char_in_leaf(it); match (next_char) { - option::None => again, + option::None => loop, option::Some(_) => return next_char } } |
