From ae8e6781d2536a3b66d69dfad8f0d5e47eb8617c Mon Sep 17 00:00:00 2001
From: Kevin Cantu <me@kevincantu.org>
Date: Wed, 10 Oct 2012 16:35:52 -0700
Subject: [PATCH] Move the description of -(W|A|D|F) into the `-W help` message

---
 man/rustc.1               | 20 ++++----------------
 src/rustc/driver/rustc.rs | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/man/rustc.1 b/man/rustc.1
index 0e0bfe0f108c..bb6457dd493e 100644
--- a/man/rustc.1
+++ b/man/rustc.1
@@ -93,23 +93,11 @@ Target cpu\-manufacturer\-kernel[\-os] to compile for
 (see http://sources.redhat.com/autobook/autobook/
 autobook_17.html for detail)
 .TP
-\-(W|A|D|F) help
-Print available 'lint' checks and default settings
+\fB\-W help\fR
+Print 'lint' options and default settings
 .TP
-\fB\-W\fR <foo>
-warn about <foo> by default
-.TP
-\fB\-A\fR <foo>
-allow <foo> by default
-.TP
-\fB\-D\fR <foo>
-deny <foo> by default
-.TP
-\fB\-F\fR <foo>
-forbid <foo> (deny, and deny all overrides)
-.TP
-\fB\-Z\fR help
-list internal options for debugging rustc
+\fB\-Z help\fR
+Print internal options for debugging rustc
 .TP
 \fB\-v\fR \fB\-\-version\fR
 Print version info and exit
diff --git a/src/rustc/driver/rustc.rs b/src/rustc/driver/rustc.rs
index 0f191c263fcf..e6a9d726f6d4 100644
--- a/src/rustc/driver/rustc.rs
+++ b/src/rustc/driver/rustc.rs
@@ -68,21 +68,21 @@ fn usage(argv0: &str) {
                        (default: host triple)
                        (see http://sources.redhat.com/autobook/autobook/
                        autobook_17.html for detail)
-
-    -(W|A|D|F) help    Print available 'lint' checks and default settings
-
-    -W <foo>           warn about <foo> by default
-    -A <foo>           allow <foo> by default
-    -D <foo>           deny <foo> by default
-    -F <foo>           forbid <foo> (deny, and deny all overrides)
-
-    -Z help            list internal options for debugging rustc
-
+    -W help            Print 'lint' options and default settings
+    -Z help            Print internal options for debugging rustc
     -v --version       Print version info and exit
 ");
 }
 
 fn describe_warnings() {
+    io::println(fmt!("
+Available lint options:
+    -W <foo>           Warn about <foo>
+    -A <foo>           Allow <foo>
+    -D <foo>           Deny <foo>
+    -F <foo>           Forbid <foo> (deny, and deny all overrides)
+"));
+
     let lint_dict = lint::get_lint_dict();
     let mut max_key = 0;
     for lint_dict.each_key |k| { max_key = uint::max(k.len(), max_key); }