upgrade to cap-std 0.9

2021-01-07 16:47:26 -08:00
parent a900d0431d
commit 4a6e92f52f
4 changed files with 82 additions and 70 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -201,35 +201,19 @@ checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de"

 [[package]]
 name = "cap-fs-ext"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac51b267ca1f2abe043f6193ff8ef119cdcfd46f10a1644c76d41daf55a5b73"
+checksum = "685f3e4cc7b497dcf02be09a40ecc82fd8f8be36e80d611aa0d92d839dcb6eb3"
 dependencies = [
- "cap-primitives 0.8.0",
- "cap-std 0.8.0",
+ "cap-primitives",
+ "cap-std",
 ]

 [[package]]
 name = "cap-primitives"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b599a2508a28113d658c2f94f3d294d8023c3b34adb89204d7744ddbeb22a59"
-dependencies = [
- "errno",
- "fs-set-times",
- "ipnet",
- "libc",
- "once_cell",
- "posish",
- "winapi",
- "winx 0.21.0",
-]
-
-[[package]]
-name = "cap-primitives"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43639eaff5966a4904bf0441ad4b6a8169b463e58f0cb34140dc8555d387b699"
+checksum = "505ddaf5f8748b3d448826fc27408264ab2d78302d706025f532d9f0789ff16d"
 dependencies = [
 "errno",
 "fs-set-times",
@@ -243,38 +227,29 @@ dependencies = [

 [[package]]
 name = "cap-rand"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8289d98c0c748a22f1815bc68159255ca059cb4170371c8ab16b11b26886698c"
+checksum = "ef1107a56cbc947984568f38bc42cf2652cdd6c8a8ba8db6cdc9fd64a41623dd"
 dependencies = [
- "rand",
+ "rand 0.8.1",
 ]

 [[package]]
 name = "cap-std"
-version = "0.7.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0760daa4e6270daa9c5c6ad133108fb77edfe023a019c392d98dd769defa42d5"
+checksum = "bdd2d37dc52e2a73735c6056a336f877c5cfb7a20f5301b40d3d04d8c469ca9b"
 dependencies = [
- "cap-primitives 0.7.0",
-]
-
-[[package]]
-name = "cap-std"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d28ff1a5e60755c62be712baf75794892eb63a8b5bc5c4a7911b3549333e96"
-dependencies = [
- "cap-primitives 0.8.0",
+ "cap-primitives",
 ]

 [[package]]
 name = "cap-time-ext"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e022f6b679d942c100450e32c142c988c79370374d3f7d4776da815c582aff68"
+checksum = "083c07fd4c2754536834432d941c9470f0a430359d9c25ac1dd1f2dda45528ff"
 dependencies = [
- "cap-primitives 0.8.0",
+ "cap-primitives",
 "once_cell",
 "posish",
 "winx 0.21.0",
@@ -989,9 +964,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"

 [[package]]
 name = "fs-set-times"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08b6f6626f73621230f712be2ee1a9e70bf3d7f38ffbd75a80b8ed0d925d1df1"
+checksum = "e0700f6e5d24b4556cc0807148ed978a5f5b12c942528aed44bd8f02967bc70c"
 dependencies = [
 "posish",
 "winapi",
@@ -1170,9 +1145,9 @@ dependencies = [

 [[package]]
 name = "itoa"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
+checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"

 [[package]]
 name = "ittapi-rs"
@@ -1516,7 +1491,7 @@ dependencies = [
 "peepmatic-test",
 "peepmatic-test-operator",
 "peepmatic-traits",
- "rand",
+ "rand 0.7.3",
 "serde",
 "wast 29.0.0",
 ]
@@ -1591,9 +1566,9 @@ checksum = "6b063f57ec186e6140e2b8b6921e5f1bd89c7356dda5b33acc5401203ca6131c"

 [[package]]
 name = "posish"
-version = "0.5.2"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06094810dcae89a17bd50335b044296eafc671346790c0a2fb1fb3adfce41bd6"
+checksum = "e066cc5d9abbd9dd56fb7864347ffbc4389b44e145d9232de08a5916d00df894"
 dependencies = [
 "bitflags",
 "cfg-if 1.0.0",
@@ -1663,8 +1638,8 @@ dependencies = [
 "lazy_static",
 "num-traits",
 "quick-error",
- "rand",
- "rand_chacha",
+ "rand 0.7.3",
+ "rand_chacha 0.2.2",
 "rand_xorshift",
 "regex-syntax",
 "rusty-fork",
@@ -1694,8 +1669,8 @@ checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f"
 dependencies = [
 "env_logger 0.7.1",
 "log",
- "rand",
- "rand_core",
+ "rand 0.7.3",
+ "rand_core 0.5.1",
 ]

 [[package]]
@@ -1715,12 +1690,24 @@ checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
 dependencies = [
 "getrandom 0.1.15",
 "libc",
- "rand_chacha",
- "rand_core",
- "rand_hc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc 0.2.0",
 "rand_pcg",
 ]

+[[package]]
+name = "rand"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c24fcd450d3fa2b592732565aa4f17a27a61c65ece4726353e000939b0edee34"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.0",
+ "rand_core 0.6.1",
+ "rand_hc 0.3.0",
+]
+
 [[package]]
 name = "rand_chacha"
 version = "0.2.2"
@@ -1728,7 +1715,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
 dependencies = [
 "ppv-lite86",
- "rand_core",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.1",
 ]

 [[package]]
@@ -1740,13 +1737,31 @@ dependencies = [
 "getrandom 0.1.15",
 ]

+[[package]]
+name = "rand_core"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5"
+dependencies = [
+ "getrandom 0.2.0",
+]
+
 [[package]]
 name = "rand_hc"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
 dependencies = [
- "rand_core",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73"
+dependencies = [
+ "rand_core 0.6.1",
 ]

 [[package]]
@@ -1755,7 +1770,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429"
 dependencies = [
- "rand_core",
+ "rand_core 0.5.1",
 ]

 [[package]]
@@ -1764,7 +1779,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77d416b86801d23dde1aa643023b775c3a462efc0ed96443add11546cdf1dca8"
 dependencies = [
- "rand_core",
+ "rand_core 0.5.1",
 ]

 [[package]]
@@ -2162,7 +2177,7 @@ checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
 dependencies = [
 "cfg-if 0.1.10",
 "libc",
- "rand",
+ "rand 0.7.3",
 "redox_syscall",
 "remove_dir_all",
 "winapi",
@@ -2202,7 +2217,7 @@ name = "test-programs"
 version = "0.19.0"
 dependencies = [
 "anyhow",
- "cap-std 0.8.0",
+ "cap-std",
 "cfg-if 1.0.0",
 "os_pipe",
 "pretty_env_logger",
@@ -2447,7 +2462,7 @@ dependencies = [
 "anyhow",
 "cap-fs-ext",
 "cap-rand",
- "cap-std 0.8.0",
+ "cap-std",
 "cap-time-ext",
 "cfg-if 1.0.0",
 "fs-set-times",
@@ -2463,7 +2478,6 @@ name = "wasi-c2-wasmtime"
 version = "0.22.0"
 dependencies = [
 "anyhow",
- "cap-std 0.7.0",
 "wasi-c2",
 "wasmtime",
 "wasmtime-wiggle",
--- a/crates/test-programs/Cargo.toml
+++ b/crates/test-programs/Cargo.toml
@@ -20,7 +20,7 @@ tempfile = "3.1.0"
 os_pipe = "0.9"
 anyhow = "1.0.19"
 wat = "1.0.23"
-cap-std = "0.8"
+cap-std = "0.9"

 [features]
 test_programs = []
--- a/crates/wasi-c2/Cargo.toml
+++ b/crates/wasi-c2/Cargo.toml
@@ -25,10 +25,10 @@ libc = "0.2"
 wiggle = { path = "../wiggle", default-features = false, version = "0.22.0" }
 tracing = "0.1.19"
 system-interface = "0.2"
-cap-std = "0.8"
-cap-fs-ext = "0.8"
-cap-time-ext = "0.8"
-cap-rand = "0.8"
+cap-std = "0.9"
+cap-fs-ext = "0.9"
+cap-time-ext = "0.9"
+cap-rand = "0.9"
 fs-set-times = "0.2.2"
 cfg-if = "1"

--- a/crates/wasi-c2/wasmtime/Cargo.toml
+++ b/crates/wasi-c2/wasmtime/Cargo.toml
@@ -17,7 +17,5 @@ publish = false
 wasi-c2 = { path = "../" }
 wiggle = { path = "../../wiggle", default-features = false, version = "0.22.0" }
 wasmtime-wiggle = { path = "../../wiggle/wasmtime", default-features = false, version = "0.22.0" }
-cap-std = "0.7"
-anyhow = "*"
 wasmtime = { path = "../../wasmtime" }
-
+anyhow = "1.0"