Merge pull request #5 from steveklabnik/master

Fixes for a clean build.

Author: aturon

.gitignore

@@ -0,0 +1 @@
+target

Cargo.lock

@@ -3,8 +3,6 @@
 use std::io::BufferedReader;
 use std::iter::AdditiveIterator;
 
-use regex::Regex;
-
 pub struct BookItem {
     pub title: String,
     pub path: Path,

src/book.rs

@@ -11,8 +11,6 @@ use book;
 use book::{Book, BookItem};
 use css;
 
-use regex::Regex;
-
 struct Build;
 
 pub fn parse_cmd(name: &str) -> Option<Box<Subcommand>> {
@@ -37,7 +35,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'>"));
-            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>"));
@@ -76,7 +74,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
         let prelude = tmp.path().join("prelude.html");
         {
             let mut toc = BufferedWriter::new(try!(File::create(&prelude)));
-            write_toc(book, &item.path_to_root, &mut toc);
+            let _ = write_toc(book, &item.path_to_root, &mut toc);
             try!(writeln!(&mut toc, "<div id='page-wrapper'>"));
             try!(writeln!(&mut toc, "<div id='page'>"));
         }
@@ -89,7 +87,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
         }
 
         let out_path = tgt.join(item.path.dirname());
-        try!(fs::mkdir_recursive(&out_path, io::UserDir));
+        try!(fs::mkdir_recursive(&out_path, io::USER_DIR));
 
         let output_result = Command::new("rustdoc")
             .arg(&preprocessed_path)
@@ -120,7 +118,7 @@ fn render(book: &Book, tgt: &Path) -> CliResult<()> {
 }
 
 impl Subcommand for Build {
-    fn parse_args(&mut self, args: &[String]) -> CliResult<()> {
+    fn parse_args(&mut self, _: &[String]) -> CliResult<()> {
         Ok(())
     }
     fn usage(&self) {}
@@ -129,15 +127,15 @@ impl Subcommand for Build {
         let src = cwd.clone();
         let tgt = cwd.join("_book");
 
-        fs::mkdir(&tgt, io::UserDir); // FIXME: handle errors
+        let _ = fs::mkdir(&tgt, io::USER_DIR); // FIXME: handle errors
 
-        File::create(&tgt.join("rust-book.css")).write_str(css::STYLE); // FIXME: handle errors
+        let _ = File::create(&tgt.join("rust-book.css")).write_str(css::STYLE); // FIXME: handle errors
 
         let summary = File::open(&src.join("SUMMARY.md"));
         match book::parse_summary(summary, &src) {
             Ok(book) => {
                 // execute rustdoc on the whole book
-                render(&book, &tgt).map_err(|err| {
+                let _ = render(&book, &tgt).map_err(|err| {
                     term.err(format!("error: {}", err.description())[]);
                     err.detail().map(|detail| {
                         term.err(format!("detail: {}", detail)[]);

src/build.rs

@@ -44,7 +44,7 @@ impl Error for String {
 }
 
 impl FromError<()> for () {
-    fn from_err(error: ()) -> () { () }
+    fn from_err(_: ()) -> () { () }
 }
 
 impl FromError<IoError> for IoError {

src/error.rs

@@ -14,11 +14,11 @@ pub fn parse_cmd(name: &str) -> Option<Box<Subcommand>> {
 }
 
 impl Subcommand for Help {
-    fn parse_args(&mut self, args: &[String]) -> CliResult<()> {
+    fn parse_args(&mut self, _: &[String]) -> CliResult<()> {
         Ok(())
     }
     fn usage(&self) {}
-    fn execute(&mut self, term: &mut Term) {
+    fn execute(&mut self, _: &mut Term) {
         usage()
     }
 }

src/help.rs

@@ -32,6 +32,7 @@ mod test;
 
 mod css;
 
+#[cfg(not(test))] // thanks #12327
 fn main() {
     let mut term = Term::new();
     let cmd = os::args();

src/main.rs

@@ -15,9 +15,9 @@ pub fn parse_cmd(name: &str) -> Option<Box<Subcommand>> {
 }
 
 impl Subcommand for Serve {
-    fn parse_args(&mut self, args: &[String]) -> CliResult<()> {
+    fn parse_args(&mut self, _: &[String]) -> CliResult<()> {
         Ok(())
     }
     fn usage(&self) {}
-    fn execute(&mut self, term: &mut Term) {}
+    fn execute(&mut self, _: &mut Term) {}
 }

src/serve.rs

@@ -2,28 +2,18 @@
 //! verbosity support. For now, just a wrapper around stdout/stderr.
 
 use std::io::stdio;
-use std::io::IoResult;
 
 pub struct Term {
-    verbose: bool,
-    out: Box<Writer + 'static>,
     err: Box<Writer + 'static>
 }
 
 impl Term {
     pub fn new() -> Term {
         Term {
-            verbose: false,
-            out: box stdio::stdout() as Box<Writer>,
             err: box stdio::stderr() as Box<Writer>,
         }
     }
 
-    pub fn out(&mut self, msg: &str) {
-        // swallow any errors
-        let _ = self.out.write_line(msg);
-    }
-
     pub fn err(&mut self, msg: &str) {
         // swallow any errors
         let _ = self.err.write_line(msg);

src/term.rs

@@ -15,9 +15,9 @@ pub fn parse_cmd(name: &str) -> Option<Box<Subcommand>> {
 }
 
 impl Subcommand for Test {
-    fn parse_args(&mut self, args: &[String]) -> CliResult<()> {
+    fn parse_args(&mut self, _: &[String]) -> CliResult<()> {
         Ok(())
     }
     fn usage(&self) {}
-    fn execute(&mut self, term: &mut Term) {}
+    fn execute(&mut self, _: &mut Term) {}
 }