diff options
| author | bors <bors@rust-lang.org> | 2013-10-02 02:31:29 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-02 02:31:29 -0700 |
| commit | d00c9269dce3a7925d7d0bf5edb64b3c6747c6af (patch) | |
| tree | 2446c316e34164e1b0795fb909de8951d503fe20 /src/libextra | |
| parent | 97cd495aca946d088e103d364d3be34f2bfaf1e1 (diff) | |
| parent | 4f67dcb24adb1e23f04e624fcbaf2328b82491b6 (diff) | |
auto merge of #9665 : alexcrichton/rust/snapshot, r=brson
Uses the new snapshots to kill the old `loop` and introduce the new `continue`.
Diffstat (limited to 'src/libextra')
| -rw-r--r-- | src/libextra/base64.rs | 2 | ||||
| -rw-r--r-- | src/libextra/fileinput.rs | 2 | ||||
| -rw-r--r-- | src/libextra/glob.rs | 4 | ||||
| -rw-r--r-- | src/libextra/hex.rs | 2 | ||||
| -rw-r--r-- | src/libextra/num/bigint.rs | 2 | ||||
| -rw-r--r-- | src/libextra/priority_queue.rs | 2 | ||||
| -rw-r--r-- | src/libextra/terminfo/parser/compiled.rs | 4 | ||||
| -rw-r--r-- | src/libextra/url.rs | 8 |
8 files changed, 13 insertions, 13 deletions
diff --git a/src/libextra/base64.rs b/src/libextra/base64.rs index ed366047c84..2b18c27f560 100644 --- a/src/libextra/base64.rs +++ b/src/libextra/base64.rs @@ -200,7 +200,7 @@ impl<'self> FromBase64 for &'self str { '0'..'9' => buf |= val + 0x04, '+'|'-' => buf |= 0x3E, '/'|'_' => buf |= 0x3F, - '\r'|'\n' => loop, + '\r'|'\n' => continue, '=' => break, _ => return Err(format!("Invalid character '{}' at position {}", self.char_at(idx), idx)) diff --git a/src/libextra/fileinput.rs b/src/libextra/fileinput.rs index 37bcb447f08..e85b715b21a 100644 --- a/src/libextra/fileinput.rs +++ b/src/libextra/fileinput.rs @@ -303,7 +303,7 @@ impl io::Reader for FileInput { let b = r.read_byte(); if b < 0 { - loop; + continue; } if b == '\n' as int { diff --git a/src/libextra/glob.rs b/src/libextra/glob.rs index 9af2f1acc69..112ea142189 100644 --- a/src/libextra/glob.rs +++ b/src/libextra/glob.rs @@ -211,7 +211,7 @@ impl Pattern { let cs = parse_char_specifiers(chars.slice(i + 2, i + 3 + j)); tokens.push(AnyExcept(cs)); i += j + 4; - loop; + continue; } } } @@ -222,7 +222,7 @@ impl Pattern { let cs = parse_char_specifiers(chars.slice(i + 1, i + 2 + j)); tokens.push(AnyWithin(cs)); i += j + 3; - loop; + continue; } } } diff --git a/src/libextra/hex.rs b/src/libextra/hex.rs index 709b4a95981..d6e0d8f99c2 100644 --- a/src/libextra/hex.rs +++ b/src/libextra/hex.rs @@ -100,7 +100,7 @@ impl<'self> FromHex for &'self str { '0'..'9' => buf |= byte - ('0' as u8), ' '|'\r'|'\n'|'\t' => { buf >>= 4; - loop + continue } _ => return Err(format!("Invalid character '{}' at position {}", self.char_at(idx), idx)) diff --git a/src/libextra/num/bigint.rs b/src/libextra/num/bigint.rs index 2ec9c747179..48fcd972c3c 100644 --- a/src/libextra/num/bigint.rs +++ b/src/libextra/num/bigint.rs @@ -413,7 +413,7 @@ impl Integer for BigUint { } if d0.is_zero() { n = 2; - loop; + continue; } n = 1; // FIXME(#6102): Assignment operator for BigInt causes ICE diff --git a/src/libextra/priority_queue.rs b/src/libextra/priority_queue.rs index 6dd4759d927..587f8372087 100644 --- a/src/libextra/priority_queue.rs +++ b/src/libextra/priority_queue.rs @@ -140,7 +140,7 @@ impl<T:Ord> PriorityQueue<T> { let x = replace(&mut self.data[parent], init()); move_val_init(&mut self.data[pos], x); pos = parent; - loop + continue } break } diff --git a/src/libextra/terminfo/parser/compiled.rs b/src/libextra/terminfo/parser/compiled.rs index caef3e70ce8..0adf86ed931 100644 --- a/src/libextra/terminfo/parser/compiled.rs +++ b/src/libextra/terminfo/parser/compiled.rs @@ -276,7 +276,7 @@ pub fn parse(file: @Reader, longnames: bool) -> Result<~TermInfo, ~str> { for (i, v) in string_offsets.iter().enumerate() { let offset = *v; if offset == 0xFFFF { // non-entry - loop; + continue; } let name = if snames[i] == "_" { @@ -289,7 +289,7 @@ pub fn parse(file: @Reader, longnames: bool) -> Result<~TermInfo, ~str> { // undocumented: FFFE indicates cap@, which means the capability is not present // unsure if the handling for this is correct string_map.insert(name.to_owned(), ~[]); - loop; + continue; } diff --git a/src/libextra/url.rs b/src/libextra/url.rs index 7a10c0439da..2afc49df43a 100644 --- a/src/libextra/url.rs +++ b/src/libextra/url.rs @@ -359,12 +359,12 @@ pub fn query_to_str(query: &Query) -> ~str { pub fn get_scheme(rawurl: &str) -> Result<(~str, ~str), ~str> { for (i,c) in rawurl.iter().enumerate() { match c { - 'A' .. 'Z' | 'a' .. 'z' => loop, + 'A' .. 'Z' | 'a' .. 'z' => continue, '0' .. '9' | '+' | '-' | '.' => { if i == 0 { return Err(~"url: Scheme must begin with a letter."); } - loop; + continue; } ':' => { if i == 0 { @@ -420,7 +420,7 @@ fn get_authority(rawurl: &str) -> let mut end = len; for (i,c) in rawurl.iter().enumerate() { - if i < 2 { loop; } // ignore the leading // + if i < 2 { continue; } // ignore the leading // // deal with input class first match c { @@ -558,7 +558,7 @@ fn get_path(rawurl: &str, authority: bool) -> 'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '&' |'\'' | '(' | ')' | '.' | '@' | ':' | '%' | '/' | '+' | '!' | '*' | ',' | ';' | '=' | '_' | '-' => { - loop; + continue; } '?' | '#' => { end = i; |
