diff --git a/src/rustbook/book.rs b/src/rustbook/book.rs index 21f8a7793dc0..3c116aa860bc 100644 --- a/src/rustbook/book.rs +++ b/src/rustbook/book.rs @@ -50,14 +50,14 @@ impl<'a> Iterator for BookItems<'a> { let mut section = "".to_string(); for &(_, idx) in &self.stack { - section.push_str(&(idx + 1).to_string()[]); + section.push_str(&(idx + 1).to_string()[..]); section.push('.'); } - section.push_str(&(self.cur_idx + 1).to_string()[]); + section.push_str(&(self.cur_idx + 1).to_string()[..]); section.push('.'); self.stack.push((self.cur_items, self.cur_idx)); - self.cur_items = &cur.children[]; + self.cur_items = &cur.children[..]; self.cur_idx = 0; return Some((section, cur)) } @@ -68,7 +68,7 @@ impl<'a> Iterator for BookItems<'a> { impl Book { pub fn iter(&self) -> BookItems { BookItems { - cur_items: &self.chapters[], + cur_items: &self.chapters[..], cur_idx: 0, stack: Vec::new(), } diff --git a/src/rustbook/build.rs b/src/rustbook/build.rs index 74d2bfb40e19..9f35bdaa367e 100644 --- a/src/rustbook/build.rs +++ b/src/rustbook/build.rs @@ -40,7 +40,7 @@ fn write_toc(book: &Book, path_to_root: &Path, out: &mut Writer) -> IoResult<()> path_to_root: &Path, out: &mut Writer) -> IoResult<()> { for (i, item) in items.iter().enumerate() { - try!(walk_item(item, &format!("{}{}.", section, i + 1)[], path_to_root, out)); + try!(walk_item(item, &format!("{}{}.", section, i + 1)[..], path_to_root, out)); } Ok(()) } @@ -54,7 +54,7 @@ fn write_toc(book: &Book, path_to_root: &Path, out: &mut Writer) -> IoResult<()> item.title)); if !item.children.is_empty() { try!(writeln!(out, "")); } try!(writeln!(out, "")); @@ -64,7 +64,7 @@ fn write_toc(book: &Book, path_to_root: &Path, out: &mut Writer) -> IoResult<()> try!(writeln!(out, "
")); try!(writeln!(out, "")); try!(writeln!(out, "
")); @@ -178,7 +178,7 @@ impl Subcommand for Build { Err(errors) => { let n = errors.len(); for err in errors { - term.err(&format!("error: {}", err)[]); + term.err(&format!("error: {}", err)[..]); } Err(box format!("{} errors occurred", n) as Box) diff --git a/src/rustbook/main.rs b/src/rustbook/main.rs index 9bcfc7f45d34..68e4ba54d94c 100644 --- a/src/rustbook/main.rs +++ b/src/rustbook/main.rs @@ -53,16 +53,16 @@ fn main() { if cmd.len() <= 1 { help::usage() } else { - match subcommand::parse_name(&cmd[1][]) { + match subcommand::parse_name(&cmd[1][..]) { Some(mut subcmd) => { match subcmd.parse_args(cmd.tail()) { Ok(_) => { match subcmd.execute(&mut term) { Ok(_) => (), Err(err) => { - term.err(&format!("error: {}", err.description())[]); + term.err(&format!("error: {}", err.description())[..]); err.detail().map(|detail| { - term.err(&format!("detail: {}", detail)[]); + term.err(&format!("detail: {}", detail)[..]); }); } } diff --git a/src/rustbook/test.rs b/src/rustbook/test.rs index d17a569903a5..bff366163dc2 100644 --- a/src/rustbook/test.rs +++ b/src/rustbook/test.rs @@ -50,8 +50,8 @@ impl Subcommand for Test { Ok(output) => { if !output.status.success() { term.err(&format!("{}\n{}", - String::from_utf8_lossy(&output.output[]), - String::from_utf8_lossy(&output.error[]))[]); + String::from_utf8_lossy(&output.output[..]), + String::from_utf8_lossy(&output.error[..]))[..]); return Err(box "Some tests failed." as Box); }