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_parser.rs | 64 --------------------------------------------- 1 file changed, 64 deletions(-) delete mode 100644 argparse/src/test_parser.rs (limited to 'argparse/src/test_parser.rs') diff --git a/argparse/src/test_parser.rs b/argparse/src/test_parser.rs deleted file mode 100644 index f60aa64..0000000 --- a/argparse/src/test_parser.rs +++ /dev/null @@ -1,64 +0,0 @@ - -use parser::ArgumentParser; - -pub fn check_ok(ap: &ArgumentParser, args: &[&str]) { - let mut stdout = Vec::::new(); - let mut stderr = Vec::::new(); - let mut owned_args = Vec::new(); - for x in args.iter() { - owned_args.push(x.to_string()); - } - let res = ap.parse(owned_args, &mut stdout, &mut stderr); - match res { - Ok(()) => return, - Err(x) => panic!( - String::from_utf8(stderr).unwrap() + - &format!("Expected ok, but found Exit({})", x)[..]), - } -} - -pub fn check_exit(ap: &ArgumentParser, args: &[&str]) { - let mut stdout = Vec::::new(); - let mut stderr = Vec::::new(); - let mut owned_args = Vec::new(); - for x in args.iter() { - owned_args.push(x.to_string()); - } - let res = ap.parse(owned_args, &mut stdout, &mut stderr); - match res { - Err(0) => return, - Err(x) => panic!(format!("Expected code {} got {}", 0usize, x)), - Ok(()) => panic!(format!("Expected failure, got success")), - } -} - -pub fn check_err(ap: &ArgumentParser, args: &[&str]) { - let mut stdout = Vec::::new(); - let mut stderr = Vec::::new(); - let mut owned_args = Vec::new(); - for x in args.iter() { - owned_args.push(x.to_string()); - } - let res = ap.parse(owned_args, &mut stdout, &mut stderr); - match res { - Err(2) => return, - Err(x) => panic!(format!("Expected code {} got {}", 2usize, x)), - Ok(()) => panic!(format!("Expected failure, got success")), - } -} - -#[test] -fn test_no_arg() { - let ap = ArgumentParser::new(); - check_ok(&ap, &["./argparse_test"]); - check_err(&ap, &["./argparse_test", "a"]); - check_err(&ap, &["./argparse_test", "-a"]); - check_err(&ap, &["./argparse_test", "--an-option"]); -} - -#[test] -fn test_help() { - let ap = ArgumentParser::new(); - check_ok(&ap, &["./argparse_test"]); - check_exit(&ap, &["./argparse_test", "--help"]); -} -- cgit v1.2.1