auto merge of rust-lang#9475 : alexcrichton/rust/rustdoc++, r=cmr

The commit messages are a good technical summary, a good visual summary (contrib is this version): Pub use statements now rendered. Notice how almost all components are also clickable! * http://static.rust-lang.org/doc/master/std/prelude/index.html * http://www.contrib.andrew.cmu.edu/~acrichto/doc/std/prelude/index.html Private things hidden by default (for at least some approximation of privacy). I hope to improve this once privacy is totally ironed out. * http://static.rust-lang.org/doc/master/std/hashmap/struct.HashMap.html * http://www.contrib.andrew.cmu.edu/~acrichto/doc/std/hashmap/struct.HashMap.html Unindentation now works properly: * http://static.rust-lang.org/doc/master/extra/getopts/index.html * http://www.contrib.andrew.cmu.edu/~acrichto/doc/extra/getopts/index.html Also sundown has massively reduced compilation time (of docs, not the of the crates)

Author: bors

configure

@@ -684,7 +684,7 @@ do
  isaac linenoise sync test \
  arch/i386 arch/x86_64 arch/arm arch/mips \
  libuv libuv/src/ares libuv/src/eio libuv/src/ev \
- jemalloc
+ jemalloc sundown/src sundown/html
  do
  make_dir $t/rt/stage$s/$i
  done

mk/rt.mk

@@ -82,7 +82,16 @@ RUNTIME_CXXS_$(1)_$(2) := \
  rt/rust_android_dummy.cpp \
  rt/rust_test_helpers.cpp
 
-RUNTIME_CS_$(1)_$(2) := rt/linenoise/linenoise.c rt/linenoise/utf8.c
+RUNTIME_CS_$(1)_$(2) := rt/linenoise/linenoise.c \
+rt/linenoise/utf8.c \
+rt/sundown/src/autolink.c \
+rt/sundown/src/buffer.c \
+rt/sundown/src/stack.c \
+rt/sundown/src/markdown.c \
+rt/sundown/html/houdini_href_e.c \
+rt/sundown/html/houdini_html_e.c \
+rt/sundown/html/html_smartypants.c \
+rt/sundown/html/html.c
 
 RUNTIME_S_$(1)_$(2) := rt/arch/$$(HOST_$(1))/_context.S \
 rt/arch/$$(HOST_$(1))/ccall.S \
@@ -117,6 +126,8 @@ RUNTIME_DEF_$(1)_$(2) := $$(RT_OUTPUT_DIR_$(1))/rustrt$$(CFG_DEF_SUFFIX_$(1))
 RUNTIME_INCS_$(1)_$(2) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
  -I $$(S)src/rt/arch/$$(HOST_$(1)) \
  -I $$(S)src/rt/linenoise \
