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 --- rand/tests/wasm_bindgen/Cargo.toml | 16 ------------ rand/tests/wasm_bindgen/js/index.js | 7 ------ rand/tests/wasm_bindgen/src/lib.rs | 49 ------------------------------------- 3 files changed, 72 deletions(-) delete mode 100644 rand/tests/wasm_bindgen/Cargo.toml delete mode 100644 rand/tests/wasm_bindgen/js/index.js delete mode 100644 rand/tests/wasm_bindgen/src/lib.rs (limited to 'rand/tests') diff --git a/rand/tests/wasm_bindgen/Cargo.toml b/rand/tests/wasm_bindgen/Cargo.toml deleted file mode 100644 index e83c174..0000000 --- a/rand/tests/wasm_bindgen/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -name = "rand_wasm_bindgen_test" -description = "Minimal crate to test that rand can be build for web assembly target" -version = "0.1.0" -authors = ["The Rand Project Developers"] -publish = false -license = "MIT OR Apache-2.0" -edition = "2018" - -[lib] -crate-type = ["cdylib"] - -[dependencies] -rand = { path = "../..", features = ["wasm-bindgen"] } -wasm-bindgen = "0.2" -wasm-bindgen-test = "0.2" diff --git a/rand/tests/wasm_bindgen/js/index.js b/rand/tests/wasm_bindgen/js/index.js deleted file mode 100644 index a02fb59..0000000 --- a/rand/tests/wasm_bindgen/js/index.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict'; - -const rand_wasm_bindgen_test = require('./rand_wasm_bindgen_test'); - -console.log(rand_wasm_bindgen_test.generate_from_entropy()); -console.log(rand_wasm_bindgen_test.generate_from_os_rand()); -console.log(rand_wasm_bindgen_test.generate_from_seed()); diff --git a/rand/tests/wasm_bindgen/src/lib.rs b/rand/tests/wasm_bindgen/src/lib.rs deleted file mode 100644 index 9af0b9e..0000000 --- a/rand/tests/wasm_bindgen/src/lib.rs +++ /dev/null @@ -1,49 +0,0 @@ -// Copyright 2018 Developers of the Rand project. -// -// 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. - -// Crate to test WASM with the `wasm-bindgen` lib. - -#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png")] - -use rand::rngs::{OsRng, StdRng}; -use rand::{Rng, SeedableRng}; -use wasm_bindgen::prelude::*; - -#[wasm_bindgen] -pub fn generate_from_seed(seed: u32) -> i32 { - StdRng::seed_from_u64(seed as u64).gen() -} - -#[wasm_bindgen] -pub fn generate_from_os_rand() -> i32 { - OsRng.gen() -} - -#[wasm_bindgen] -pub fn generate_from_entropy() -> i32 { - StdRng::from_entropy().gen() -} - -pub mod tests { - use wasm_bindgen_test::*; - - #[wasm_bindgen_test] - fn generate_from_seed() { - let _ = super::generate_from_seed(42); - } - - #[wasm_bindgen_test] - fn generate_from_os_rand() { - let _ = super::generate_from_os_rand(); - } - - #[wasm_bindgen_test] - fn generate_from_entropy() { - let _ = super::generate_from_entropy(); - } -} -- cgit v1.2.3