diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/codemap.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/ext/tt/macro_rules.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/comments.rs | 10 | ||||
| -rw-r--r-- | src/libsyntax/parse/lexer.rs | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs index 99bb6998c86..727d386f277 100644 --- a/src/libsyntax/codemap.rs +++ b/src/libsyntax/codemap.rs @@ -266,7 +266,7 @@ pub impl FileMap { Some(e) => e, None => str::len(*self.src) }; - str::slice_DBG_BRWD(*self.src, begin, end).to_owned() + str::slice(*self.src, begin, end).to_owned() } } @@ -395,7 +395,7 @@ pub impl CodeMap { let begin = self.lookup_byte_offset(sp.lo); let end = self.lookup_byte_offset(sp.hi); fail_unless!(begin.fm.start_pos == end.fm.start_pos); - return str::slice_DBG_BRWD(*begin.fm.src, + return str::slice(*begin.fm.src, begin.pos.to_uint(), end.pos.to_uint()).to_owned(); } diff --git a/src/libsyntax/ext/tt/macro_rules.rs b/src/libsyntax/ext/tt/macro_rules.rs index eb39625b1d0..5a6fd6fec58 100644 --- a/src/libsyntax/ext/tt/macro_rules.rs +++ b/src/libsyntax/ext/tt/macro_rules.rs @@ -112,7 +112,7 @@ pub fn add_new_extension(cx: @ext_ctxt, match (*tt) { // cut off delimiters; don't parse 'em tt_delim(ref tts) => { - (*tts).slice_V_DBG_BRWD(1u,(*tts).len()-1u).to_owned() + (*tts).slice(1u,(*tts).len()-1u).to_owned() } _ => cx.span_fatal( sp, ~"macro rhs must be delimited") diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs index 08473b0e7fb..b5072e8c2b5 100644 --- a/src/libsyntax/parse/comments.rs +++ b/src/libsyntax/parse/comments.rs @@ -76,7 +76,7 @@ pub fn strip_doc_comment_decoration(comment: &str) -> ~str { while j > i && lines[j - 1u].trim().is_empty() { j -= 1u; } - return lines.slice_V_DBG_BRWD(i, j).to_owned(); + return lines.slice(i, j).to_owned(); } // drop leftmost columns that contain only values in chars @@ -103,17 +103,17 @@ pub fn strip_doc_comment_decoration(comment: &str) -> ~str { if i > chars.len() { ~"" } else { - str::from_chars(chars.slice_V_DBG_BRWD(i, chars.len()).to_owned()) + str::from_chars(chars.slice(i, chars.len()).to_owned()) } }; } if comment.starts_with(~"//") { - return comment.slice_DBG_BRWD(3u, comment.len()).trim(); + return comment.slice(3u, comment.len()).trim(); } if comment.starts_with(~"/*") { - let lines = str::lines_any(comment.slice_DBG_BRWD(3u, comment.len() - 2u).to_owned()); + let lines = str::lines_any(comment.slice(3u, comment.len() - 2u).to_owned()); let lines = vertical_trim(lines); let lines = block_trim(lines, ~"\t ", None); let lines = block_trim(lines, ~"*", Some(1u)); @@ -218,7 +218,7 @@ fn trim_whitespace_prefix_and_push_line(lines: &mut ~[~str], let col = col.to_uint(); if all_whitespace(s, 0u, uint::min(len, col)) { if col < len { - s1 = str::slice_DBG_BRWD(s, col, len).to_owned(); + s1 = str::slice(s, col, len).to_owned(); } else { s1 = ~""; } } else { s1 = s; } debug!("pushing line: %s", s1); diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs index 49f1d041b02..6cb4065935c 100644 --- a/src/libsyntax/parse/lexer.rs +++ b/src/libsyntax/parse/lexer.rs @@ -176,7 +176,7 @@ pub fn get_str_from(rdr: @mut StringReader, start: BytePos) -> ~str { unsafe { // I'm pretty skeptical about this subtraction. What if there's a // multi-byte character before the mark? - return str::slice_DBG_BRWD(*rdr.src, start.to_uint() - 1u, + return str::slice(*rdr.src, start.to_uint() - 1u, byte_offset(rdr).to_uint() - 1u).to_owned(); } } |
