zcdziura/pirate
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated main lib file to use new Error struct

Browse source
This commit is contained in:
Zach Dziura 2015-04-28 18:40:22 +00:00
parent 78a56f27f8
commit da684ab0f7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/lib.rs
View file

@ -21,11 +21,11 @@ mod opts;
use std::env::Args; use std::env::Args;
pub use errors::ErrorKind; pub use errors::{Error, ErrorKind};
pub use matches::Matches; pub use matches::Matches;
use opts::Opts; use opts::Opts;
pub fn parse(mut args: Args, options: &[&'static str]) -> Result<Matches, errors::ErrorKind> { pub fn parse(mut args: Args, options: &[&'static str]) -> Result<Matches, ErrorKind> {
let mut matches: Matches = Matches::new(); let mut matches: Matches = Matches::new();
let mut opts: Opts = opts(options); // Jesus, this is redundant... let mut opts: Opts = opts(options); // Jesus, this is redundant...
@ -52,7 +52,7 @@ pub fn parse(mut args: Args, options: &[&'static str]) -> Result<Matches, errors
// NOTE: The corresponding arg MUST be immediately following // NOTE: The corresponding arg MUST be immediately following
current_arg = match args.next() { current_arg = match args.next() {
None => { None => {
return Err(ErrorKind::MissingArgument); return Err(Error::new(ErrorKind::MissingArgument, arg));
}, },
Some(a) => a Some(a) => a
}; };
@ -62,7 +62,7 @@ pub fn parse(mut args: Args, options: &[&'static str]) -> Result<Matches, errors
matches.insert(&arg, ""); matches.insert(&arg, "");
} }
} else { } else {
return Err(ErrorKind::InvalidOption); return Err(Error::new(ErrorKind::InvalidOption, arg));
} }
} else { // Probably a required arg } else { // Probably a required arg