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_pos.rs | 196 ----------------------------------------------- 1 file changed, 196 deletions(-) delete mode 100644 argparse/src/test_pos.rs (limited to 'argparse/src/test_pos.rs') diff --git a/argparse/src/test_pos.rs b/argparse/src/test_pos.rs deleted file mode 100644 index 2542050..0000000 --- a/argparse/src/test_pos.rs +++ /dev/null @@ -1,196 +0,0 @@ -use parser::ArgumentParser; -use super::{Store, List}; -use test_parser::{check_ok}; - -fn parse_pos(args: &[&str]) -> isize { - let mut val = 0; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val) - .add_argument("value", Store, "The value"); - check_ok(&ap, args); - } - return val; -} - - -#[test] -fn test_argument() { - assert_eq!(parse_pos(&["./argparse_test", "10"]), 10); -} - -#[test] -#[should_panic] -fn too_much_args() { - parse_pos(&["./argparse_test", "10", "20"]); -} - -#[test] -#[should_panic] -fn wrong_value() { - parse_pos(&["./argparse_test", "test", "20"]); -} - -#[test] -#[should_panic] -fn float_value() { - parse_pos(&["./argparse_test", "1.5"]); -} - -fn parse_two(args: &[&str]) -> (isize, isize) { - let mut val1 = 1; - let mut val2 = 2; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val1) - .add_argument("v1", Store, "The value 1"); - ap.refer(&mut val2) - .add_argument("v2", Store, "The value 2"); - check_ok(&ap, args); - } - return (val1, val2); -} - -#[test] -fn test_two() { - assert_eq!(parse_two(&["./argparse_test", "10"]), (10, 2)); - assert_eq!(parse_two(&["./argparse_test", "11", "21"]), (11, 21)); -} - -#[test] -#[should_panic] -fn test_two_fail_many() { - parse_two(&["./argparse_test", "10", "20", "30"]); -} - -#[test] -#[should_panic] -fn test_two_fail_value() { - parse_two(&["./argparse_test", "test", "20"]); -} - -#[test] -#[should_panic] -fn test_two_fail_float() { - parse_two(&["./argparse_test", "1.5"]); -} - -fn parse_pos_opt(args: &[&str]) -> (isize, isize) { - let mut val1 = 1; - let mut val2 = 2; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val1) - .add_option(&["--v1"], Store, "The value 1") - .add_argument("v1", Store, "The value 1"); - ap.refer(&mut val2) - .add_argument("v2", Store, "The value 2"); - check_ok(&ap, args); - } - return (val1, val2); -} - -#[test] -fn test_positional_optional() { - assert_eq!(parse_pos_opt(&["./argparse_test", "10"]), (10, 2)); - assert_eq!(parse_pos_opt(&["./argparse_test", "11", "21"]), (11, 21)); - assert_eq!(parse_pos_opt(&["./argparse_test", "--v1=7", "8"]), (7, 8)); - assert_eq!(parse_pos_opt(&["./argparse_test", "10", "--v1=9"]), (9, 10)); -} - -#[test] -#[should_panic] -fn test_pos_opt_err() { - parse_pos_opt(&["./argparse_test", "--v1=10", "20", "30"]); -} - -fn parse_pos_req(args: &[&str]) -> (isize, isize) { - let mut val1 = 1; - let mut val2 = 2; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val1) - .add_option(&["--v1"], Store, "The value 1") - .add_argument("v1", Store, "The value 1") - .required(); - ap.refer(&mut val2) - .add_argument("v2", Store, "The value 2"); - check_ok(&ap, args); - } - return (val1, val2); -} - -#[test] -fn test_positional_required() { - assert_eq!(parse_pos_req(&["./argparse_test", "10"]), (10, 2)); - assert_eq!(parse_pos_req(&["./argparse_test", "11", "21"]), (11, 21)); - assert_eq!(parse_pos_req(&["./argparse_test", "--v1=7"]), (7, 2)); - assert_eq!(parse_pos_req(&["./argparse_test", "10", "--v1=9"]), (9, 10)); -} - -#[test] -#[should_panic] -fn test_pos_extra() { - parse_pos_req(&["./argparse_test", "--v1=10", "20", "30"]); -} - -#[test] -#[should_panic] -fn test_pos_no_req() { - parse_pos_req(&["./argparse_test"]); -} - -fn pos_stop(args: &[&str]) -> (isize, Vec) { - let mut val1 = 1; - let mut val2 = Vec::new(); - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val1) - .add_option(&["--v1"], Store, "The value 1") - .add_argument("v1", Store, "The value 1") - .required(); - ap.refer(&mut val2) - .add_argument("v2", List, "The value 2"); - ap.stop_on_first_argument(true); - check_ok(&ap, args); - } - return (val1, val2); -} - -#[test] -fn test_pos_stop() { - assert_eq!(pos_stop(&["./argparse_test", "10"]), (10, vec!())); - assert_eq!(pos_stop(&["./argparse_test", "11", "21"]), - (11, vec!("21".to_string()))); - assert_eq!(pos_stop(&["./argparse_test", "--v1=7"]), (7, vec!())); - assert_eq!(pos_stop(&["./argparse_test", "10", "--v1=9", "--whatever"]), - (10, vec!("--v1=9".to_string(), "--whatever".to_string()))); -} - -#[test] -#[should_panic] -fn test_test() { - pos_stop(&["./argparse_test"]); -} - -fn pos_dash(args: &[&str], dash: bool) -> Vec { - let mut val = Vec::new(); - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val) - .add_argument("v1", List, "The value"); - ap.silence_double_dash(dash); - check_ok(&ap, args); - } - return val; -} - -#[test] -fn test_pos_dash() { - assert_eq!(pos_dash(&["./argparse_test", "1"], true), - vec!("1".to_string())); - assert_eq!(pos_dash(&["./argparse_test", "--", "1"], true), - vec!("1".to_string())); - assert_eq!(pos_dash(&["./argparse_test", "--", "1"], false), - vec!("--".to_string(), "1".to_string())); -} -- cgit v1.2.3