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/test_enum.rs | 51 ----------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 argparse/src/test_enum.rs (limited to 'argparse/src/test_enum.rs') diff --git a/argparse/src/test_enum.rs b/argparse/src/test_enum.rs deleted file mode 100644 index 5205738..0000000 --- a/argparse/src/test_enum.rs +++ /dev/null @@ -1,51 +0,0 @@ -use std::str::FromStr; - -use parser::ArgumentParser; -use super::Store; -use test_parser::{check_ok}; - -use self::Greeting::{Hello, Hi, NoGreeting}; - - -#[derive(PartialEq, Eq, Debug)] -enum Greeting { - Hello, - Hi, - NoGreeting, -} - -impl FromStr for Greeting { - type Err = (); - fn from_str(src: &str) -> Result { - return match src { - "hello" => Ok(Hello), - "hi" => Ok(Hi), - _ => Err(()), - }; - } -} - -fn parse_enum(args: &[&str]) -> Greeting { - let mut val = NoGreeting; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val) - .add_option(&["-g"], Store, - "Greeting"); - check_ok(&ap, args); - } - return val; -} - -#[test] -fn test_parse_enum() { - assert_eq!(parse_enum(&["./argparse_test"]), NoGreeting); - assert_eq!(parse_enum(&["./argparse_test", "-ghello"]), Hello); - assert_eq!(parse_enum(&["./argparse_test", "-ghi"]), Hi); -} - -#[test] -#[should_panic] -fn test_parse_error() { - parse_enum(&["./argparse_test", "-ghell"]); -} -- cgit v1.2.1