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 --- cc/cc-test/Cargo.toml | 16 -------- cc/cc-test/build.rs | 88 -------------------------------------------- cc/cc-test/src/NMakefile | 14 ------- cc/cc-test/src/aarch64.S | 10 ----- cc/cc-test/src/bar1.c | 7 ---- cc/cc-test/src/bar2.c | 6 --- cc/cc-test/src/baz.cpp | 9 ----- cc/cc-test/src/expand.c | 4 -- cc/cc-test/src/foo.c | 9 ----- cc/cc-test/src/i686.S | 9 ----- cc/cc-test/src/i686.asm | 9 ----- cc/cc-test/src/include/foo.h | 0 cc/cc-test/src/lib.rs | 16 -------- cc/cc-test/src/msvc.c | 7 ---- cc/cc-test/src/opt_linkage.c | 5 --- cc/cc-test/src/windows.c | 3 -- cc/cc-test/src/x86_64.S | 9 ----- cc/cc-test/src/x86_64.asm | 8 ---- cc/cc-test/tests/all.rs | 58 ----------------------------- 19 files changed, 287 deletions(-) delete mode 100644 cc/cc-test/Cargo.toml delete mode 100644 cc/cc-test/build.rs delete mode 100644 cc/cc-test/src/NMakefile delete mode 100644 cc/cc-test/src/aarch64.S delete mode 100644 cc/cc-test/src/bar1.c delete mode 100644 cc/cc-test/src/bar2.c delete mode 100644 cc/cc-test/src/baz.cpp delete mode 100644 cc/cc-test/src/expand.c delete mode 100644 cc/cc-test/src/foo.c delete mode 100644 cc/cc-test/src/i686.S delete mode 100644 cc/cc-test/src/i686.asm delete mode 100644 cc/cc-test/src/include/foo.h delete mode 100644 cc/cc-test/src/lib.rs delete mode 100644 cc/cc-test/src/msvc.c delete mode 100644 cc/cc-test/src/opt_linkage.c delete mode 100644 cc/cc-test/src/windows.c delete mode 100644 cc/cc-test/src/x86_64.S delete mode 100644 cc/cc-test/src/x86_64.asm delete mode 100644 cc/cc-test/tests/all.rs (limited to 'cc/cc-test') diff --git a/cc/cc-test/Cargo.toml b/cc/cc-test/Cargo.toml deleted file mode 100644 index c25854c..0000000 --- a/cc/cc-test/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "cc-test" -version = "0.1.0" -authors = ["Alex Crichton "] -edition = "2018" - -[lib] -name = "cc_test" -doctest = false -test = false - -[build-dependencies] -cc = { path = ".." } - -[features] -parallel = ["cc/parallel"] diff --git a/cc/cc-test/build.rs b/cc/cc-test/build.rs deleted file mode 100644 index 3065861..0000000 --- a/cc/cc-test/build.rs +++ /dev/null @@ -1,88 +0,0 @@ -use std::env; -use std::fs; -use std::path::PathBuf; - -fn main() { - let out = PathBuf::from(env::var_os("OUT_DIR").unwrap()); - fs::remove_dir_all(&out).unwrap(); - fs::create_dir(&out).unwrap(); - - cc::Build::new() - .file("src/foo.c") - .flag_if_supported("-Wall") - .flag_if_supported("-Wfoo-bar-this-flag-does-not-exist") - .define("FOO", None) - .define("BAR", "1") - .compile("foo"); - - cc::Build::new() - .file("src/bar1.c") - .file("src/bar2.c") - .include("src/include") - .compile("bar"); - - let target = std::env::var("TARGET").unwrap(); - let file = target.split("-").next().unwrap(); - let file = format!( - "src/{}.{}", - file, - if target.contains("msvc") { "asm" } else { "S" } - ); - cc::Build::new().file(file).compile("asm"); - - cc::Build::new() - .file("src/baz.cpp") - .cpp(true) - .compile("baz"); - - if target.contains("windows") { - cc::Build::new().file("src/windows.c").compile("windows"); - } - - // Test that the `windows_registry` module will set PATH by looking for - // nmake which runs vanilla cl, and then also test it after we remove all - // the relevant env vars from our own process. - if target.contains("msvc") { - let out = out.join("tmp"); - fs::create_dir(&out).unwrap(); - println!("nmake 1"); - let status = cc::windows_registry::find(&target, "nmake.exe") - .unwrap() - .env_remove("MAKEFLAGS") - .arg("/fsrc/NMakefile") - .env("OUT_DIR", &out) - .status() - .unwrap(); - assert!(status.success()); - - fs::remove_dir_all(&out).unwrap(); - fs::create_dir(&out).unwrap(); - - env::remove_var("PATH"); - env::remove_var("VCINSTALLDIR"); - env::remove_var("INCLUDE"); - env::remove_var("LIB"); - println!("nmake 2"); - let status = cc::windows_registry::find(&target, "nmake.exe") - .unwrap() - .env_remove("MAKEFLAGS") - .arg("/fsrc/NMakefile") - .env("OUT_DIR", &out) - .status() - .unwrap(); - assert!(status.success()); - println!("cargo:rustc-link-lib=msvc"); - println!("cargo:rustc-link-search={}", out.display()); - } - - // This tests whether we can build a library but not link it to the main - // crate. The test module will do its own linking. - cc::Build::new() - .cargo_metadata(false) - .file("src/opt_linkage.c") - .compile("OptLinkage"); - - let out = cc::Build::new().file("src/expand.c").expand(); - let out = String::from_utf8(out).unwrap(); - assert!(out.contains("hello world")); -} diff --git a/cc/cc-test/src/NMakefile b/cc/cc-test/src/NMakefile deleted file mode 100644 index 03c73df..0000000 --- a/cc/cc-test/src/NMakefile +++ /dev/null @@ -1,14 +0,0 @@ -all: $(OUT_DIR)/msvc.lib $(OUT_DIR)/msvc.exe - -$(OUT_DIR)/msvc.lib: $(OUT_DIR)/msvc.o - lib -nologo -out:$(OUT_DIR)/msvc.lib $(OUT_DIR)/msvc.o - rc -h - -$(OUT_DIR)/msvc.o: src/msvc.c - $(CC) -nologo -c -Fo:$@ src/msvc.c -MD - -$(OUT_DIR)/msvc.exe: $(OUT_DIR)/msvc2.o - $(CC) -nologo -Fo:$@ $(OUT_DIR)/msvc2.o - -$(OUT_DIR)/msvc2.o: src/msvc.c - $(CC) -nologo -c -Fo:$@ src/msvc.c -DMAIN -MD diff --git a/cc/cc-test/src/aarch64.S b/cc/cc-test/src/aarch64.S deleted file mode 100644 index 1d9062d..0000000 --- a/cc/cc-test/src/aarch64.S +++ /dev/null @@ -1,10 +0,0 @@ -.globl asm -asm: - mov w0, 7 - ret - -.globl _asm -_asm: - mov w0, 7 - ret - diff --git a/cc/cc-test/src/bar1.c b/cc/cc-test/src/bar1.c deleted file mode 100644 index 605be33..0000000 --- a/cc/cc-test/src/bar1.c +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include "foo.h" - -int32_t bar1() { - return 5; -} - diff --git a/cc/cc-test/src/bar2.c b/cc/cc-test/src/bar2.c deleted file mode 100644 index 9be4291..0000000 --- a/cc/cc-test/src/bar2.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int32_t bar2() { - return 6; -} - diff --git a/cc/cc-test/src/baz.cpp b/cc/cc-test/src/baz.cpp deleted file mode 100644 index 2d4b959..0000000 --- a/cc/cc-test/src/baz.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include - -extern "C" int32_t -baz() { - int *a = new int(8); - int b = *a; - delete a; - return b; -} diff --git a/cc/cc-test/src/expand.c b/cc/cc-test/src/expand.c deleted file mode 100644 index 2b492a2..0000000 --- a/cc/cc-test/src/expand.c +++ /dev/null @@ -1,4 +0,0 @@ -#define HELLO hello -#define WORLD world - -HELLO WORLD diff --git a/cc/cc-test/src/foo.c b/cc/cc-test/src/foo.c deleted file mode 100644 index 541e62c..0000000 --- a/cc/cc-test/src/foo.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#ifdef FOO -#if BAR == 1 -int32_t foo() { - return 4; -} -#endif -#endif diff --git a/cc/cc-test/src/i686.S b/cc/cc-test/src/i686.S deleted file mode 100644 index 3ed9e86..0000000 --- a/cc/cc-test/src/i686.S +++ /dev/null @@ -1,9 +0,0 @@ -.globl asm -asm: - mov $7, %eax - ret - -.globl _asm -_asm: - mov $7, %eax - ret diff --git a/cc/cc-test/src/i686.asm b/cc/cc-test/src/i686.asm deleted file mode 100644 index 6bf9676..0000000 --- a/cc/cc-test/src/i686.asm +++ /dev/null @@ -1,9 +0,0 @@ -.586 -.MODEL FLAT, C -.CODE - -asm PROC - MOV EAX, 7 - RET -asm ENDP -END diff --git a/cc/cc-test/src/include/foo.h b/cc/cc-test/src/include/foo.h deleted file mode 100644 index e69de29..0000000 diff --git a/cc/cc-test/src/lib.rs b/cc/cc-test/src/lib.rs deleted file mode 100644 index b42ebf7..0000000 --- a/cc/cc-test/src/lib.rs +++ /dev/null @@ -1,16 +0,0 @@ -extern "C" { - pub fn foo() -> i32; - - pub fn bar1() -> i32; - pub fn bar2() -> i32; - - pub fn asm() -> i32; - - pub fn baz() -> i32; - - #[cfg(windows)] - pub fn windows(); - - #[cfg(target_env = "msvc")] - pub fn msvc(); -} diff --git a/cc/cc-test/src/msvc.c b/cc/cc-test/src/msvc.c deleted file mode 100644 index dbbc494..0000000 --- a/cc/cc-test/src/msvc.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -void msvc() {} - -#ifdef MAIN -int main() {} -#endif diff --git a/cc/cc-test/src/opt_linkage.c b/cc/cc-test/src/opt_linkage.c deleted file mode 100644 index a74af8c..0000000 --- a/cc/cc-test/src/opt_linkage.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -int32_t answer() { - return 42; -} diff --git a/cc/cc-test/src/windows.c b/cc/cc-test/src/windows.c deleted file mode 100644 index 0896aa0..0000000 --- a/cc/cc-test/src/windows.c +++ /dev/null @@ -1,3 +0,0 @@ -#include - -void windows() {} diff --git a/cc/cc-test/src/x86_64.S b/cc/cc-test/src/x86_64.S deleted file mode 100644 index 3ed9e86..0000000 --- a/cc/cc-test/src/x86_64.S +++ /dev/null @@ -1,9 +0,0 @@ -.globl asm -asm: - mov $7, %eax - ret - -.globl _asm -_asm: - mov $7, %eax - ret diff --git a/cc/cc-test/src/x86_64.asm b/cc/cc-test/src/x86_64.asm deleted file mode 100644 index 1c03101..0000000 --- a/cc/cc-test/src/x86_64.asm +++ /dev/null @@ -1,8 +0,0 @@ -_TEXT SEGMENT - -asm PROC - MOV EAX, 7 - RET -asm ENDP - -END diff --git a/cc/cc-test/tests/all.rs b/cc/cc-test/tests/all.rs deleted file mode 100644 index a457c72..0000000 --- a/cc/cc-test/tests/all.rs +++ /dev/null @@ -1,58 +0,0 @@ -use cc_test::*; - -#[link(name = "OptLinkage", kind = "static")] -extern "C" { - fn answer() -> i32; -} - -#[test] -fn foo_here() { - unsafe { - assert_eq!(foo(), 4); - } -} - -#[test] -fn bar_here() { - unsafe { - assert_eq!(bar1(), 5); - assert_eq!(bar2(), 6); - } -} - -#[test] -fn asm_here() { - unsafe { - assert_eq!(asm(), 7); - } -} - -#[test] -fn baz_here() { - unsafe { - assert_eq!(baz(), 8); - } -} - -#[test] -#[cfg(windows)] -fn windows_here() { - unsafe { - windows(); - } -} - -#[test] -#[cfg(target_env = "msvc")] -fn msvc_here() { - unsafe { - msvc(); - } -} - -#[test] -fn opt_linkage() { - unsafe { - assert_eq!(answer(), 42); - } -} -- cgit v1.2.3