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/src/lib.rs | 157 -------------------------------------------------------- 1 file changed, 157 deletions(-) delete mode 100644 libc/src/lib.rs (limited to 'libc/src/lib.rs') diff --git a/libc/src/lib.rs b/libc/src/lib.rs deleted file mode 100644 index 0b1496a..0000000 --- a/libc/src/lib.rs +++ /dev/null @@ -1,157 +0,0 @@ -// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. -//! libc - Raw FFI bindings to platforms' system libraries -//! -//! [Documentation for other platforms][pd]. -//! -//! [pd]: https://rust-lang.github.io/libc/#platform-specific-documentation -#![crate_name = "libc"] -#![crate_type = "rlib"] -#![cfg_attr(libc_deny_warnings, deny(warnings))] -#![allow( - bad_style, - overflowing_literals, - improper_ctypes, - unknown_lints, - redundant_semicolon -)] -// Attributes needed when building as part of the standard library -#![cfg_attr( - feature = "rustc-dep-of-std", - feature(cfg_target_vendor, link_cfg, no_core) -)] -#![cfg_attr(libc_thread_local, feature(thread_local))] -// Enable extra lints: -#![cfg_attr(feature = "extra_traits", deny(missing_debug_implementations))] -#![deny(missing_copy_implementations, safe_packed_borrows)] -#![no_std] -#![cfg_attr(feature = "rustc-dep-of-std", no_core)] -#![cfg_attr(target_os = "redox", feature(static_nobundle))] -#![cfg_attr(libc_const_extern_fn, feature(const_extern_fn))] - -#[macro_use] -mod macros; - -cfg_if! { - if #[cfg(feature = "rustc-dep-of-std")] { - extern crate rustc_std_workspace_core as core; - #[allow(unused_imports)] - use core::iter; - #[allow(unused_imports)] - use core::option; - } -} - -cfg_if! { - if #[cfg(libc_priv_mod_use)] { - #[cfg(libc_core_cvoid)] - #[allow(unused_imports)] - use core::ffi; - #[allow(unused_imports)] - use core::fmt; - #[allow(unused_imports)] - use core::hash; - #[allow(unused_imports)] - use core::num; - #[allow(unused_imports)] - use core::mem; - #[doc(hidden)] - #[allow(unused_imports)] - use core::clone::Clone; - #[doc(hidden)] - #[allow(unused_imports)] - use core::marker::Copy; - #[doc(hidden)] - #[allow(unused_imports)] - use core::option::Option; - } else { - #[doc(hidden)] - #[allow(unused_imports)] - pub use core::fmt; - #[doc(hidden)] - #[allow(unused_imports)] - pub use core::hash; - #[doc(hidden)] - #[allow(unused_imports)] - pub use core::num; - #[doc(hidden)] - #[allow(unused_imports)] - pub use core::mem; - #[doc(hidden)] - #[allow(unused_imports)] - pub use core::clone::Clone; - #[doc(hidden)] - #[allow(unused_imports)] - pub use core::marker::Copy; - #[doc(hidden)] - #[allow(unused_imports)] - pub use core::option::Option; - } -} - -cfg_if! { - if #[cfg(windows)] { - mod fixed_width_ints; - pub use fixed_width_ints::*; - - mod windows; - pub use windows::*; - } else if #[cfg(target_os = "cloudabi")] { - mod fixed_width_ints; - pub use fixed_width_ints::*; - - mod cloudabi; - pub use cloudabi::*; - } else if #[cfg(target_os = "fuchsia")] { - mod fixed_width_ints; - pub use fixed_width_ints::*; - - mod fuchsia; - pub use fuchsia::*; - } else if #[cfg(target_os = "switch")] { - mod fixed_width_ints; - pub use fixed_width_ints::*; - - mod switch; - pub use switch::*; - } else if #[cfg(target_os = "vxworks")] { - mod fixed_width_ints; - pub use fixed_width_ints::*; - - mod vxworks; - pub use vxworks::*; - } else if #[cfg(unix)] { - mod fixed_width_ints; - pub use fixed_width_ints::*; - - mod unix; - pub use unix::*; - } else if #[cfg(target_os = "hermit")] { - mod fixed_width_ints; - pub use fixed_width_ints::*; - - mod hermit; - pub use hermit::*; - } else if #[cfg(all(target_env = "sgx", target_vendor = "fortanix"))] { - mod fixed_width_ints; - pub use fixed_width_ints::*; - - mod sgx; - pub use sgx::*; - } else if #[cfg(any(target_env = "wasi", target_os = "wasi"))] { - mod fixed_width_ints; - pub use fixed_width_ints::*; - - mod wasi; - pub use wasi::*; - } else { - // non-supported targets: empty... - } -} -- cgit v1.2.1