rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fallout of std::str stabilization

Browse Source
This commit is contained in:
Alex Crichton
2014-12-10 19:46:38 -08:00
parent 4908017d59
commit 082bfde412
193 changed files with 2143 additions and 2230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libsyntax/parse/lexer/mod.rs
View File

@@ -194,7 +194,7 @@ impl<'a> StringReader<'a> {
let mut m = m.to_string();
m.push_str(": ");
for c in c.escape_default() { m.push(c) }
self.fatal_span_(from_pos, to_pos, m.as_slice());
self.fatal_span_(from_pos, to_pos, m[]);
}
/// Report a lexical error spanning [`from_pos`, `to_pos`), appending an
@@ -203,7 +203,7 @@ impl<'a> StringReader<'a> {
let mut m = m.to_string();
m.push_str(": ");
for c in c.escape_default() { m.push(c) }
self.err_span_(from_pos, to_pos, m.as_slice());
self.err_span_(from_pos, to_pos, m[]);
}
/// Report a lexical error spanning [`from_pos`, `to_pos`), appending the
@@ -212,8 +212,8 @@ impl<'a> StringReader<'a> {
m.push_str(": ");
let from = self.byte_offset(from_pos).to_uint();
let to = self.byte_offset(to_pos).to_uint();
m.push_str(self.filemap.src.as_slice().slice(from, to));
self.fatal_span_(from_pos, to_pos, m.as_slice());
m.push_str(self.filemap.src[from..to]);
self.fatal_span_(from_pos, to_pos, m[]);
}
/// Advance peek_tok and peek_span to refer to the next token, and
@@ -299,7 +299,7 @@ impl<'a> StringReader<'a> {
while i < s.len() {
let str::CharRange { ch, next } = s.char_range_at(i);
if ch == '\r' {
if j < i { buf.push_str(s.slice(j, i)); }
if j < i { buf.push_str(s[j..i]); }
j = next;
if next >= s.len() || s.char_at(next) != '\n' {
let pos = start + BytePos(i as u32);
@@ -309,7 +309,7 @@ impl<'a> StringReader<'a> {
}
i = next;
}
if j < s.len() { buf.push_str(s.slice_from(j)); }
if j < s.len() { buf.push_str(s[j..]); }
buf
}
}
@@ -358,7 +358,7 @@ impl<'a> StringReader<'a> {
pub fn nextnextch(&self) -> Option<char> {
let offset = self.byte_offset(self.pos).to_uint();
let s = self.filemap.deref().src.as_slice();
let s = self.filemap.deref().src[];
if offset >= s.len() { return None }
let str::CharRange { next, .. } = s.char_range_at(offset);
if next < s.len() {
@@ -554,7 +554,7 @@ impl<'a> StringReader<'a> {
self.translate_crlf(start_bpos, string,
"bare CR not allowed in block doc-comment")
} else { string.into_cow() };
token::DocComment(token::intern(string.as_slice()))
token::DocComment(token::intern(string[]))
} else {
token::Comment
};
@@ -1108,7 +1108,7 @@ impl<'a> StringReader<'a> {
// expansion purposes. See #12512 for the gory details of why
// this is necessary.
let ident = self.with_str_from(start, |lifetime_name| {
str_to_ident(format!("'{}", lifetime_name).as_slice())
str_to_ident(format!("'{}", lifetime_name)[])
});
// Conjure up a "keyword checking ident" to make sure that