rustc: Change --OptLevel to --opt-level

diff --git a/man/rustc.1 b/man/rustc.1
index 22c7ebff3eb3b1d7dc53906deea329b149290dba..0cc94386c8909bee256c9d55cdbacea00136c875 100644 (file)
--- a/man/rustc.1
+++ b/man/rustc.1
@@ -69,11 +69,11 @@ Run all passes except translation. Produces no output.
 \fB-g\fR:
 Produce debug info.
 .TP
-\fB--OptLevel\fR=\fIlevel\fR:
+\fB--opt-level\fR=\fIlevel\fR:
 Set optimization level to \fIlevel\fR.
 .TP
 \fB-O\fR:
-Equal to --OptLevel=2
+Equal to --opt-level=2
 .TP
 \fB-S\fR:
 Compile to assembly, but do not assemble or link.

diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 34b172ed4fc9a8d5126f108220d33dbd0ccea29e..40f7ebbc8b8f3a239bec5e0bcbd0a5cf012ea62a 100644 (file)
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -250,8 +250,8 @@ fn usage(argv0: str) {
     --parse-only       parse only; do not compile, assemble, or link
     --no-trans         run all passes except translation; no output
     -g                 produce debug info
-    --OptLevel=        optimize with possible levels 0-3
-    -O                 equivalent to --OptLevel=2
+    --opt-level=       optimize with possible levels 0-3
+    -O                 equivalent to --opt-level=2
     -S                 compile only; do not assemble or link
     -c                 compile and assemble, but do not link
     --emit-llvm        produce an LLVM bitcode file
@@ -347,12 +347,12 @@ fn build_session_options(match: getopts::match)
     let target_opt = getopts::opt_maybe_str(match, "target");
     let opt_level: uint =
         if opt_present(match, "O") {
-            if opt_present(match, "OptLevel") {
-                early_error("-O and --OptLevel both provided");
+            if opt_present(match, "opt-level") {
+                early_error("-O and --opt-level both provided");
             }
             2u
-        } else if opt_present(match, "OptLevel") {
-            alt getopts::opt_str(match, "OptLevel") {
+        } else if opt_present(match, "opt-level") {
+            alt getopts::opt_str(match, "opt-level") {
               "0" { 0u }
               "1" { 1u }
               "2" { 2u }
@@ -426,7 +426,7 @@ fn opts() -> [getopts::opt] {
     ret [optflag("h"), optflag("help"), optflag("v"), optflag("version"),
          optflag("emit-llvm"), optflagopt("pretty"),
          optflag("ls"), optflag("parse-only"), optflag("no-trans"),
-         optflag("O"), optopt("OptLevel"), optmulti("L"), optflag("S"),
+         optflag("O"), optopt("opt-level"), optmulti("L"), optflag("S"),
          optflag("c"), optopt("o"), optflag("g"), optflag("save-temps"),
          optopt("sysroot"), optopt("target"), optflag("stats"),
          optflag("time-passes"), optflag("time-llvm-passes"),