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

4
src/librustdoc/html/format.rs
View File

@@ -332,7 +332,7 @@ fn path<F, G>(w: &mut fmt::Formatter,
match rel_root {
Some(root) => {
let mut root = String::from_str(root.as_slice());
for seg in path.segments.index(&(0..amt)).iter() {
for seg in path.segments[0..amt].iter() {
if "super" == seg.name ||
"self" == seg.name {
try!(write!(w, "{}::", seg.name));
@@ -347,7 +347,7 @@ fn path<F, G>(w: &mut fmt::Formatter,
}
}
None => {
for seg in path.segments.index(&(0..amt)).iter() {
for seg in path.segments[0..amt].iter() {
try!(write!(w, "{}::", seg.name));
}
}