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/from_cli.rs | 100 ----------------------------------------------- 1 file changed, 100 deletions(-) delete mode 100644 argparse/src/from_cli.rs (limited to 'argparse/src/from_cli.rs') diff --git a/argparse/src/from_cli.rs b/argparse/src/from_cli.rs deleted file mode 100644 index 7ea6d58..0000000 --- a/argparse/src/from_cli.rs +++ /dev/null @@ -1,100 +0,0 @@ -use std::str::FromStr; -use std::path::PathBuf; -use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr}; - -use super::FromCommandLine; - - -impl FromCommandLine for PathBuf { - fn from_argument(s: &str) -> Result { - Ok(From::from(s)) - } -} - -impl FromCommandLine for f32 { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for f64 { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} - -// TODO(tailhook) implement various radices for integer values -impl FromCommandLine for isize { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for i8 { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for i16 { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for i32 { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for i64 { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for usize { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for u8 { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for u16 { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for u32 { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for u64 { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for bool { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for String { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|_| unreachable!()) - } -} -impl FromCommandLine for Ipv4Addr { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for Ipv6Addr { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -impl FromCommandLine for SocketAddr { - fn from_argument(s: &str) -> Result { - FromStr::from_str(s).map_err(|e| format!("{:?}", e)) - } -} -- cgit v1.2.1