diff options
| author |   Doug Goldstein <cardoe@cardoe.com> | 2017-04-16 09:10:51 -0500 |
|---|---|---|
| committer | Doug Goldstein <cardoe@cardoe.com> | 2017-04-17 09:08:48 -0500 |
| commit | 5983b065aa2d3e27af68e150a0536e793dae13cf (patch) | |
| tree | 46017e0f0bd3697a0e118853a320244c04497a18 /src | |
| parent | move usage into its own variable (diff) | |
| download | cargo-ebuild-5983b065aa2d3e27af68e150a0536e793dae13cf.tar.gz cargo-ebuild-5983b065aa2d3e27af68e150a0536e793dae13cf.tar.bz2 cargo-ebuild-5983b065aa2d3e27af68e150a0536e793dae13cf.zip | |
upgrade to Cargo 0.17
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.rs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main.rs b/src/main.rs index f0f21b2..e3a1598 100644 --- a/src/main.rs +++ b/src/main.rs @@ -8,6 +8,7 @@ use cargo::core::registry::PackageRegistry; use cargo::core::resolver::Method; use cargo::ops; use cargo::util::{human, important_paths, CargoResult}; +use std::env; use std::error::Error; use std::fs::OpenOptions; use std::io::Write; @@ -67,10 +68,15 @@ Options: "#; fn main() { - cargo::execute_main_without_stdin(real_main, false, USAGE) + let config = Config::default().unwrap(); + let args = env::args().collect::<Vec<_>>(); + let result = cargo::call_main_without_stdin(real_main, &config, USAGE, &args, false); + if let Err(e) = result { + cargo::handle_cli_error(e, &mut *config.shell()); + } } -fn real_main(options: Options, config: &Config) -> CliResult<Option<()>> { +fn real_main(options: Options, config: &Config) -> CliResult { config.configure(options.flag_verbose, options.flag_quiet, /* color */ @@ -152,5 +158,5 @@ fn real_main(options: Options, config: &Config) -> CliResult<Option<()>> { println!("Wrote: {}", ebuild_path.display()); - Ok(None) + Ok(()) } |