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_help.rs | 154 ---------------------------------------------- 1 file changed, 154 deletions(-) delete mode 100644 argparse/src/test_help.rs (limited to 'argparse/src/test_help.rs') diff --git a/argparse/src/test_help.rs b/argparse/src/test_help.rs deleted file mode 100644 index f23b14b..0000000 --- a/argparse/src/test_help.rs +++ /dev/null @@ -1,154 +0,0 @@ -use std::str::from_utf8; - -use parser::ArgumentParser; -use super::{Store, List}; - -#[test] -fn test_empty() { - let mut ap = ArgumentParser::new(); - let mut buf = Vec::::new(); - ap.set_description("Test program"); - assert!(ap.print_help("./argparse_test", &mut buf).is_ok()); - assert_eq!("Usage:\n".to_string() - + " ./argparse_test\n" - + "\n" - + "Test program\n" - + "\n" - + "Optional arguments:\n" - + " -h,--help Show this help message and exit\n" - , from_utf8(&buf[..]).unwrap().to_string()); -} - -#[test] -fn test_options() { - let mut val = 0; - let mut val2 = 0; - let mut ap = ArgumentParser::new(); - ap.set_description("Test program. The description of the program is ought - to be very long, because we want to test how word wrapping works for - it. So some more text would be ok for the test"); - ap.refer(&mut val) - .add_option(&["--value"], Store, - "Set integer value"); - ap.refer(&mut val2) - .add_option(&["-L", "--long-option"], Store, - "Long option value"); - let mut buf = Vec::::new(); - assert!(ap.print_help("./argparse_test", &mut buf).is_ok()); - assert_eq!("Usage:\n".to_string() - + " ./argparse_test [OPTIONS] - -Test program. The description of the program is ought to be very long, because -we want to test how word wrapping works for it. So some more text would be ok -for the test\n" - + "\n" - + "Optional arguments:\n" - + " -h,--help Show this help message and exit\n" - + " --value VALUE Set integer value\n" - + " -L,--long-option LONG_OPTION\n" - + " Long option value\n" - , from_utf8(&buf[..]).unwrap().to_string()); -} - -#[test] -fn test_argument() { - let mut val = 0; - let mut ap = ArgumentParser::new(); - ap.set_description("Test program"); - ap.refer(&mut val) - .add_argument("value", Store, - "Integer value"); - let mut buf = Vec::::new(); - assert!(ap.print_help("./argparse_test", &mut buf).is_ok()); - assert_eq!("Usage:\n".to_string() - + " ./argparse_test [VALUE]\n" - + "\n" - + "Test program\n" - + "\n" - + "Positional arguments:\n" - + " value Integer value\n" - + "\n" - + "Optional arguments:\n" - + " -h,--help Show this help message and exit\n" - , from_utf8(&buf[..]).unwrap().to_string()); -} - -#[test] -fn test_arguments() { - let mut v1 = 0; - let mut v2 = Vec::::new(); - let mut ap = ArgumentParser::new(); - ap.set_description("Test program"); - ap.refer(&mut v1) - .add_argument("v1", Store, - "Integer value 1"); - ap.refer(&mut v2) - .add_argument("v2", List, - "More values"); - let mut buf = Vec::::new(); - assert!(ap.print_help("./argparse_test", &mut buf).is_ok()); - assert_eq!("Usage:\n".to_string() - + " ./argparse_test [V1] [V2 ...]\n" - + "\n" - + "Test program\n" - + "\n" - + "Positional arguments:\n" - + " v1 Integer value 1\n" - + " v2 More values\n" - + "\n" - + "Optional arguments:\n" - + " -h,--help Show this help message and exit\n" - , from_utf8(&buf[..]).unwrap().to_string()); -} - -#[test] -fn test_req_arguments() { - let mut v1 = 0; - let mut v2 = Vec::::new(); - let mut ap = ArgumentParser::new(); - ap.set_description("Test program"); - ap.refer(&mut v1) - .add_argument("v1", Store, - "Integer value 1") - .required(); - ap.refer(&mut v2) - .add_argument("v2", List, - "More values") - .required(); - let mut buf = Vec::::new(); - assert!(ap.print_help("./argparse_test", &mut buf).is_ok()); - assert_eq!("Usage:\n".to_string() - + " ./argparse_test V1 V2 [...]\n" - + "\n" - + "Test program\n" - + "\n" - + "Positional arguments:\n" - + " v1 Integer value 1\n" - + " v2 More values\n" - + "\n" - + "Optional arguments:\n" - + " -h,--help Show this help message and exit\n" - , from_utf8(&buf[..]).unwrap().to_string()); -} - -#[test] -fn test_metavar() { - let mut val2 = 0; - let mut ap = ArgumentParser::new(); - ap.set_description("Test program."); - ap.refer(&mut val2) - .add_option(&["-L", "--long-option"], Store, - "Long option value") - .metavar("VAL"); - let mut buf = Vec::::new(); - assert!(ap.print_help("./argparse_test", &mut buf).is_ok()); - assert_eq!("Usage:\n".to_string() - + " ./argparse_test [OPTIONS]\n" - + "\n" - + "Test program.\n" - + "\n" - + "Optional arguments:\n" - + " -h,--help Show this help message and exit\n" - + " -L,--long-option VAL Long option value\n" - , from_utf8(&buf[..]).unwrap().to_string()); -} -- cgit v1.2.1