From d0d9683df8398696147e7ee1fcffb2e4e957008c Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
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
---
 cc/tests/cc_env.rs | 118 -----------------------------------------------------
 1 file changed, 118 deletions(-)
 delete mode 100644 cc/tests/cc_env.rs

(limited to 'cc/tests/cc_env.rs')

diff --git a/cc/tests/cc_env.rs b/cc/tests/cc_env.rs
deleted file mode 100644
index 43eb689..0000000
--- a/cc/tests/cc_env.rs
+++ /dev/null
@@ -1,118 +0,0 @@
-use std::env;
-use std::ffi::OsString;
-use std::path::Path;
-
-mod support;
-use crate::support::Test;
-
-#[test]
-fn main() {
-    ccache();
-    distcc();
-    ccache_spaces();
-    ccache_env_flags();
-    leading_spaces();
-    extra_flags();
-    path_to_ccache();
-    more_spaces();
-}
-
-fn ccache() {
-    let test = Test::gnu();
-
-    env::set_var("CC", "ccache cc");
-    let compiler = test.gcc().file("foo.c").get_compiler();
-
-    assert_eq!(compiler.path(), Path::new("cc"));
-}
-
-fn ccache_spaces() {
-    let test = Test::gnu();
-    test.shim("ccache");
-
-    env::set_var("CC", "ccache        cc");
-    let compiler = test.gcc().file("foo.c").get_compiler();
-    assert_eq!(compiler.path(), Path::new("cc"));
-}
-
-fn distcc() {
-    let test = Test::gnu();
-    test.shim("distcc");
-
-    env::set_var("CC", "distcc cc");
-    let compiler = test.gcc().file("foo.c").get_compiler();
-    assert_eq!(compiler.path(), Path::new("cc"));
-}
-
-fn ccache_env_flags() {
-    let test = Test::gnu();
-    test.shim("ccache");
-
-    env::set_var("CC", "ccache lol-this-is-not-a-compiler");
-    let compiler = test.gcc().file("foo.c").get_compiler();
-    assert_eq!(compiler.path(), Path::new("lol-this-is-not-a-compiler"));
-    assert_eq!(
-        compiler.cc_env(),
-        OsString::from("ccache lol-this-is-not-a-compiler")
-    );
-    assert!(
-        compiler
-            .cflags_env()
-            .into_string()
-            .unwrap()
-            .contains("ccache")
-            == false
-    );
-    assert!(
-        compiler
-            .cflags_env()
-            .into_string()
-            .unwrap()
-            .contains(" lol-this-is-not-a-compiler")
-            == false
-    );
-
-    env::set_var("CC", "");
-}
-
-fn leading_spaces() {
-    let test = Test::gnu();
-    test.shim("ccache");
-
-    env::set_var("CC", " test ");
-    let compiler = test.gcc().file("foo.c").get_compiler();
-    assert_eq!(compiler.path(), Path::new("test"));
-
-    env::set_var("CC", "");
-}
-
-fn extra_flags() {
-    let test = Test::gnu();
-    test.shim("ccache");
-
-    env::set_var("CC", "ccache cc -m32");
-    let compiler = test.gcc().file("foo.c").get_compiler();
-    assert_eq!(compiler.path(), Path::new("cc"));
-}
-
-fn path_to_ccache() {
-    let test = Test::gnu();
-    test.shim("ccache");
-
-    env::set_var("CC", "/path/to/ccache.exe cc -m32");
-    let compiler = test.gcc().file("foo.c").get_compiler();
-    assert_eq!(compiler.path(), Path::new("cc"));
-    assert_eq!(
-        compiler.cc_env(),
-        OsString::from("/path/to/ccache.exe cc -m32"),
-    );
-}
-
-fn more_spaces() {
-    let test = Test::gnu();
-    test.shim("ccache");
-
-    env::set_var("CC", "cc -m32");
-    let compiler = test.gcc().file("foo.c").get_compiler();
-    assert_eq!(compiler.path(), Path::new("cc"));
-}
-- 
cgit v1.2.1