user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

syntax: remove uses of .into_cow()

Browse source
This commit is contained in:
Erick Tryzelaar 2015-04-15 22:15:50 -07:00
parent ca0ee4c645
commit cfb9d286ea
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libsyntax/lib.rs
View file

@ -34,7 +34,6 @@
#![feature(unicode)]
#![feature(path_ext)]
#![feature(str_char)]
#![feature(into_cow)]
extern crate arena;
extern crate fmt_macros;

8
src/libsyntax/parse/lexer/mod.rs
View file

@ -16,7 +16,7 @@ use ext::tt::transcribe::tt_next_token;
use parse::token;
use parse::token::str_to_ident;
use std::borrow::{IntoCow, Cow};
use std::borrow::Cow;
use std::char;
use std::fmt;
use std::mem::replace;
@ -293,7 +293,7 @@ impl<'a> StringReader<'a> {
let next = i + ch.len_utf8();
if ch == '\r' {
if next < s.len() && s.char_at(next) == '\n' {
return translate_crlf_(self, start, s, errmsg, i).into_cow();
return translate_crlf_(self, start, s, errmsg, i).into();
}
let pos = start + BytePos(i as u32);
let end_pos = start + BytePos(next as u32);
@ -301,7 +301,7 @@ impl<'a> StringReader<'a> {
}
i = next;
}
return s.into_cow();
return s.into();
fn translate_crlf_(rdr: &StringReader, start: BytePos,
s: &str, errmsg: &str, mut i: usize) -> String {
@ -564,7 +564,7 @@ impl<'a> StringReader<'a> {
let string = if has_cr {
self.translate_crlf(start_bpos, string,
"bare CR not allowed in block doc-comment")
} else { string.into_cow() };
} else { string.into() };
token::DocComment(token::intern(&string[..]))
} else {
token::Comment