@@ -1103,7 +1103,8 @@ pub fn optgroups() -> Vec<getopts::OptGroup> {
1103
1103
1 = line-tables only (for stacktraces and breakpoints),
1104
1104
2 = full debug info with variable and type information (same as -g)" , "LEVEL" ) ,
1105
1105
optflag( "" , "no-trans" , "Run all passes except translation; no output" ) ,
1106
- optflag( "" , "no-analysis" , "Parse and expand the output, but run no analysis or produce output" ) ,
1106
+ optflag( "" , "no-analysis" ,
1107
+ "Parse and expand the source, but run no analysis and produce no output" ) ,
1107
1108
optflag( "O" , "" , "Equivalent to --opt-level=2" ) ,
1108
1109
optopt( "o" , "" , "Write output to <filename>" , "FILENAME" ) ,
1109
1110
optopt( "" , "opt-level" , "Optimize with possible levels 0-3" , "LEVEL" ) ,
@@ -1116,7 +1117,9 @@ pub fn optgroups() -> Vec<getopts::OptGroup> {
1116
1117
typed (crates expanded, with type annotations),
1117
1118
or identified (fully parenthesized,
1118
1119
AST nodes and blocks with IDs)" , "TYPE" ) ,
1119
- optflagopt( "" , "dep-info" , "Output dependency info to <filename> after compiling" , "FILENAME" ) ,
1120
+ optflagopt( "" , "dep-info" ,
1121
+ "Output dependency info to <filename> after compiling, \
1122
+ in a format suitable for use by Makefiles", "FILENAME" ) ,
1120
1123
optopt( "" , "sysroot" , "Override the system root" , "PATH" ) ,
1121
1124
optflag( "" , "test" , "Build a test harness" ) ,
1122
1125
optopt( "" , "target" , "Target triple cpu-manufacturer-kernel[-os]
5 commit comments
bors commentedon Apr 17, 2014
saw approval from alexcrichton
at brson@111178d
bors commentedon Apr 17, 2014
merging brson/rust/man = 111178d into auto
bors commentedon Apr 17, 2014
brson/rust/man = 111178d merged ok, testing candidate = 787f415
bors commentedon Apr 17, 2014
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/5286
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/5282
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/4375
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/4388
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/5384
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/4471
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/4479
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/5386
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/4471
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/4476
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/4540
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/2270
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/5381
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/4478
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/4491
bors commentedon Apr 17, 2014
fast-forwarding master to auto = 787f415