commit 9988882c6399b9b54d50f22617f3358bec4cb89b Author: Isis Lovecruft isis@torproject.org Date: Tue May 15 02:02:02 2018 +0000
rust: Move rand crate into crypto parent crate. --- src/rust/Cargo.lock | 17 ++++------------- src/rust/Cargo.toml | 1 - src/rust/crypto/Cargo.toml | 15 +++++++++++---- src/rust/{rand/lib.rs => crypto/rand/mod.rs} | 0 src/rust/{ => crypto}/rand/rng.rs | 0 src/rust/include.am | 5 ++--- src/rust/rand/Cargo.toml | 27 --------------------------- 7 files changed, 17 insertions(+), 48 deletions(-)
diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index ddbc0ac2b..769e2c39c 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -5,7 +5,11 @@ dependencies = [ "digest 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "external 0.0.1", "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.5.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "smartlist 0.0.1", + "tor_allocate 0.0.1", + "tor_log 0.1.0", ]
[[package]] @@ -51,19 +55,6 @@ dependencies = [
[[package]] name = "rand" -version = "0.0.1" -dependencies = [ - "external 0.0.1", - "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.5.0-pre.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tor_allocate 0.0.1", - "tor_log 0.1.0", - "tor_util 0.0.1", -] - -[[package]] -name = "rand" version = "0.5.0-pre.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml index 1aaab0c4f..c3e44d2a7 100644 --- a/src/rust/Cargo.toml +++ b/src/rust/Cargo.toml @@ -3,7 +3,6 @@ members = [ "crypto", "external", "protover", - "rand", "smartlist", "tor_allocate", "tor_log", diff --git a/src/rust/crypto/Cargo.toml b/src/rust/crypto/Cargo.toml index e6a8bffa2..8b489dfb4 100644 --- a/src/rust/crypto/Cargo.toml +++ b/src/rust/crypto/Cargo.toml @@ -13,9 +13,16 @@ crate_type = ["rlib", "staticlib"] [dependencies] libc = "=0.2.39" digest = "=0.7.2" +rand_core = "=0.1.0"
-[dependencies.external] -path = "../external" +external = { path = "../external" } +smartlist = { path = "../smartlist" } +tor_allocate = { path = "../tor_allocate" } +tor_log = { path = "../tor_log" } + +[dev-dependencies] +rand = { version = "=0.5.0-pre.1", default-features = false } + +[features] +testing = ["tor_log/testing"]
-[dependencies.smartlist] -path = "../smartlist" diff --git a/src/rust/rand/lib.rs b/src/rust/crypto/rand/mod.rs similarity index 100% rename from src/rust/rand/lib.rs rename to src/rust/crypto/rand/mod.rs diff --git a/src/rust/rand/rng.rs b/src/rust/crypto/rand/rng.rs similarity index 100% rename from src/rust/rand/rng.rs rename to src/rust/crypto/rand/rng.rs diff --git a/src/rust/include.am b/src/rust/include.am index ba652bda0..5fd9741e0 100644 --- a/src/rust/include.am +++ b/src/rust/include.am @@ -8,6 +8,8 @@ EXTRA_DIST +=\ src/rust/crypto/lib.rs \ src/rust/crypto/digests/mod.rs \ src/rust/crypto/digests/sha2.rs \ + src/rust/crypto/rand/mod.rs \ + src/rust/crypto/rand/rng.rs \ src/rust/external/Cargo.toml \ src/rust/external/crypto_digest.rs \ src/rust/external/crypto_rand.rs \ @@ -20,9 +22,6 @@ EXTRA_DIST +=\ src/rust/protover/lib.rs \ src/rust/protover/protover.rs \ src/rust/protover/tests/protover.rs \ - src/rust/rand/Cargo.toml \ - src/rust/rand/lib.rs \ - src/rust/rand/rng.rs \ src/rust/smartlist/Cargo.toml \ src/rust/smartlist/lib.rs \ src/rust/smartlist/smartlist.rs \ diff --git a/src/rust/rand/Cargo.toml b/src/rust/rand/Cargo.toml deleted file mode 100644 index b5bbf5c1b..000000000 --- a/src/rust/rand/Cargo.toml +++ /dev/null @@ -1,27 +0,0 @@ -# TODO: Note that this package should be merged into the "crypto" crate after #24659 is merged. - -[package] -authors = ["The Tor Project"] -version = "0.0.1" -name = "rand" -publish = false - -[features] -testing = ["tor_log/testing"] - -[dependencies] -libc = "=0.2.39" -rand_core = "=0.1.0" - -external = { path = "../external" } -tor_allocate = { path = "../tor_allocate" } -tor_log = { path = "../tor_log" } -tor_util = { path = "../tor_util" } - -[dev-dependencies] -rand = { version = "=0.5.0-pre.1", default-features = false } - -[lib] -name = "rand" -path = "lib.rs" -crate_type = ["rlib", "staticlib"]