sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rust: Move rand crate into crypto parent crate.

This commit is contained in:
Isis Lovecruft 2018-05-15 02:02:02 +00:00
parent 2ac849da36
commit 9988882c63
No known key found for this signature in database
GPG Key ID: B8938BC5E86C046F
7 changed files with 17 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/rust/Cargo.lock generated
View File

@ -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]]
@ -49,19 +53,6 @@ dependencies = [
"tor_util 0.0.1",
]
[[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"

1
src/rust/Cargo.toml
View File

@ -3,7 +3,6 @@ members = [
"crypto",
"external",
"protover",
"rand",
"smartlist",
"tor_allocate",
"tor_log",

15
src/rust/crypto/Cargo.toml
View File

@ -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"

0
src/rust/rand/lib.rs → src/rust/crypto/rand/mod.rs
View File

0
src/rust/rand/rng.rs → src/rust/crypto/rand/rng.rs
View File

5
src/rust/include.am
View File

@ -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 \

27
src/rust/rand/Cargo.toml
View File

@ -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"]