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_many.rs | 95 ----------------------------------------------- 1 file changed, 95 deletions(-) delete mode 100644 argparse/src/test_many.rs (limited to 'argparse/src/test_many.rs') diff --git a/argparse/src/test_many.rs b/argparse/src/test_many.rs deleted file mode 100644 index 68e2cec..0000000 --- a/argparse/src/test_many.rs +++ /dev/null @@ -1,95 +0,0 @@ -use parser::ArgumentParser; -use super::{List, Store, Collect}; -use test_parser::{check_ok}; - -fn pos_list(args: &[&str]) -> (isize, Vec) { - let mut val1 = 1; - let mut val2 = Vec::new(); - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val1).add_argument("v1", Store, "The value 1"); - ap.refer(&mut val2).add_argument("v2", List, "The list of vals"); - check_ok(&ap, args); - } - return (val1, val2); -} - -#[test] -fn test_pos_list() { - assert_eq!(pos_list(&["./argparse_test", "10"]), (10, vec!())); - assert_eq!(pos_list(&["./argparse_test", "11", "21"]), (11, vec!(21))); - assert_eq!(pos_list(&["./argparse_test", "10", "20", "30"]), - (10, vec!(20, 30))); -} - -fn pos_collect(args: &[&str]) -> Vec { - let mut lst = Vec::new(); - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut lst) - .add_argument("v", Collect, "The list of vals"); - check_ok(&ap, args); - } - return lst; -} - -#[test] -fn test_pos_collect() { - assert_eq!(pos_collect(&["./argparse_test", "10"]), vec!(10)); - assert_eq!(pos_collect(&["./argparse_test", "11", "21"]), vec!(11, 21)); - assert_eq!(pos_collect(&["./argparse_test", "10", "20", "30"]), - vec!(10, 20, 30)); -} - -#[test] -#[should_panic] -fn wrong_type() { - pos_collect(&["./argparse_test", "10", "20", "test"]); -} - -fn collect(args: &[&str]) -> Vec { - let mut lst = Vec::new(); - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut lst).add_option(&["-a", "--add"], Collect, - "The list of vals"); - check_ok(&ap, args); - } - return lst; -} - -#[test] -fn test_collect() { - assert_eq!(collect(&["./argparse_test", "-a10"]), vec!(10)); - assert_eq!(collect(&["./argparse_test", "--add=11", "-a", "21"]), - vec!(11, 21)); - assert_eq!(collect(&["./argparse_test", - "-a", "10", "--add=20", "--add", "30"]), vec!(10, 20, 30)); -} - -#[test] -#[should_panic] -fn test_extra() { - collect(&["./argparse_test", "-a", "10", "20", "30"]); -} - -fn list(args: &[&str]) -> Vec { - let mut vec = Vec::new(); - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut vec).add_option(&["-a", "--add"], List, - "The list of vals"); - check_ok(&ap, args); - } - return vec; -} - -#[test] -#[should_panic] -fn test_list() { - assert_eq!(list(&["./argparse_test", "-a10"]), vec!(10)); - assert_eq!(list(&["./argparse_test", "--add", "11", "21"]), vec!(11, 21)); - assert_eq!(list(&["./argparse_test", "-a", "10", "20", "30"]), - vec!(10, 20, 30)); - assert_eq!(list(&["./argparse_test", "10", "20", "30"]), vec!(10, 20, 30)); -} -- cgit v1.2.1