mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rustbook: update slicing syntax where [] --> [..]

Browse source
This commit is contained in:
Tshepang Lekhonkhobe 2015-02-23 00:20:42 +02:00
parent dcc6ce2c77
commit 23fe16eab1
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/rustbook/book.rs
View file

@ -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(),
}

8
src/rustbook/build.rs
View file

@ -41,7 +41,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(())
}
@ -55,7 +55,7 @@ fn write_toc(book: &Book, path_to_root: &Path, out: &mut Writer) -> IoResult<()>
item.title));
if !item.children.is_empty() {
try!(writeln!(out, "<ul class='section'>"));
let _ = walk_items(&item.children[], section, path_to_root, out);
let _ = walk_items(&item.children[..], section, path_to_root, out);
try!(writeln!(out, "</ul>"));
}
try!(writeln!(out, "</li>"));
@ -65,7 +65,7 @@ fn write_toc(book: &Book, path_to_root: &Path, out: &mut Writer) -> IoResult<()>
try!(writeln!(out, "<div id='toc' class='mobile-hidden'>"));
try!(writeln!(out, "<ul class='chapter'>"));
try!(walk_items(&book.chapters[], "", path_to_root, out));
try!(walk_items(&book.chapters[..], "", path_to_root, out));
try!(writeln!(out, "</ul>"));
try!(writeln!(out, "</div>"));
@ -179,7 +179,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<Error>)

6
src/rustbook/main.rs
View file

@ -54,16 +54,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)[..]);
});
}
}

4
src/rustbook/test.rs
View file

@ -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<Error>);
}