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 --- lazy-static/compiletest/Cargo.toml | 11 ----------- lazy-static/compiletest/src/lib.rs | 11 ----------- .../compiletest/tests/compile-fail/README.md | 22 ---------------------- .../incorrect_visibility_restriction.rs | 10 ---------- .../tests/compile-fail/static_is_private.rs | 14 -------------- .../tests/compile-fail/static_is_sized.rs | 11 ----------- lazy-static/compiletest/tests/compile_tests.rs | 19 ------------------- 7 files changed, 98 deletions(-) delete mode 100644 lazy-static/compiletest/Cargo.toml delete mode 100644 lazy-static/compiletest/src/lib.rs delete mode 100644 lazy-static/compiletest/tests/compile-fail/README.md delete mode 100644 lazy-static/compiletest/tests/compile-fail/incorrect_visibility_restriction.rs delete mode 100644 lazy-static/compiletest/tests/compile-fail/static_is_private.rs delete mode 100644 lazy-static/compiletest/tests/compile-fail/static_is_sized.rs delete mode 100644 lazy-static/compiletest/tests/compile_tests.rs (limited to 'lazy-static/compiletest') diff --git a/lazy-static/compiletest/Cargo.toml b/lazy-static/compiletest/Cargo.toml deleted file mode 100644 index e25d5a7..0000000 --- a/lazy-static/compiletest/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "lazy_static_compiletest" -version = "0.0.1" -publish = false -authors = ["lazy_static contributors"] - -[dependencies.lazy_static] -path = "../" - -[dependencies.compiletest_rs] -version = "0.3" diff --git a/lazy-static/compiletest/src/lib.rs b/lazy-static/compiletest/src/lib.rs deleted file mode 100644 index 0452765..0000000 --- a/lazy-static/compiletest/src/lib.rs +++ /dev/null @@ -1,11 +0,0 @@ -/* -This library is a shim around `lazy_static` that disambiguates it with the `lazy_static` -that's shipped with the Rust toolchain. We re-export the entire public API of `lazy_static` -under a different crate name so that can be imported in the compile tests. - -This currently appears to use the right local build of `lazy_static`. -*/ - -extern crate lazy_static; - -pub use self::lazy_static::*; diff --git a/lazy-static/compiletest/tests/compile-fail/README.md b/lazy-static/compiletest/tests/compile-fail/README.md deleted file mode 100644 index 58dbc3b..0000000 --- a/lazy-static/compiletest/tests/compile-fail/README.md +++ /dev/null @@ -1,22 +0,0 @@ -This directory contains snippets of code that should yield a -warning/note/help/error at compilation. Syntax of annotations is described in -[rust documentation](https://github.com/rust-lang/rust/blob/master/src/test/COMPILER_TESTS.md). -For more information check out [`compiletest` crate](https://github.com/laumann/compiletest-rs). - -To run compile tests issue `cargo +nightly --test`. - -## Notes on working with `compiletest` crate - -* Currently code that is inside macro should not be annotated, as `compiletest` - crate cannot deal with the fact that macro invocations effectively changes - line numbering. To prevent this add a `// error-pattern:` - on the top of the file and make sure that you set `deny` lint level - if you want to test compiler message different than error. -* `compiletest` crate by default sets `allow(dead_code)` lint level so make sure - that you change it to something suiting your needs even if the warning is - issued prior to any macro invocation. -* If you get a message `error: 0 unexpected errors found, 1 expected errors not found` - despite the fact that some error was bound to occur don't worry - it's a known - issue in the `compiletest` crate and your error was probably not registered - - make sure that your annotations are correct and that you are setting correct - lint levels. diff --git a/lazy-static/compiletest/tests/compile-fail/incorrect_visibility_restriction.rs b/lazy-static/compiletest/tests/compile-fail/incorrect_visibility_restriction.rs deleted file mode 100644 index 360e23d..0000000 --- a/lazy-static/compiletest/tests/compile-fail/incorrect_visibility_restriction.rs +++ /dev/null @@ -1,10 +0,0 @@ -// incorrect visibility restriction -#[macro_use] -extern crate lazy_static_compiletest as lazy_static; - -lazy_static! { - pub(nonsense) static ref WRONG: () = (); - //~^ ERROR incorrect visibility restriction -} - -fn main() { } diff --git a/lazy-static/compiletest/tests/compile-fail/static_is_private.rs b/lazy-static/compiletest/tests/compile-fail/static_is_private.rs deleted file mode 100644 index 6ebc8f5..0000000 --- a/lazy-static/compiletest/tests/compile-fail/static_is_private.rs +++ /dev/null @@ -1,14 +0,0 @@ -#[macro_use] -extern crate lazy_static_compiletest as lazy_static; - -mod outer { - pub mod inner { - lazy_static! { - pub(in outer) static ref FOO: () = (); - } - } -} - -fn main() { - assert_eq!(*outer::inner::FOO, ()); //~ ERROR static `FOO` is private -} diff --git a/lazy-static/compiletest/tests/compile-fail/static_is_sized.rs b/lazy-static/compiletest/tests/compile-fail/static_is_sized.rs deleted file mode 100644 index ac1cad4..0000000 --- a/lazy-static/compiletest/tests/compile-fail/static_is_sized.rs +++ /dev/null @@ -1,11 +0,0 @@ -// error-pattern:the size for values of type `str` cannot be known at compilation time -#[macro_use] -extern crate lazy_static_compiletest as lazy_static; - -lazy_static! { - pub static ref FOO: str = panic!(); -} - - -fn main() { -} diff --git a/lazy-static/compiletest/tests/compile_tests.rs b/lazy-static/compiletest/tests/compile_tests.rs deleted file mode 100644 index d908077..0000000 --- a/lazy-static/compiletest/tests/compile_tests.rs +++ /dev/null @@ -1,19 +0,0 @@ -extern crate compiletest_rs as compiletest; - -fn run_mode(mode: &'static str) { - let mut config = compiletest::Config::default(); - config.mode = mode.parse().expect("Invalid mode"); - config.src_base = ["tests", mode].iter().collect(); - - config.verbose = true; - - config.target_rustcflags = Some("-L target/debug/ -L target/debug/deps/".to_owned()); - config.clean_rmeta(); - - compiletest::run_tests(&config); -} - -#[test] -fn compile_test() { - run_mode("compile-fail"); -} -- cgit v1.2.1