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_env.rs | 43 ------------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 argparse/src/test_env.rs (limited to 'argparse/src/test_env.rs') diff --git a/argparse/src/test_env.rs b/argparse/src/test_env.rs deleted file mode 100644 index 2e1b649..0000000 --- a/argparse/src/test_env.rs +++ /dev/null @@ -1,43 +0,0 @@ -use std::env; - -use parser::ArgumentParser; -use super::Store; -use test_parser::{check_ok}; - - -fn required(args: &[&str]) -> (isize, isize) { - let mut val1 = 1isize; - let mut val2 = 2isize; - { - let mut ap = ArgumentParser::new(); - ap.refer(&mut val1) - .add_option(&["--v1"], Store, "The value 1") - .add_argument("v1", Store, "The value 1") - .envvar("TEST_ENV_REQUIRED_V1") - .required(); - ap.refer(&mut val2) - .add_argument("v2", Store, "The value 2"); - check_ok(&ap, args); - } - return (val1, val2) -} - -#[test] -#[should_panic] -fn test_required() { - env::set_var("TEST_ENV_REQUIRED_V1", "some_crap"); - required(&["./argparse_test"]); - env::remove_var("TEST_ENV_REQUIRED_V1"); -} - -#[test] -fn test_req() { - env::set_var("TEST_ENV_REQUIRED_V1", "some_crap"); - assert_eq!(required(&["./argparse_test", "10"]), (10, 2)); - assert_eq!(required(&["./argparse_test", "11", "21"]), (11, 21)); - assert_eq!(required(&["./argparse_test", "--v1=7"]), (7, 2)); - env::set_var("TEST_ENV_REQUIRED_V1", "9"); - assert_eq!(required(&["./argparse_test", "10"]), (9, 10)); - assert_eq!(required(&["./argparse_test", "7", "--v1=15"]), (15, 7)); - env::remove_var("TEST_ENV_REQUIRED_V1"); -} -- cgit v1.2.1