Skip to content

Commit

Permalink
Auto merge of #49090 - QuietMisdreavus:test-rustdoc-again, r=Mark-Sim…
Browse files Browse the repository at this point in the history
…ulacrum

re-enable testing librustdoc

This was originally put in in #44274, but #48105 accidentally hid it. This change puts librustdoc unit/doc tests back in the main test listing.

fixes #44237 (again)
  • Loading branch information
bors committed Mar 17, 2018
2 parents cf5cc2e + 6a38e61 commit 8cabda4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ impl<'a> Builder<'a> {
test::CompileFailFullDeps, test::IncrementalFullDeps, test::Rustdoc, test::Pretty,
test::RunPassPretty, test::RunFailPretty, test::RunPassValgrindPretty,
test::RunPassFullDepsPretty, test::RunFailFullDepsPretty, test::RunMake,
test::Crate, test::CrateLibrustc, test::Rustdoc, test::Linkcheck, test::Cargotest,
test::Cargo, test::Rls, test::ErrorIndex, test::Distcheck,
test::Crate, test::CrateLibrustc, test::CrateRustdoc, test::Linkcheck,
test::Cargotest, test::Cargo, test::Rls, test::ErrorIndex, test::Distcheck,
test::Nomicon, test::Reference, test::RustdocBook, test::RustByExample,
test::TheBook, test::UnstableBook,
test::Rustfmt, test::Miri, test::Clippy, test::RustdocJS, test::RustdocTheme),
Expand Down
2 changes: 1 addition & 1 deletion src/librustdoc/html/markdown.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
//! use rustdoc::html::markdown::Markdown;
//!
//! let s = "My *markdown* _text_";
//! let html = format!("{}", Markdown(s));
//! let html = format!("{}", Markdown(s, &[]));
//! // ... something using html
//! ```
Expand Down

0 comments on commit 8cabda4

Please sign in to comment.