about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-07-22 14:16:14 +0000
committerbors <bors@rust-lang.org>2014-07-22 14:16:14 +0000
commit5d3aaa87f89fc3618a39a1f67d901fed8dc91741 (patch)
tree7ddcca713f551bd9df33d86d4bbd091de1a5348f /src
parent915fb2b39c24bb02cb938268a2952c3ad4842768 (diff)
parent6d3a623cc829a9b37a0df00e8087cc245f7e188c (diff)
downloadrust-5d3aaa87f89fc3618a39a1f67d901fed8dc91741.tar.gz
rust-5d3aaa87f89fc3618a39a1f67d901fed8dc91741.zip
auto merge of #15888 : mprobinson/rust/rustdoc-fixes, r=cmr
Allow "rustdoc --passes list" to work without specifying input files,
as shown in the examples section of the man page.
Diffstat (limited to 'src')
-rw-r--r--src/librustdoc/lib.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index a7c9ac10118..76b3a012dbf 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -162,6 +162,18 @@ pub fn main_args(args: &[String]) -> int {
         }
     }
 
+    if matches.opt_strs("passes").as_slice() == &["list".to_string()] {
+        println!("Available passes for running rustdoc:");
+        for &(name, _, description) in PASSES.iter() {
+            println!("{:>20s} - {}", name, description);
+        }
+        println!("{}", "\nDefault passes for rustdoc:"); // FIXME: #9970
+        for &name in DEFAULT_PASSES.iter() {
+            println!("{:>20s}", name);
+        }
+        return 0;
+    }
+
     if matches.free.len() == 0 {
         println!("expected an input file to act on");
         return 1;
@@ -212,18 +224,6 @@ pub fn main_args(args: &[String]) -> int {
         (false, false) => {}
     }
 
-    if matches.opt_strs("passes").as_slice() == &["list".to_string()] {
-        println!("Available passes for running rustdoc:");
-        for &(name, _, description) in PASSES.iter() {
-            println!("{:>20s} - {}", name, description);
-        }
-        println!("{}", "\nDefault passes for rustdoc:"); // FIXME: #9970
-        for &name in DEFAULT_PASSES.iter() {
-            println!("{:>20s}", name);
-        }
-        return 0;
-    }
-
     let (krate, res) = match acquire_input(input, externs, &matches) {
         Ok(pair) => pair,
         Err(s) => {