From 285fbdfe3b5f299b2756cc8bd40962b3c32f25a5 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Thu, 8 Mar 2018 23:37:39 +0300 Subject: [PATCH] Remove docopt dependency --- Cargo.toml | 1 - src/cargo/lib.rs | 23 ----------------------- 2 files changed, 24 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 69d1c5c4b..fcc0c3517 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,6 @@ crates-io = { path = "src/crates-io", version = "0.16" } crossbeam = "0.3" crypto-hash = "0.3" curl = "0.4.6" -docopt = "0.8.1" env_logger = "0.5" failure = "0.1.1" filetime = "0.1" diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index 5a5c39911..271e6fce9 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -16,7 +16,6 @@ extern crate atty; extern crate crates_io as registry; extern crate crossbeam; extern crate curl; -extern crate docopt; extern crate filetime; extern crate flate2; extern crate fs2; @@ -46,9 +45,7 @@ extern crate core_foundation; use std::fmt; -use serde::de::DeserializeOwned; use serde::ser; -use docopt::Docopt; use failure::Error; use core::Shell; @@ -109,26 +106,6 @@ impl fmt::Display for VersionInfo { } } -pub fn call_main_without_stdin( - exec: fn(Flags, &mut Config) -> CliResult, - config: &mut Config, - usage: &str, - args: &[String], - options_first: bool) -> CliResult -{ - let docopt = Docopt::new(usage).unwrap() - .options_first(options_first) - .argv(args.iter().map(|s| &s[..])) - .help(true); - - let flags = docopt.deserialize().map_err(|e| { - let code = if e.fatal() {1} else {0}; - CliError::new(e.into(), code) - })?; - - exec(flags, config) -} - pub fn print_json(obj: &T) { let encoded = serde_json::to_string(&obj).unwrap(); println!("{}", encoded); -- 2.30.2