diff --git a/Cargo.lock b/Cargo.lock index 2c103cc..d6d6761 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,12 +8,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e772942dccdf11b368c31e044e4fca9189f80a773d2f0808379de65894cbf57" -[[package]] -name = "autocfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23213af7601f0f2d929f73d2a772804562cb09063f50bba9c361f86d6a0376f8" - [[package]] name = "backtrace" version = "0.3.5" @@ -21,7 +15,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebbbf59b1c43eefa8c3ede390fcc36820b4999f7914104015be25025e0d62af2" dependencies = [ "backtrace-sys", - "cfg-if", + "cfg-if 0.1.0", "libc", "rustc-demangle", "winapi 0.3.6", @@ -36,22 +30,6 @@ dependencies = [ "libc", ] -[[package]] -name = "bitflags" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5cde24d1b2e2216a726368b2363a273739c91f4e3eb4e0dd12d672d396ad989" - -[[package]] -name = "c2-chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" -dependencies = [ - "lazy_static", - "ppv-lite86", -] - [[package]] name = "cfg-if" version = "0.1.0" @@ -59,13 +37,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de1e760d7b6535af4241fca8bd8adf68e2e7edacc6b29f5d399050c5e48cf88c" [[package]] -name = "cloudabi" -version = "0.0.3" +name = "cfg-if" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags", -] +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "darling" @@ -154,22 +129,15 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" -[[package]] -name = "fuchsia-cprng" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f7f8eb465745ea9b02e2704612a9946a59fa40572086c6fd49d6ddcf30bf31" - [[package]] name = "getrandom" -version = "0.1.1" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e738b1f02e4d17217cae7648e774c03a19cd9de18bc294c538cc3e780f8c3bbd" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ - "cloudabi", - "fuchsia-cprng", + "cfg-if 1.0.0", "libc", - "winapi 0.3.6", + "wasi", ] [[package]] @@ -203,17 +171,11 @@ dependencies = [ "winapi-build", ] -[[package]] -name = "lazy_static" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" - [[package]] name = "libc" -version = "0.2.29" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a014d9226c2cc402676fbe9ea2e15dd5222cd1dd57f576b5b283178c944a264" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "pfctl" @@ -230,12 +192,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "ppv-lite86" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe1c37e6347ad1a8351171bee25a92342401f8cd550f76e153724e765ac76bca" - [[package]] name = "proc-macro2" version = "1.0.0" @@ -254,48 +210,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e193067942ef6f485a349a113329140d0ab9e2168ce92274499bb0e9a4190d9d" -dependencies = [ - "autocfg", - "c2-chacha", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - [[package]] name = "rustc-demangle" version = "0.1.4" @@ -339,11 +253,11 @@ checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" [[package]] name = "uuid" -version = "0.8.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf1d83e5fa94e6c54ee47351bc92daca1f386aa1529ffbb668d2cee5e8173013" +checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ - "rand", + "getrandom", ] [[package]] @@ -352,6 +266,12 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "winapi" version = "0.2.4" diff --git a/Cargo.toml b/Cargo.toml index 119fa78..cec1d8d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,5 +24,5 @@ ipnetwork = "0.20.0" [dev-dependencies] assert_matches = "1.1.0" -uuid = { version = "0.8", features = ["v4"] } +uuid = { version = "1.8.0", features = ["v4"] } scopeguard = "1.0" diff --git a/tests/anchors.rs b/tests/anchors.rs index 84ead80..04d6cc7 100644 --- a/tests/anchors.rs +++ b/tests/anchors.rs @@ -10,10 +10,7 @@ use assert_matches::assert_matches; use uuid::Uuid; fn unique_anchor() -> String { - format!( - "pfctl-rs.integration.testing.{}", - Uuid::new_v4().to_simple() - ) + format!("pfctl-rs.integration.testing.{}", Uuid::new_v4().simple()) } fn before_each() {}