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/examples/subcommands.rs | 88 ---------------------------------------- 1 file changed, 88 deletions(-) delete mode 100644 argparse/examples/subcommands.rs (limited to 'argparse/examples/subcommands.rs') diff --git a/argparse/examples/subcommands.rs b/argparse/examples/subcommands.rs deleted file mode 100644 index 8fb061a..0000000 --- a/argparse/examples/subcommands.rs +++ /dev/null @@ -1,88 +0,0 @@ -use std::str::FromStr; -use std::io::{stdout, stderr}; -extern crate argparse; - -use argparse::{ArgumentParser, StoreTrue, Store, List}; - -#[allow(non_camel_case_types)] -#[derive(Debug)] -enum Command { - play, - record, -} - -impl FromStr for Command { - type Err = (); - fn from_str(src: &str) -> Result { - return match src { - "play" => Ok(Command::play), - "record" => Ok(Command::record), - _ => Err(()), - }; - } -} - - - -fn play_command(verbose: bool, args: Vec) { - let mut output = "".to_string(); - { - let mut ap = ArgumentParser::new(); - ap.set_description("Plays a sound"); - ap.refer(&mut output) - .add_option(&["--output"], Store, - r#"Output sink to play to"#); - match ap.parse(args, &mut stdout(), &mut stderr()) { - Ok(()) => {} - Err(x) => { - std::process::exit(x); - } - } - } - println!("Verbosity: {}, Output: {}", verbose, output); -} - -fn record_command(verbose: bool, args: Vec) { - let mut input = "".to_string(); - { - let mut ap = ArgumentParser::new(); - ap.set_description("Records a sound"); - ap.refer(&mut input) - .add_option(&["--input"], Store, - r#"Output source to record from"#); - match ap.parse(args, &mut stdout(), &mut stderr()) { - Ok(()) => {} - Err(x) => { - std::process::exit(x); - } - } - } - println!("Verbosity: {}, Input: {}", verbose, input); -} - -fn main() { - let mut verbose = false; - let mut subcommand = Command::play; - let mut args = vec!(); - { - let mut ap = ArgumentParser::new(); - ap.set_description("Plays or records sound"); - ap.refer(&mut verbose) - .add_option(&["-v", "--verbose"], StoreTrue, - "Be verbose"); - ap.refer(&mut subcommand).required() - .add_argument("command", Store, - r#"Command to run (either "play" or "record")"#); - ap.refer(&mut args) - .add_argument("arguments", List, - r#"Arguments for command"#); - ap.stop_on_first_argument(true); - ap.parse_args_or_exit(); - } - - args.insert(0, format!("subcommand {:?}", subcommand)); - match subcommand { - Command::play => play_command(verbose, args), - Command::record => record_command(verbose, args), - } -} -- cgit v1.2.1