From d0d9683df8398696147e7ee1fcffb2e4e957008c Mon Sep 17 00:00:00 2001 From: Daniel Mueller Date: Sat, 4 Apr 2020 14:39:19 -0700 Subject: Remove vendored dependencies While it appears that by now we actually can get successful builds without Cargo insisting on Internet access by virtue of using the --frozen flag, maintaining vendored dependencies is somewhat of a pain point. This state will also get worse with upcoming changes that replace argparse in favor of structopt and pull in a slew of new dependencies by doing so. Then there is also the repository structure aspect, which is non-standard due to the way we vendor dependencies and a potential source of confusion. In order to fix these problems, this change removes all the vendored dependencies we have. Delete subrepo argparse/:argparse Delete subrepo base32/:base32 Delete subrepo cc/:cc Delete subrepo cfg-if/:cfg-if Delete subrepo getrandom/:getrandom Delete subrepo lazy-static/:lazy-static Delete subrepo libc/:libc Delete subrepo nitrokey-sys/:nitrokey-sys Delete subrepo nitrokey/:nitrokey Delete subrepo rand/:rand --- argparse/src/custom.rs | 95 -------------------------------------------------- 1 file changed, 95 deletions(-) delete mode 100644 argparse/src/custom.rs (limited to 'argparse/src/custom.rs') diff --git a/argparse/src/custom.rs b/argparse/src/custom.rs deleted file mode 100644 index d002ffe..0000000 --- a/argparse/src/custom.rs +++ /dev/null @@ -1,95 +0,0 @@ -use std::cell::RefCell; -use std::rc::Rc; - -use super::{Parse, ParseOption, ParseList, ParseCollect, FromCommandLine}; -use super::action::Action; -use super::action::{TypedAction, IArgAction, IArgsAction}; -use super::action::ParseResult; -use super::action::ParseResult::{Parsed, Error}; -use super::action::Action::{Single, Push, Many}; - -pub struct ParseAction<'a, T: 'a> { - pub cell: Rc>, -} - -pub struct ParseOptionAction<'a, T: 'a> { - cell: Rc>>, -} - -pub struct ParseListAction<'a, T: 'a> { - cell: Rc>>, -} - -impl TypedAction for Parse { - fn bind<'x>(&self, cell: Rc>) -> Action<'x> { - return Single(Box::new(ParseAction { cell: cell })); - } -} - -impl TypedAction> for ParseOption { - fn bind<'x>(&self, cell: Rc>>) -> Action<'x> { - return Single(Box::new(ParseOptionAction { cell: cell })); - } -} - -impl TypedAction> for ParseList { - fn bind<'x>(&self, cell: Rc>>) -> Action<'x> { - return Many(Box::new(ParseListAction { cell: cell })); - } -} - -impl TypedAction> for ParseCollect - where T: 'static + FromCommandLine + Clone -{ - fn bind<'x>(&self, cell: Rc>>) -> Action<'x> { - return Push(Box::new(ParseListAction { cell: cell })) - } -} - -impl<'a, T: FromCommandLine> IArgAction for ParseAction<'a, T> { - fn parse_arg(&self, arg: &str) -> ParseResult { - match FromCommandLine::from_argument(arg) { - Ok(x) => { - **self.cell.borrow_mut() = x; - return Parsed; - } - Err(error) => { - return Error(format!("Bad value {:?}: {}", arg, error)); - } - } - } -} - -impl<'a, T: FromCommandLine> IArgAction for ParseOptionAction<'a, T> { - fn parse_arg(&self, arg: &str) -> ParseResult { - match FromCommandLine::from_argument(arg) { - Ok(x) => { - **self.cell.borrow_mut() = Some(x); - return Parsed; - } - Err(error) => { - return Error(format!("Bad value {:?}: {}", arg, error)); - } - } - } -} - -impl<'a, T: FromCommandLine + Clone> IArgsAction for ParseListAction<'a, T> { - fn parse_args(&self, args: &[&str]) -> ParseResult { - let mut result = vec!(); - for arg in args.iter() { - match FromCommandLine::from_argument(*arg) { - Ok(x) => { - result.push(x); - } - Err(error) => { - return Error(format!("Bad value {:?}: {}", arg, error)); - } - } - } - **self.cell.borrow_mut() = result; - return Parsed; - } -} - - -- cgit v1.2.1