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

rollup merge of #20721: japaric/snap

Browse Source 
Conflicts:
	src/libcollections/vec.rs
	src/libcore/fmt/mod.rs
	src/librustc/lint/builtin.rs
	src/librustc/session/config.rs
	src/librustc_trans/trans/base.rs
	src/librustc_trans/trans/context.rs
	src/librustc_trans/trans/type_.rs
	src/librustc_typeck/check/_match.rs
	src/librustdoc/html/format.rs
	src/libsyntax/std_inject.rs
	src/libsyntax/util/interner.rs
	src/test/compile-fail/mut-pattern-mismatched.rs
This commit is contained in:
Alex Crichton
2015-01-07 17:26:58 -08:00
parent f6a7dc5528 7d72719efc
commit 6e806bdefd
236 changed files with 2421 additions and 2495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsyntax/codemap.rs
View File

@@ -304,9 +304,9 @@ impl FileMap {
lines.get(line_number).map(|&line| {
let begin: BytePos = line - self.start_pos;
let begin = begin.to_uint();
let slice = self.src.index(&(begin..));
let slice = &self.src[begin..];
match slice.find('\n') {
Some(e) => slice.index(&(0..e)),
Some(e) => &slice[0..e],
None => slice
}.to_string()
})
@@ -351,9 +351,9 @@ impl CodeMap {
// FIXME #12884: no efficient/safe way to remove from the start of a string
// and reuse the allocation.
let mut src = if src.starts_with("\u{feff}") {
String::from_str(src.index(&(3..)))
String::from_str(&src[3..])
} else {
String::from_str(src.index(&FullRange))
String::from_str(&src[])
};
// Append '\n' in case it's not already there.
@@ -440,8 +440,7 @@ impl CodeMap {
if begin.fm.start_pos != end.fm.start_pos {
None
} else {
Some(begin.fm.src.index(&(begin.pos.to_uint()..
end.pos.to_uint())).to_string())
Some((&begin.fm.src[begin.pos.to_uint()..end.pos.to_uint()]).to_string())
}
}