mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

auto merge of #8773 : catamorphism/rust/rustpkg-version-flag, r=anasazi

Browse Source 
r? anyone. Now, rustpkg --version does something useful!
This commit is contained in:
bors 2013-08-27 03:00:52 -07:00
commit 947513c4f4
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/librustpkg/rustpkg.rs
View File

@ -475,7 +475,8 @@ pub fn main() {
pub fn main_args(args: &[~str]) {
let opts = ~[getopts::optflag("h"), getopts::optflag("help"),
getopts::optflag("j"), getopts::optflag("json"),
getopts::optmulti("c"), getopts::optmulti("cfg")];
getopts::optmulti("c"), getopts::optmulti("cfg"),
getopts::optflag("v"), getopts::optflag("version")];
let matches = &match getopts::getopts(args, opts) {
result::Ok(m) => m,
result::Err(f) => {
@ -488,6 +489,13 @@ pub fn main_args(args: &[~str]) {
getopts::opt_present(matches, "help");
let json = getopts::opt_present(matches, "j") ||
getopts::opt_present(matches, "json");
if getopts::opt_present(matches, "v") ||
getopts::opt_present(matches, "version") {
rustc::version(args[0]);
return;
}
let mut args = matches.free.clone();
args.shift();