diff --git a/mk/tools.mk b/mk/tools.mk index 09c3de01478..45ed9364178 100644 --- a/mk/tools.mk +++ b/mk/tools.mk @@ -21,7 +21,8 @@ RUSTPKG_INPUTS := $(wildcard $(S)src/librustpkg/*.rs) # Rustdoc, the documentation tool RUSTDOC_LIB := $(S)src/librustdoc/rustdoc.rs -RUSTDOC_INPUTS := $(wildcard $(S)src/librustdoc/*.rs) +RUSTDOC_INPUTS := $(wildcard $(addprefix $(S)src/librustdoc/, \ + *.rs */*.rs */*/*.rs)) # Rusti, the JIT REPL RUSTI_LIB := $(S)src/librusti/rusti.rs diff --git a/src/librustdoc/html/layout.rs b/src/librustdoc/html/layout.rs index fcf13779389..718bacc24fd 100644 --- a/src/librustdoc/html/layout.rs +++ b/src/librustdoc/html/layout.rs @@ -36,7 +36,7 @@ pub fn render( - + {favicon, select, none{} other{ (
{logo, select, none{} other{ - + }} {sidebar} @@ -73,9 +73,9 @@ pub fn render( - + - +
diff --git a/src/librustdoc/html/render.rs b/src/librustdoc/html/render.rs index b004061e04a..464a4e4b736 100644 --- a/src/librustdoc/html/render.rs +++ b/src/librustdoc/html/render.rs @@ -128,20 +128,15 @@ pub fn run(mut crate: clean::Crate, dst: Path) { crate = cache.fold_crate(crate); // Add all the static files - write(cx.dst.push("jquery.js"), include_str!("static/jquery-2.0.3.min.js")); - write(cx.dst.push("main.js"), include_str!("static/main.js")); - write(cx.dst.push("main.css"), include_str!("static/main.css")); - write(cx.dst.push("normalize.css"), include_str!("static/normalize.css")); - write(cx.dst.push("index.html"), format!(" - - - - ", crate.name)); + let dst = cx.dst.push(crate.name); + mkdir(&dst); + write(dst.push("jquery.js"), include_str!("static/jquery-2.0.3.min.js")); + write(dst.push("main.js"), include_str!("static/main.js")); + write(dst.push("main.css"), include_str!("static/main.css")); + write(dst.push("normalize.css"), include_str!("static/normalize.css")); { - mkdir(&cx.dst.push(crate.name)); - let dst = cx.dst.push(crate.name).push("search-index.js"); + let dst = dst.push("search-index.js"); let mut w = BufferedWriter::new(dst.open_writer(io::CreateOrTruncate)); let w = &mut w as &mut io::Writer; write!(w, "var searchIndex = [");