about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-06-18 01:04:35 -0700
committerAlex Crichton <alex@alexcrichton.com>2014-06-18 01:07:02 -0700
commit19260b043b84dd44e2be26a66771ad621dbf1a59 (patch)
treec94f1f83c11a97dfe874e50f63124f51b1ebc08d
parent410d70b5af30a4e5d566b981c9bf1b10b12b796b (diff)
downloadrust-19260b043b84dd44e2be26a66771ad621dbf1a59.tar.gz
rust-19260b043b84dd44e2be26a66771ad621dbf1a59.zip
rustdoc: Fix testing indented code blocks
The collapse/unindent passes were run in the wrong order, generating different
markdown for indented tests.
-rw-r--r--src/liballoc/owned.rs8
-rw-r--r--src/libcore/failure.rs4
-rw-r--r--src/librustdoc/test.rs2
-rw-r--r--src/libsync/deque.rs2
4 files changed, 11 insertions, 5 deletions
diff --git a/src/liballoc/owned.rs b/src/liballoc/owned.rs
index 9377c968272..fa7a8df5035 100644
--- a/src/liballoc/owned.rs
+++ b/src/liballoc/owned.rs
@@ -25,8 +25,12 @@ use core::result::{Ok, Err, Result};
 ///
 /// The following two examples are equivalent:
 ///
-///     let foo = box(HEAP) Bar::new(...);
-///     let foo = box Bar::new(...);
+///     use std::owned::HEAP;
+///
+///     # struct Bar;
+///     # impl Bar { fn new(_a: int) { } }
+///     let foo = box(HEAP) Bar::new(2);
+///     let foo = box Bar::new(2);
 #[lang="exchange_heap"]
 pub static HEAP: () = ();
 
diff --git a/src/libcore/failure.rs b/src/libcore/failure.rs
index 763ca843c11..c64bd6201fa 100644
--- a/src/libcore/failure.rs
+++ b/src/libcore/failure.rs
@@ -15,7 +15,9 @@
 //! useful an upstream crate must define failure for libcore to use. The current
 //! interface for failure is:
 //!
-//!     fn begin_unwind(fmt: &fmt::Arguments, file: &str, line: uint) -> !;
+//! ```ignore
+//! fn begin_unwind(fmt: &fmt::Arguments, file: &str, line: uint) -> !;
+//! ```
 //!
 //! This definition allows for failing with any general message, but it does not
 //! allow for failing with a `~Any` value. The reason for this is that libcore
diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs
index 907d9fc7561..1a24c0863a1 100644
--- a/src/librustdoc/test.rs
+++ b/src/librustdoc/test.rs
@@ -86,8 +86,8 @@ pub fn run(input: &str,
     let mut v = RustdocVisitor::new(&*ctx, None);
     v.visit(&ctx.krate);
     let krate = v.clean();
-    let (krate, _) = passes::unindent_comments(krate);
     let (krate, _) = passes::collapse_docs(krate);
+    let (krate, _) = passes::unindent_comments(krate);
 
     let mut collector = Collector::new(krate.name.to_string(),
                                        libs,
diff --git a/src/libsync/deque.rs b/src/libsync/deque.rs
index 36ccf2d5178..f0184dc8164 100644
--- a/src/libsync/deque.rs
+++ b/src/libsync/deque.rs
@@ -24,7 +24,7 @@
 //!
 //! # Example
 //!
-//!     use std::rt::deque::BufferPool;
+//!     use std::sync::deque::BufferPool;
 //!
 //!     let mut pool = BufferPool::new();
 //!     let (mut worker, mut stealer) = pool.deque();