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_int.rs | 107 ----------------------------------------------- 1 file changed, 107 deletions(-) delete mode 100644 argparse/src/test_int.rs (limited to 'argparse/src/test_int.rs') diff --git a/argparse/src/test_int.rs b/argparse/src/test_int.rs deleted file mode 100644 index 1826eaf..0000000 --- a/argparse/src/test_int.rs +++ /dev/null @@ -1,107 +0,0 @@ -use parser::ArgumentParser; -use super::{IncrBy,DecrBy}; -use super::Store; -use test_parser::{check_ok}; - -fn incr_int(args: &[&str]) -> usize { - let mut val = 0; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val) - .add_option(&["-i", "--incr"], IncrBy(1usize), - "Increment value"); - check_ok(&ap, args); - } - return val; -} - -#[test] -fn test_incr_int() { - assert_eq!(incr_int(&["./argparse_test"]), 0); - assert_eq!(incr_int(&["./argparse_test", "--incr"]), 1); - assert_eq!(incr_int(&["./argparse_test", "-iiiii"]), 5); -} - -fn decr_int(args: &[&str]) -> isize { - let mut val = 5; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val) - .add_option(&["-d", "--decr"], DecrBy(1isize), - "Decrement value"); - check_ok(&ap, args); - } - return val; -} - -#[test] -fn test_decr_int() { - assert_eq!(decr_int(&["./argparse_test"]), 5); - assert_eq!(decr_int(&["./argparse_test", "--decr"]), 4); - assert_eq!(decr_int(&["./argparse_test", "-dddddd"]), -1); -} - -#[test] -fn test_incr_decr() { - let mut val = 0; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val) - .add_option(&["-d", "--decr"], DecrBy(1isize), - "Decrement value") - .add_option(&["-i", "--incr"], IncrBy(1isize), - "Increment value"); - check_ok(&ap, &["./argparse_test", - "-iiddd", "--incr", "-iii"]); - } - assert_eq!(val, 3); -} - -fn set_int(args: &[&str]) -> isize { - let mut val = 0; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val) - .add_option(&["-s", "--set"], Store, - "Set integer value"); - check_ok(&ap, args); - } - return val; -} - -#[test] -fn test_set_int() { - assert_eq!(set_int(&["./argparse_test", "-s", "10"]), 10); - assert_eq!(set_int(&["./argparse_test", "--set", "99"]), 99); - assert_eq!(set_int(&["./argparse_test", "-s", "7", "-s77"]), 77); - assert_eq!(set_int(&["./argparse_test", "-s333", "--set=123"]), 123); -} - -#[test] -#[should_panic(expected="Bad value 1.5")] -fn test_set_int_bad() { - set_int(&["./argparse_test", "-s1.5"]); -} - -fn set_i16(args: &[&str]) -> i16 { - let mut val = 0; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val) - .add_option(&["-s", "--set"], Store, - "Set integer value"); - check_ok(&ap, args); - } - return val; -} - -#[test] -fn test_i16() { - assert_eq!(set_i16(&["./argparse_test", "-s", "124"]), 124); -} - -#[test] -#[should_panic(expected="Bad value 1000000")] -fn test_i16_big() { - set_i16(&["./argparse_test", "-s", "1000000"]); -} -- cgit v1.2.1