rollup merge of #21258: aturon/stab-3-index

Conflicts:
	src/libcore/ops.rs
	src/librustc_typeck/astconv.rs
	src/libstd/io/mem.rs
	src/libsyntax/parse/lexer/mod.rs
This commit is contained in:
Alex Crichton
2015-01-21 11:53:49 -08:00
59 changed files with 352 additions and 429 deletions

View File

@@ -5223,7 +5223,7 @@ impl<'a> Parser<'a> {
Some(i) => {
let mut err = String::from_str("circular modules: ");
let len = included_mod_stack.len();
for p in included_mod_stack.slice(i, len).iter() {
for p in included_mod_stack[i.. len].iter() {
err.push_str(&p.display().as_cow()[]);
err.push_str(" -> ");
}