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_optional.rs | 54 ------------------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 argparse/src/test_optional.rs (limited to 'argparse/src/test_optional.rs') diff --git a/argparse/src/test_optional.rs b/argparse/src/test_optional.rs deleted file mode 100644 index 5f4c35e..0000000 --- a/argparse/src/test_optional.rs +++ /dev/null @@ -1,54 +0,0 @@ -use parser::ArgumentParser; -use super::StoreOption; -use test_parser::{check_ok}; - -fn opt(args: &[&str]) -> Option { - let mut val = None; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val) - .add_option(&["-s", "--set"], StoreOption, - "Set int value"); - check_ok(&ap, args); - } - return val; -} - -#[test] -fn test_opt() { - assert_eq!(opt(&["./argparse_test"]), None); - assert_eq!(opt(&["./argparse_test", "-s", "10"]), Some(10)); - assert_eq!(opt(&["./argparse_test", "--set", "11"]), Some(11)); -} - -#[test] -#[should_panic] -fn test_opt_no_arg() { - opt(&["./argparse_test", "--set"]); -} - -fn optstr(args: &[&str]) -> Option { - let mut val = None; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val) - .add_option(&["-s", "--set"], StoreOption, - "Set string value"); - check_ok(&ap, args); - } - return val; -} - -#[test] -fn test_str() { - assert_eq!(optstr(&["./argparse_test"]), None); - assert_eq!(optstr(&["./argparse_test", "-s", "10"]), Some(10.to_string())); - assert_eq!(optstr(&["./argparse_test", "--set", "11"]), - Some(11.to_string())); -} - -#[test] -#[should_panic] -fn test_str_no_art() { - optstr(&["./argparse_test", "--set"]); -} -- cgit v1.2.1