diff options
| author | Huon Wilson <dbau.pp+github@gmail.com> | 2013-06-10 00:44:58 +1000 |
|---|---|---|
| committer | Huon Wilson <dbau.pp+github@gmail.com> | 2013-06-10 23:02:54 +1000 |
| commit | c32fb53cf9ae20a657d17bd8e2f0b36863096583 (patch) | |
| tree | 928280b4bfcde6b9765de76f956624a735eafde9 /src/libsyntax/parse | |
| parent | b29cd22bce6325a60788ab84f989bd2e82fcaaf4 (diff) | |
| download | rust-c32fb53cf9ae20a657d17bd8e2f0b36863096583.tar.gz rust-c32fb53cf9ae20a657d17bd8e2f0b36863096583.zip | |
std: remove str::{len, slice, is_empty} in favour of methods.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/comments.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs index 57df0fe6f86..a715ede7664 100644 --- a/src/libsyntax/parse/comments.rs +++ b/src/libsyntax/parse/comments.rs @@ -215,7 +215,7 @@ fn trim_whitespace_prefix_and_push_line(lines: &mut ~[~str], let col = col.to_uint(); let s1 = if all_whitespace(s, 0, uint::min(len, col)) { if col < len { - str::slice(s, col, len).to_owned() + s.slice(col, len).to_owned() } else { ~"" } } else { s }; debug!("pushing line: %s", s1); @@ -277,7 +277,7 @@ fn read_block_comment(rdr: @mut StringReader, } } } - if str::len(curr_line) != 0 { + if curr_line.len() != 0 { trim_whitespace_prefix_and_push_line(&mut lines, curr_line, col); } } diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index f615f1321df..04635fdf4e9 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -366,7 +366,7 @@ fn scan_exponent(rdr: @mut StringReader) -> Option<~str> { bump(rdr); } let exponent = scan_digits(rdr, 10u); - if str::len(exponent) > 0u { + if exponent.len() > 0u { return Some(rslt + exponent); } else { rdr.fatal(~"scan_exponent: bad fp literal"); } } else { return None::<~str>; } @@ -434,7 +434,7 @@ fn scan_number(c: char, rdr: @mut StringReader) -> token::Token { tp = if signed { either::Left(ast::ty_i64) } else { either::Right(ast::ty_u64) }; } - if str::len(num_str) == 0u { + if num_str.len() == 0u { rdr.fatal(~"no valid digits found for number"); } let parsed = match u64::from_str_radix(num_str, base as uint) { @@ -499,7 +499,7 @@ fn scan_number(c: char, rdr: @mut StringReader) -> token::Token { } return token::LIT_FLOAT_UNSUFFIXED(str_to_ident(num_str)); } else { - if str::len(num_str) == 0u { + if num_str.len() == 0u { rdr.fatal(~"no valid digits found for number"); } let parsed = match u64::from_str_radix(num_str, base as uint) { |