+ -I $$(S)src/rt/sundown/src \
+ -I $$(S)src/rt/sundown/html \
  -I $$(S)src/libuv/include
 RUNTIME_OBJS_$(1)_$(2) := $$(RUNTIME_CXXS_$(1)_$(2):rt/%.cpp=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \
  $$(RUNTIME_CS_$(1)_$(2):rt/%.c=$$(RT_BUILD_DIR_$(1)_$(2))/%.o) \

mk/tests.mk

@@ -227,8 +227,9 @@ ALL_CS := $(wildcard $(S)src/rt/*.cpp \
  $(S)src/rt/*/*/*.cpp \
  $(S)src/rustllvm/*.cpp)
 ALL_CS := $(filter-out $(S)src/rt/miniz.cpp \
- $(S)src/rt/linenoise/linenoise.c \
- $(S)src/rt/linenoise/utf8.c \
+ $(wildcard $(S)src/rt/linenoise/*.c) \
+ $(wildcard $(S)src/rt/sundown/src/*.c) \
+ $(wildcard $(S)src/rt/sundown/html/*.c) \
 ,$(ALL_CS))
 ALL_HS := $(wildcard $(S)src/rt/*.h \
  $(S)src/rt/*/*.h \
@@ -241,6 +242,8 @@ ALL_HS := $(filter-out $(S)src/rt/vg/valgrind.h \
  $(S)src/rt/msvc/inttypes.h \
  $(S)src/rt/linenoise/linenoise.h \
  $(S)src/rt/linenoise/utf8.h \
+ $(wildcard $(S)src/rt/sundown/src/*.h) \
+ $(wildcard $(S)src/rt/sundown/html/*.h) \
 ,$(ALL_HS))
 
 # Run the tidy script in multiple parts to avoid huge 'echo' commands

src/libextra/arc.rs

@@ -17,7 +17,7 @@
  * In this example, a large vector of floats is shared between several tasks.
  * With simple pipes, without Arc, a copy would have to be made for each task.
  *
- * ~~~ {.rust}
+ * ```rust
  * extern mod std;
  * use extra::arc;
  * let numbers=vec::from_fn(100, |ind| (ind as float)*rand::random());
@@ -34,7 +34,7 @@
  * // Work with the local numbers
  * }
  * }
- * ~~~
+ * ```
  */
 
 #[allow(missing_doc)];
@@ -440,7 +440,7 @@ impl<T:Freeze + Send> RWArc<T> {
  *
  * # Example
  *
- * ~~~ {.rust}
+ * ```rust
  * do arc.write_downgrade |mut write_token| {
  * do write_token.write_cond |state, condvar| {
  * ... exclusive access with mutable state ...
@@ -450,7 +450,7 @@ impl<T:Freeze + Send> RWArc<T> {
  * ... shared access with immutable state ...
  * }
  * }
- * ~~~
+ * ```
  */
  pub fn write_downgrade<U>(&self, blk: &fn(v: RWWriteMode<T>) -> U) -> U {
  unsafe {

src/libextra/base64.rs

@@ -62,15 +62,15 @@ impl<'self> ToBase64 for &'self [u8] {
  *
  * # Example
  *
- * ~~~ {.rust}
+ * ```rust
  * extern mod extra;
  * use extra::base64::{ToBase64, standard};
  *
  * fn main () {
  * let str = [52,32].to_base64(standard);
  * printfln!("%s", str);
  * }
- * ~~~
+ * ```
  */
  fn to_base64(&self, config: Config) -> ~str {
  let bytes = match config.char_set {
@@ -170,7 +170,7 @@ impl<'self> FromBase64 for &'self str {
  *
  * This converts a string literal to base64 and back.
  *
- * ~~~ {.rust}
+ * ```rust
  * extern mod extra;
  * use extra::base64::{ToBase64, FromBase64, standard};
  * use std::str;
@@ -183,7 +183,7 @@ impl<'self> FromBase64 for &'self str {
  * let result_str = str::from_utf8(bytes);
  * printfln!("%s", result_str);
  * }
- * ~~~
+ * ```
  */
  fn from_base64(&self) -> Result<~[u8], ~str> {
  let mut r = ~[];

src/libextra/extra.rs

@@ -26,8 +26,7 @@ Rust extras are part of the standard Rust distribution.
  url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
 
 #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
- html_favicon_url = "http://www.rust-lang.org/favicon.ico",
- passes = "strip-hidden")];
+ html_favicon_url = "http://www.rust-lang.org/favicon.ico")];
 
 #[comment = "Rust extras"];
 #[license = "MIT/ASL2"];

src/libextra/flatpipes.rs

@@ -25,7 +25,7 @@ ports and channels.
 
 This example sends boxed integers across tasks using serialization.
 
-~~~ {.rust}
+```rust
 let (port, chan) = serial::pipe_stream();
 
 do task::spawn || {
@@ -37,7 +37,7 @@ do task::spawn || {
 for i in range(0, 10) {
  assert @i == port.recv()
 }
-~~~
+ ```
 
 # Safety Note
 

src/libextra/future.rs

@@ -14,13 +14,13 @@
  *
  * # Example
  *
- * ~~~ {.rust}
+ * ```rust
  * # fn fib(n: uint) -> uint {42};
  * # fn make_a_sandwich() {};
  * let mut delayed_fib = extra::future::spawn (|| fib(5000) );
  * make_a_sandwich();
  * printfln!("fib(5000) = %?", delayed_fib.get())
- * ~~~
+ * ```
  */
 
 #[allow(missing_doc)];

src/libextra/getopts.rs

@@ -29,7 +29,7 @@
 //! that requires an input file to be specified, accepts an optional output
 //! file name following -o, and accepts both -h and --help as optional flags.
 //!
-//! ```
+//! ~~~{.rust}
 //! exter mod extra;
 //! use extra::getopts::*;
 //! use std::os;
@@ -75,7 +75,7 @@
 //! };
 //! do_work(input, output);
 //! }
-//! ```
+//! ~~~
 
 use std::cmp::Eq;
 use std::result::{Err, Ok};

src/libextra/glob.rs

@@ -51,18 +51,18 @@ pub struct GlobIterator {
  * Consider a directory `/media/pictures` containing only the files `kittens.jpg`,
  * `puppies.jpg` and `hamsters.gif`:
  *
- * ~~~ {.rust}
+ * ```rust
  * for path in glob("/media/pictures/*.jpg") {
  * println(path.to_str());
  * }
- * ~~~
+ * ```
  *
  * The above code will print:
  *
- * ~~~
+ * ```
  * /media/pictures/kittens.jpg
  * /media/pictures/puppies.jpg
- * ~~~
+ * ```
  */
 pub fn glob(pattern: &str) -> GlobIterator {
  glob_with(pattern, MatchOptions::new())
@@ -270,11 +270,11 @@ impl Pattern {
  *
  * # Example
  *
- * ~~~ {.rust}
+ * ```rust
  * assert!(Pattern::new("c?t").matches("cat"));
  * assert!(Pattern::new("k[!e]tteh").matches("kitteh"));
  * assert!(Pattern::new("d*g").matches("doog"));
- * ~~~
+ * ```
  */
  pub fn matches(&self, str: &str) -> bool {
  self.matches_with(str, MatchOptions::new())
@@ -492,13 +492,13 @@ impl MatchOptions {
  *
  * This function always returns this value:
  *
- * ~~~ {.rust}
+ * ```rust
  * MatchOptions {
  * case_sensitive: true,
  * require_literal_separator: false.
  * require_literal_leading_dot: false
  * }
- * ~~~
+ * ```
  */
  pub fn new() -> MatchOptions {
  MatchOptions {