rustdoc: Fix merge fallout

alexcrichton · alexcrichton · commit 3d5873fa4213 · 2013-09-25T14:28:20.000-07:00
diff --git a/src/librustdoc/rustdoc.rs b/src/librustdoc/rustdoc.rs
@@ -122,7 +122,7 @@ pub fn main_args(args: &[~str]) -> int {
         for &name in DEFAULT_PASSES.iter() {
             println!("{:>20s}", name);
         }
-        return;
+        return 0;
     }
 
     let (format, cratefile) = match matches.free.clone() {

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ pub fn main_args(args: &[~str]) -> int {`
`122`	`122`	`for &name in DEFAULT_PASSES.iter() {`
`123`	`123`	`println!("{:>20s}", name);`
`124`	`124`	`}`
`125`		`- return;`
	`125`	`+ return 0;`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`let (format, cratefile) = match matches.free.clone() {`