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 --- libc/libc-test/test/cmsg.rs | 100 -------------------------------- libc/libc-test/test/linux_elf.rs | 12 ---- libc/libc-test/test/linux_fcntl.rs | 12 ---- libc/libc-test/test/linux_ipv6.rs | 12 ---- libc/libc-test/test/linux_strerror_r.rs | 12 ---- libc/libc-test/test/linux_termios.rs | 12 ---- libc/libc-test/test/main.rs | 6 -- 7 files changed, 166 deletions(-) delete mode 100644 libc/libc-test/test/cmsg.rs delete mode 100644 libc/libc-test/test/linux_elf.rs delete mode 100644 libc/libc-test/test/linux_fcntl.rs delete mode 100644 libc/libc-test/test/linux_ipv6.rs delete mode 100644 libc/libc-test/test/linux_strerror_r.rs delete mode 100644 libc/libc-test/test/linux_termios.rs delete mode 100644 libc/libc-test/test/main.rs (limited to 'libc/libc-test/test') diff --git a/libc/libc-test/test/cmsg.rs b/libc/libc-test/test/cmsg.rs deleted file mode 100644 index 38a8ce1..0000000 --- a/libc/libc-test/test/cmsg.rs +++ /dev/null @@ -1,100 +0,0 @@ -//! Compare libc's CMSG(3) family of functions against the actual C macros, for -//! various inputs. - -extern crate libc; - -#[cfg(unix)] -mod t { - - use libc::{self, c_uchar, c_uint, c_void, cmsghdr, msghdr}; - use std::mem; - - extern "C" { - pub fn cmsg_firsthdr(msgh: *const msghdr) -> *mut cmsghdr; - pub fn cmsg_nxthdr( - mhdr: *const msghdr, - cmsg: *const cmsghdr, - ) -> *mut cmsghdr; - pub fn cmsg_space(length: c_uint) -> usize; - pub fn cmsg_len(length: c_uint) -> usize; - pub fn cmsg_data(cmsg: *const cmsghdr) -> *mut c_uchar; - } - - #[test] - fn test_cmsg_data() { - for l in 0..128 { - let pcmsghdr = l as *const cmsghdr; - unsafe { - assert_eq!(libc::CMSG_DATA(pcmsghdr), cmsg_data(pcmsghdr)); - } - } - } - - #[test] - fn test_cmsg_firsthdr() { - let mut mhdr: msghdr = unsafe { mem::zeroed() }; - mhdr.msg_control = 0xdeadbeef as *mut c_void; - let pmhdr = &mhdr as *const msghdr; - for l in 0..128 { - mhdr.msg_controllen = l; - unsafe { - assert_eq!(libc::CMSG_FIRSTHDR(pmhdr), cmsg_firsthdr(pmhdr)); - } - } - } - - #[test] - fn test_cmsg_len() { - for l in 0..128 { - unsafe { - assert_eq!(libc::CMSG_LEN(l) as usize, cmsg_len(l)); - } - } - } - - // Skip on sparc64 - // https://github.com/rust-lang/libc/issues/1239 - #[cfg(not(target_arch = "sparc64"))] - #[test] - fn test_cmsg_nxthdr() { - use std::ptr; - - let mut buffer = [0u8; 256]; - let mut mhdr: msghdr = unsafe { mem::zeroed() }; - let pmhdr = &mhdr as *const msghdr; - for start_ofs in 0..64 { - let pcmsghdr = &mut buffer[start_ofs] as *mut u8 as *mut cmsghdr; - mhdr.msg_control = pcmsghdr as *mut c_void; - mhdr.msg_controllen = (160 - start_ofs) as _; - for cmsg_len in 0..64 { - for next_cmsg_len in 0..32 { - for i in buffer[start_ofs..].iter_mut() { - *i = 0; - } - unsafe { - (*pcmsghdr).cmsg_len = cmsg_len; - let libc_next = libc::CMSG_NXTHDR(pmhdr, pcmsghdr); - let next = cmsg_nxthdr(pmhdr, pcmsghdr); - assert_eq!(libc_next, next); - - if libc_next != ptr::null_mut() { - (*libc_next).cmsg_len = next_cmsg_len; - let libc_next = libc::CMSG_NXTHDR(pmhdr, pcmsghdr); - let next = cmsg_nxthdr(pmhdr, pcmsghdr); - assert_eq!(libc_next, next); - } - } - } - } - } - } - - #[test] - fn test_cmsg_space() { - unsafe { - for l in 0..128 { - assert_eq!(libc::CMSG_SPACE(l) as usize, cmsg_space(l)); - } - } - } -} diff --git a/libc/libc-test/test/linux_elf.rs b/libc/libc-test/test/linux_elf.rs deleted file mode 100644 index d149c9a..0000000 --- a/libc/libc-test/test/linux_elf.rs +++ /dev/null @@ -1,12 +0,0 @@ -#![allow(bad_style, improper_ctypes, unused, deprecated)] - -extern crate libc; -use libc::*; - -#[cfg(target_os = "linux")] -include!(concat!(env!("OUT_DIR"), "/linux_elf.rs")); - -#[cfg(not(target_os = "linux"))] -fn main() { - println!("PASSED 0 tests"); -} diff --git a/libc/libc-test/test/linux_fcntl.rs b/libc/libc-test/test/linux_fcntl.rs deleted file mode 100644 index 49c06cc..0000000 --- a/libc/libc-test/test/linux_fcntl.rs +++ /dev/null @@ -1,12 +0,0 @@ -#![allow(bad_style, improper_ctypes, unused, deprecated)] - -extern crate libc; -use libc::*; - -#[cfg(any(target_os = "linux", target_os = "android"))] -include!(concat!(env!("OUT_DIR"), "/linux_fcntl.rs")); - -#[cfg(not(any(target_os = "linux", target_os = "android")))] -fn main() { - println!("PASSED 0 tests"); -} diff --git a/libc/libc-test/test/linux_ipv6.rs b/libc/libc-test/test/linux_ipv6.rs deleted file mode 100644 index 83c389c..0000000 --- a/libc/libc-test/test/linux_ipv6.rs +++ /dev/null @@ -1,12 +0,0 @@ -#![allow(bad_style, improper_ctypes, unused, deprecated)] - -extern crate libc; -use libc::*; - -#[cfg(target_os = "linux")] -include!(concat!(env!("OUT_DIR"), "/linux_ipv6.rs")); - -#[cfg(not(target_os = "linux"))] -fn main() { - println!("PASSED 0 tests"); -} diff --git a/libc/libc-test/test/linux_strerror_r.rs b/libc/libc-test/test/linux_strerror_r.rs deleted file mode 100644 index 17db959..0000000 --- a/libc/libc-test/test/linux_strerror_r.rs +++ /dev/null @@ -1,12 +0,0 @@ -#![allow(bad_style, improper_ctypes, unused, deprecated)] - -extern crate libc; -use libc::*; - -#[cfg(any(target_os = "linux", target_os = "android"))] -include!(concat!(env!("OUT_DIR"), "/linux_strerror_r.rs")); - -#[cfg(not(any(target_os = "linux", target_os = "android")))] -fn main() { - println!("PASSED 0 tests"); -} diff --git a/libc/libc-test/test/linux_termios.rs b/libc/libc-test/test/linux_termios.rs deleted file mode 100644 index 703a9b9..0000000 --- a/libc/libc-test/test/linux_termios.rs +++ /dev/null @@ -1,12 +0,0 @@ -#![allow(bad_style, improper_ctypes, unused, deprecated)] - -extern crate libc; -use libc::*; - -#[cfg(any(target_os = "linux", target_os = "android"))] -include!(concat!(env!("OUT_DIR"), "/linux_termios.rs")); - -#[cfg(not(any(target_os = "linux", target_os = "android")))] -fn main() { - println!("PASSED 0 tests"); -} diff --git a/libc/libc-test/test/main.rs b/libc/libc-test/test/main.rs deleted file mode 100644 index 62a587c..0000000 --- a/libc/libc-test/test/main.rs +++ /dev/null @@ -1,6 +0,0 @@ -#![allow(bad_style, improper_ctypes, deprecated)] -extern crate libc; - -use libc::*; - -include!(concat!(env!("OUT_DIR"), "/main.rs")); -- cgit v1.2.3