diff options
| author | Daniel Mueller <deso@posteo.net> | 2020-04-04 14:39:19 -0700 | 
|---|---|---|
| committer | Daniel Mueller <deso@posteo.net> | 2020-04-04 14:39:19 -0700 | 
| commit | d0d9683df8398696147e7ee1fcffb2e4e957008c (patch) | |
| tree | 4baa76712a76f4d072ee3936c07956580b230820 /libc/src/unix/bsd/freebsdlike/freebsd/freebsd12 | |
| parent | 203e691f46d591a2cc8acdfd850fa9f5b0fb8a98 (diff) | |
| download | nitrocli-d0d9683df8398696147e7ee1fcffb2e4e957008c.tar.gz nitrocli-d0d9683df8398696147e7ee1fcffb2e4e957008c.tar.bz2 | |
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
Diffstat (limited to 'libc/src/unix/bsd/freebsdlike/freebsd/freebsd12')
| -rw-r--r-- | libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs | 224 | ||||
| -rw-r--r-- | libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs | 34 | 
2 files changed, 0 insertions, 258 deletions
| diff --git a/libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs b/libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs deleted file mode 100644 index 6bf7f95..0000000 --- a/libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/mod.rs +++ /dev/null @@ -1,224 +0,0 @@ -// APIs that changed in FreeBSD12 - -pub type nlink_t = u64; -pub type dev_t = u64; -pub type ino_t = ::c_ulong; -pub type shmatt_t = ::c_uint; - -s! { -    pub struct shmid_ds { -        pub shm_perm: ::ipc_perm, -        pub shm_segsz: ::size_t, -        pub shm_lpid: ::pid_t, -        pub shm_cpid: ::pid_t, -        pub shm_nattch: ::shmatt_t, -        pub shm_atime: ::time_t, -        pub shm_dtime: ::time_t, -        pub shm_ctime: ::time_t, -    } - -    pub struct kevent { -        pub ident: ::uintptr_t, -        pub filter: ::c_short, -        pub flags: ::c_ushort, -        pub fflags: ::c_uint, -        pub data: ::intptr_t, -        pub udata: *mut ::c_void, -        pub ext: [u64; 4], -    } -} - -s_no_extra_traits! { -    pub struct dirent { -        pub d_fileno: ::ino_t, -        pub d_off: ::off_t, -        pub d_reclen: u16, -        pub d_type: u8, -        d_pad0: u8, -        pub d_namlen: u16, -        d_pad1: u16, -        pub d_name: [::c_char; 256], -    } - -    pub struct statfs { -        pub f_version: u32, -        pub f_type: u32, -        pub f_flags: u64, -        pub f_bsize: u64, -        pub f_iosize: u64, -        pub f_blocks: u64, -        pub f_bfree: u64, -        pub f_bavail: i64, -        pub f_files: u64, -        pub f_ffree: i64, -        pub f_syncwrites: u64, -        pub f_asyncwrites: u64, -        pub f_syncreads: u64, -        pub f_asyncreads: u64, -        f_spare: [u64; 10], -        pub f_namemax: u32, -        pub f_owner: ::uid_t, -        pub f_fsid: ::fsid_t, -        f_charspare: [::c_char; 80], -        pub f_fstypename: [::c_char; 16], -        pub f_mntfromname: [::c_char; 1024], -        pub f_mntonname: [::c_char; 1024], -    } -} - -cfg_if! { -    if #[cfg(feature = "extra_traits")] { -        impl PartialEq for statfs { -            fn eq(&self, other: &statfs) -> bool { -                self.f_version == other.f_version -                    && self.f_type == other.f_type -                    && self.f_flags == other.f_flags -                    && self.f_bsize == other.f_bsize -                    && self.f_iosize == other.f_iosize -                    && self.f_blocks == other.f_blocks -                    && self.f_bfree == other.f_bfree -                    && self.f_bavail == other.f_bavail -                    && self.f_files == other.f_files -                    && self.f_ffree == other.f_ffree -                    && self.f_syncwrites == other.f_syncwrites -                    && self.f_asyncwrites == other.f_asyncwrites -                    && self.f_syncreads == other.f_syncreads -                    && self.f_asyncreads == other.f_asyncreads -                    && self.f_namemax == other.f_namemax -                    && self.f_owner == other.f_owner -                    && self.f_fsid == other.f_fsid -                    && self.f_fstypename == other.f_fstypename -                    && self -                    .f_mntfromname -                    .iter() -                    .zip(other.f_mntfromname.iter()) -                    .all(|(a,b)| a == b) -                    && self -                    .f_mntonname -                    .iter() -                    .zip(other.f_mntonname.iter()) -                    .all(|(a,b)| a == b) -            } -        } -        impl Eq for statfs {} -        impl ::fmt::Debug for statfs { -            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result { -                f.debug_struct("statfs") -                    .field("f_bsize", &self.f_bsize) -                    .field("f_iosize", &self.f_iosize) -                    .field("f_blocks", &self.f_blocks) -                    .field("f_bfree", &self.f_bfree) -                    .field("f_bavail", &self.f_bavail) -                    .field("f_files", &self.f_files) -                    .field("f_ffree", &self.f_ffree) -                    .field("f_syncwrites", &self.f_syncwrites) -                    .field("f_asyncwrites", &self.f_asyncwrites) -                    .field("f_syncreads", &self.f_syncreads) -                    .field("f_asyncreads", &self.f_asyncreads) -                    .field("f_namemax", &self.f_namemax) -                    .field("f_owner", &self.f_owner) -                    .field("f_fsid", &self.f_fsid) -                    .field("f_fstypename", &self.f_fstypename) -                    .field("f_mntfromname", &&self.f_mntfromname[..]) -                    .field("f_mntonname", &&self.f_mntonname[..]) -                    .finish() -            } -        } -        impl ::hash::Hash for statfs { -            fn hash<H: ::hash::Hasher>(&self, state: &mut H) { -                self.f_version.hash(state); -                self.f_type.hash(state); -                self.f_flags.hash(state); -                self.f_bsize.hash(state); -                self.f_iosize.hash(state); -                self.f_blocks.hash(state); -                self.f_bfree.hash(state); -                self.f_bavail.hash(state); -                self.f_files.hash(state); -                self.f_ffree.hash(state); -                self.f_syncwrites.hash(state); -                self.f_asyncwrites.hash(state); -                self.f_syncreads.hash(state); -                self.f_asyncreads.hash(state); -                self.f_namemax.hash(state); -                self.f_owner.hash(state); -                self.f_fsid.hash(state); -                self.f_charspare.hash(state); -                self.f_fstypename.hash(state); -                self.f_mntfromname.hash(state); -                self.f_mntonname.hash(state); -            } -        } - -        impl PartialEq for dirent { -            fn eq(&self, other: &dirent) -> bool { -                self.d_fileno == other.d_fileno -                    && self.d_off == other.d_off -                    && self.d_reclen == other.d_reclen -                    && self.d_type == other.d_type -                    && self.d_namlen == other.d_namlen -                    && self -                    .d_name[..self.d_namlen as _] -                    .iter() -                    .zip(other.d_name.iter()) -                    .all(|(a,b)| a == b) -            } -        } -        impl Eq for dirent {} -        impl ::fmt::Debug for dirent { -            fn fmt(&self, f: &mut ::fmt::Formatter) -> ::fmt::Result { -                f.debug_struct("dirent") -                    .field("d_fileno", &self.d_fileno) -                    .field("d_off", &self.d_off) -                    .field("d_reclen", &self.d_reclen) -                    .field("d_type", &self.d_type) -                    .field("d_namlen", &self.d_namlen) -                    .field("d_name", &&self.d_name[..self.d_namlen as _]) -                    .finish() -            } -        } -        impl ::hash::Hash for dirent { -            fn hash<H: ::hash::Hasher>(&self, state: &mut H) { -                self.d_fileno.hash(state); -                self.d_off.hash(state); -                self.d_reclen.hash(state); -                self.d_type.hash(state); -                self.d_namlen.hash(state); -                self.d_name[..self.d_namlen as _].hash(state); -            } -        } -    } -} - -cfg_if! { -    if #[cfg(not(freebsd13))] { -        pub const ELAST: ::c_int = 96; -    } else { -        pub const EINTEGRITY: ::c_int = 97; -        pub const ELAST: ::c_int = 97; -    } -} - -extern "C" { -    pub fn setgrent(); -    pub fn mprotect( -        addr: *mut ::c_void, -        len: ::size_t, -        prot: ::c_int, -    ) -> ::c_int; -    pub fn freelocale(loc: ::locale_t); -    pub fn msgrcv( -        msqid: ::c_int, -        msgp: *mut ::c_void, -        msgsz: ::size_t, -        msgtyp: ::c_long, -        msgflg: ::c_int, -    ) -> ::ssize_t; -} - -cfg_if! { -    if #[cfg(target_arch = "x86_64")] { -        mod x86_64; -        pub use self::x86_64::*; -    } -} diff --git a/libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs b/libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs deleted file mode 100644 index 80c6fa1..0000000 --- a/libc/src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs +++ /dev/null @@ -1,34 +0,0 @@ -#[repr(C)] -#[cfg_attr(feature = "extra_traits", derive(Debug, Eq, Hash, PartialEq))] -pub struct stat { -    pub st_dev: ::dev_t, -    pub st_ino: ::ino_t, -    pub st_nlink: ::nlink_t, -    pub st_mode: ::mode_t, -    st_padding0: i16, -    pub st_uid: ::uid_t, -    pub st_gid: ::gid_t, -    st_padding1: i32, -    pub st_rdev: ::dev_t, -    pub st_atime: ::time_t, -    pub st_atime_nsec: ::c_long, -    pub st_mtime: ::time_t, -    pub st_mtime_nsec: ::c_long, -    pub st_ctime: ::time_t, -    pub st_ctime_nsec: ::c_long, -    pub st_birthtime: ::time_t, -    pub st_birthtime_nsec: ::c_long, -    pub st_size: ::off_t, -    pub st_blocks: ::blkcnt_t, -    pub st_blksize: ::blksize_t, -    pub st_flags: ::fflags_t, -    pub st_gen: u64, -    pub st_spare: [u64; 10], -} - -impl ::Copy for ::stat {} -impl ::Clone for ::stat { -    fn clone(&self) -> ::stat { -        *self -    } -} | 
