fix(clap): remove unstable features for Rust 1.0

This commit is contained in:
Kevin K 2015-04-03 11:02:46 -04:00
parent 60e4072896
commit 9abdb438e3
2 changed files with 7 additions and 11 deletions

View file

@ -1,5 +1,3 @@
extern crate libc;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::collections::HashMap; use std::collections::HashMap;
use std::collections::HashSet; use std::collections::HashSet;
@ -7,6 +5,7 @@ use std::env;
use std::path::Path; use std::path::Path;
use std::vec::IntoIter; use std::vec::IntoIter;
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::process;
use args::{ ArgMatches, Arg, SubCommand }; use args::{ ArgMatches, Arg, SubCommand };
use args::{FlagArg, FlagBuilder}; use args::{FlagArg, FlagBuilder};
@ -619,7 +618,7 @@ impl<'a, 'v, 'ab, 'u, 'ar> App<'a, 'v, 'ab, 'u, 'ar>{
} }
} }
self.exit(); self.exit(0);
} }
#[inline(always)] #[inline(always)]
@ -657,17 +656,18 @@ impl<'a, 'v, 'ab, 'u, 'ar> App<'a, 'v, 'ab, 'u, 'ar>{
// Print the binary name if existing, but replace all spaces with hyphens in case we're // Print the binary name if existing, but replace all spaces with hyphens in case we're
// dealing with subcommands i.e. git mv is translated to git-mv // dealing with subcommands i.e. git mv is translated to git-mv
println!("{} {}", &self.bin_name.clone().unwrap_or(self.name.clone())[..].replace(" ", "-"), self.version.unwrap_or("") ); println!("{} {}", &self.bin_name.clone().unwrap_or(self.name.clone())[..].replace(" ", "-"), self.version.unwrap_or("") );
if quit { self.exit(); } if quit { self.exit(0); }
} }
fn exit(&self) { fn exit(&self, status: i32) {
unsafe { libc::exit(0); } process::exit(status);
// unsafe { libc::exit(0); }
} }
fn report_error(&self, msg: String, usage: bool, quit: bool) { fn report_error(&self, msg: String, usage: bool, quit: bool) {
println!("{}", msg); println!("{}", msg);
if usage { self.print_usage(true); } if usage { self.print_usage(true); }
if quit { env::set_exit_status(1); self.exit(); } if quit { self.exit(1); }
} }
pub fn get_matches(mut self) -> ArgMatches<'ar> { pub fn get_matches(mut self) -> ArgMatches<'ar> {

View file

@ -1,11 +1,7 @@
#![crate_type= "lib"] #![crate_type= "lib"]
#![feature(exit_status)]
// DOCS // DOCS
extern crate libc;
pub use args::{Arg, SubCommand, ArgMatches}; pub use args::{Arg, SubCommand, ArgMatches};
pub use app::App; pub use app::App;