1 files changed, 16 insertions, 16 deletions

diff --git a/src/librustdoc/config.rs b/src/librustdoc/config.rs
index 83ef5a6f3a8..956d6ba2c5b 100644
--- a/src/librustdoc/config.rs
+++ b/src/librustdoc/config.rs
@@ -266,7 +266,7 @@ fn should_find_pandoc() {
         ProgramOutput { status: 0, out: ~"pandoc 1.8.2.1", err: ~"" }
     };
     let result = maybe_find_pandoc(&config, None, mock_program_output);
-    assert result == result::Ok(Some(~"pandoc"));
+    fail_unless!(result == result::Ok(Some(~"pandoc")));
 }
 
 #[test]
@@ -279,7 +279,7 @@ fn should_error_with_no_pandoc() {
         ProgramOutput { status: 1, out: ~"", err: ~"" }
     };
     let result = maybe_find_pandoc(&config, None, mock_program_output);
-    assert result == result::Err(~"couldn't find pandoc");
+    fail_unless!(result == result::Err(~"couldn't find pandoc"));
 }
 
 #[cfg(test)]
@@ -296,20 +296,20 @@ mod test {
 #[test]
 fn should_error_with_no_crates() {
     let config = test::parse_config(~[~"rustdoc"]);
-    assert config.get_err() == ~"no crates specified";
+    fail_unless!(config.get_err() == ~"no crates specified");
 }
 
 #[test]
 fn should_error_with_multiple_crates() {
     let config =
         test::parse_config(~[~"rustdoc", ~"crate1.rc", ~"crate2.rc"]);
-    assert config.get_err() == ~"multiple crates specified";
+    fail_unless!(config.get_err() == ~"multiple crates specified");
 }
 
 #[test]
 fn should_set_output_dir_to_cwd_if_not_provided() {
     let config = test::parse_config(~[~"rustdoc", ~"crate.rc"]);
-    assert config.get().output_dir == Path(".");
+    fail_unless!(config.get().output_dir == Path("."));
 }
 
 #[test]
@@ -317,13 +317,13 @@ fn should_set_output_dir_if_provided() {
     let config = test::parse_config(~[
         ~"rustdoc", ~"crate.rc", ~"--output-dir", ~"snuggles"
     ]);
-    assert config.get().output_dir == Path("snuggles");
+    fail_unless!(config.get().output_dir == Path("snuggles"));
 }
 
 #[test]
 fn should_set_output_format_to_pandoc_html_if_not_provided() {
     let config = test::parse_config(~[~"rustdoc", ~"crate.rc"]);
-    assert config.get().output_format == PandocHtml;
+    fail_unless!(config.get().output_format == PandocHtml);
 }
 
 #[test]
@@ -331,7 +331,7 @@ fn should_set_output_format_to_markdown_if_requested() {
     let config = test::parse_config(~[
         ~"rustdoc", ~"crate.rc", ~"--output-format", ~"markdown"
     ]);
-    assert config.get().output_format == Markdown;
+    fail_unless!(config.get().output_format == Markdown);
 }
 
 #[test]
@@ -339,7 +339,7 @@ fn should_set_output_format_to_pandoc_html_if_requested() {
     let config = test::parse_config(~[
         ~"rustdoc", ~"crate.rc", ~"--output-format", ~"html"
     ]);
-    assert config.get().output_format == PandocHtml;
+    fail_unless!(config.get().output_format == PandocHtml);
 }
 
 #[test]
@@ -347,13 +347,13 @@ fn should_error_on_bogus_format() {
     let config = test::parse_config(~[
         ~"rustdoc", ~"crate.rc", ~"--output-format", ~"bogus"
     ]);
-    assert config.get_err() == ~"unknown output format 'bogus'";
+    fail_unless!(config.get_err() == ~"unknown output format 'bogus'");
 }
 
 #[test]
 fn should_set_output_style_to_doc_per_mod_by_default() {
     let config = test::parse_config(~[~"rustdoc", ~"crate.rc"]);
-    assert config.get().output_style == DocPerMod;
+    fail_unless!(config.get().output_style == DocPerMod);
 }
 
 #[test]
@@ -361,7 +361,7 @@ fn should_set_output_style_to_one_doc_if_requested() {
     let config = test::parse_config(~[
         ~"rustdoc", ~"crate.rc", ~"--output-style", ~"doc-per-crate"
     ]);
-    assert config.get().output_style == DocPerCrate;
+    fail_unless!(config.get().output_style == DocPerCrate);
 }
 
 #[test]
@@ -369,7 +369,7 @@ fn should_set_output_style_to_doc_per_mod_if_requested() {
     let config = test::parse_config(~[
         ~"rustdoc", ~"crate.rc", ~"--output-style", ~"doc-per-mod"
     ]);
-    assert config.get().output_style == DocPerMod;
+    fail_unless!(config.get().output_style == DocPerMod);
 }
 
 #[test]
@@ -377,7 +377,7 @@ fn should_error_on_bogus_output_style() {
     let config = test::parse_config(~[
         ~"rustdoc", ~"crate.rc", ~"--output-style", ~"bogus"
     ]);
-    assert config.get_err() == ~"unknown output style 'bogus'";
+    fail_unless!(config.get_err() == ~"unknown output style 'bogus'");
 }
 
 #[test]
@@ -385,11 +385,11 @@ fn should_set_pandoc_command_if_requested() {
     let config = test::parse_config(~[
         ~"rustdoc", ~"crate.rc", ~"--pandoc-cmd", ~"panda-bear-doc"
     ]);
-    assert config.get().pandoc_cmd == Some(~"panda-bear-doc");
+    fail_unless!(config.get().pandoc_cmd == Some(~"panda-bear-doc"));
 }
 
 #[test]
 fn should_set_pandoc_command_when_using_pandoc() {
     let config = test::parse_config(~[~"rustdoc", ~"crate.rc"]);
-    assert config.get().pandoc_cmd == Some(~"pandoc");
+    fail_unless!(config.get().pandoc_cmd == Some(~"pandoc"));
 }