commit 00a473733d78f15d59c48d3244d7fc8302c8314c Author: Isis Lovecruft isis@torproject.org Date: Wed Mar 14 21:25:52 2018 +0000
maint: Update Rust libc dependency from 0.2.22 to 0.2.39.
Requires the update/libc-0.2.39 branch from https://github.com/isislovecruft/tor-rust-dependencies to be merged first. --- src/ext/rust | 2 +- src/rust/Cargo.lock | 28 ++++++++++++++-------------- src/rust/external/Cargo.toml | 2 +- src/rust/protover/Cargo.toml | 2 +- src/rust/smartlist/Cargo.toml | 2 +- src/rust/tor_allocate/Cargo.toml | 2 +- src/rust/tor_util/Cargo.toml | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/ext/rust b/src/ext/rust index 240296800..2422d7acc 160000 --- a/src/ext/rust +++ b/src/ext/rust @@ -1 +1 @@ -Subproject commit 240296800824e40b10cb8c16da0e711563353945 +Subproject commit 2422d7acccc44c633ea825b630ceee6777773cc2 diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock index 224d2135b..4f918c022 100644 --- a/src/rust/Cargo.lock +++ b/src/rust/Cargo.lock @@ -1,21 +1,13 @@ -[root] -name = "tor_util" -version = "0.0.1" -dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tor_allocate 0.0.1", -] - [[package]] name = "external" version = "0.0.1" dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ]
[[package]] name = "libc" -version = "0.2.22" +version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]] @@ -23,7 +15,7 @@ name = "protover" version = "0.0.1" dependencies = [ "external 0.0.1", - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", "smartlist 0.0.1", "tor_allocate 0.0.1", "tor_util 0.0.1", @@ -33,14 +25,14 @@ dependencies = [ name = "smartlist" version = "0.0.1" dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ]
[[package]] name = "tor_allocate" version = "0.0.1" dependencies = [ - "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", ]
[[package]] @@ -51,5 +43,13 @@ dependencies = [ "tor_util 0.0.1", ]
+[[package]] +name = "tor_util" +version = "0.0.1" +dependencies = [ + "libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)", + "tor_allocate 0.0.1", +] + [metadata] -"checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502" +"checksum libc 0.2.39 (registry+https://github.com/rust-lang/crates.io-index)" = "f54263ad99207254cf58b5f701ecb432c717445ea2ee8af387334bdd1a03fdff" diff --git a/src/rust/external/Cargo.toml b/src/rust/external/Cargo.toml index bccd7033a..b5957b107 100644 --- a/src/rust/external/Cargo.toml +++ b/src/rust/external/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" name = "external"
[dependencies] -libc = "0.2.22" +libc = "=0.2.39"
[lib] name = "external" diff --git a/src/rust/protover/Cargo.toml b/src/rust/protover/Cargo.toml index 04d2f2ed7..86301b878 100644 --- a/src/rust/protover/Cargo.toml +++ b/src/rust/protover/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" name = "protover"
[dependencies] -libc = "0.2.22" +libc = "=0.2.39"
[dependencies.smartlist] path = "../smartlist" diff --git a/src/rust/smartlist/Cargo.toml b/src/rust/smartlist/Cargo.toml index 51f486c4d..6ddcbee8e 100644 --- a/src/rust/smartlist/Cargo.toml +++ b/src/rust/smartlist/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" name = "smartlist"
[dependencies] -libc = "0.2.22" +libc = "0.2.39"
[lib] name = "smartlist" diff --git a/src/rust/tor_allocate/Cargo.toml b/src/rust/tor_allocate/Cargo.toml index ceb08b78a..468425f11 100644 --- a/src/rust/tor_allocate/Cargo.toml +++ b/src/rust/tor_allocate/Cargo.toml @@ -4,7 +4,7 @@ version = "0.0.1" name = "tor_allocate"
[dependencies] -libc = "0.2.22" +libc = "=0.2.39"
[lib] name = "tor_allocate" diff --git a/src/rust/tor_util/Cargo.toml b/src/rust/tor_util/Cargo.toml index d7379a598..b540d8c84 100644 --- a/src/rust/tor_util/Cargo.toml +++ b/src/rust/tor_util/Cargo.toml @@ -12,5 +12,5 @@ crate_type = ["rlib", "staticlib"] path = "../tor_allocate"
[dependencies] -libc = "0.2.22" +libc = "=0.2.39"