diff --git a/Cargo.lock b/Cargo.lock index db769edfa..e2122dfeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "Inflector" version = "0.11.4" @@ -64,9 +66,9 @@ dependencies = [ "hex", "htmlescape", "intl-memoizer", - "itertools", + "itertools 0.10.1", "lazy_static", - "nom", + "nom 7.0.0-alpha1", "num-integer", "num_enum", "once_cell", @@ -75,7 +77,7 @@ dependencies = [ "prost", "prost-build", "pulldown-cmark", - "rand 0.7.3", + "rand 0.8.4", "regex", "reqwest", "rusqlite", @@ -112,7 +114,7 @@ dependencies = [ "inflections", "intl-memoizer", "num-format", - "phf", + "phf 0.9.0", "serde", "serde_json", "unic-langid", @@ -191,7 +193,7 @@ checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc" dependencies = [ "askama_escape", "humansize", - "nom", + "nom 6.1.2", "num-traits", "percent-encoding", "proc-macro2", @@ -338,7 +340,7 @@ checksum = "2918e2ffa91a49dabbba4965fe38a37a1ba0b6953a29e32cc250a8d59cd42232" dependencies = [ "libc", "once_cell", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.10.0+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -735,7 +737,7 @@ checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] @@ -797,9 +799,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -1055,6 +1057,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.7" @@ -1143,7 +1154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a24f40fb03852d1cdd84330cddcaf98e9ec08a7b7768e952fad3b4cf048ec8fd" dependencies = [ "log", - "phf", + "phf 0.8.0", "phf_codegen", "string_cache", "string_cache_codegen", @@ -1271,6 +1282,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "nom" +version = "7.0.0-alpha1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd43cd1e53168596e629accc602ada1297f5125fed588d62cf8be81175b46002" +dependencies = [ + "lexical-core", + "memchr", + "version_check", +] + [[package]] name = "ntapi" version = "0.3.6" @@ -1349,9 +1371,9 @@ checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "openssl" -version = "0.10.34" +version = "0.10.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8" +checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -1369,9 +1391,9 @@ checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.63" +version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ "autocfg", "cc", @@ -1468,9 +1490,18 @@ name = "phf" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3dfb61232e34fcb633f43d12c58f83c1df82962dcdfa565a4e866ffc17dafe12" +dependencies = [ + "phf_shared 0.8.0", +] + +[[package]] +name = "phf" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37" dependencies = [ "phf_macros", - "phf_shared", + "phf_shared 0.9.0", "proc-macro-hack", ] @@ -1480,8 +1511,8 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbffee61585b0411840d3ece935cce9cb6321f01c45477d30066498cd5e1a815" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", ] [[package]] @@ -1490,18 +1521,28 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17367f0cc86f2d25802b2c26ee58a7b23faeccf78a396094c13dced0d0182526" dependencies = [ - "phf_shared", + "phf_shared 0.8.0", "rand 0.7.3", ] [[package]] -name = "phf_macros" -version = "0.8.0" +name = "phf_generator" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c" +checksum = "0fc1437ada0f3a97d538f0bb608137bf53c53969028cab74c89893e1e9a12f0e" dependencies = [ - "phf_generator", - "phf_shared", + "phf_shared 0.9.0", + "rand 0.8.4", +] + +[[package]] +name = "phf_macros" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86" +dependencies = [ + "phf_generator 0.9.0", + "phf_shared 0.9.0", "proc-macro-hack", "proc-macro2", "quote", @@ -1517,6 +1558,15 @@ dependencies = [ "siphasher", ] +[[package]] +name = "phf_shared" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.0.7" @@ -1639,7 +1689,7 @@ checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" dependencies = [ "bytes", "heck", - "itertools", + "itertools 0.9.0", "log", "multimap", "petgraph", @@ -1656,7 +1706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4" dependencies = [ "anyhow", - "itertools", + "itertools 0.9.0", "proc-macro2", "quote", "syn", @@ -2051,13 +2101,12 @@ dependencies = [ [[package]] name = "serde-aux" -version = "0.6.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae50f53d4b01e854319c1f5b854cd59471f054ea7e554988850d3f36ca1dc852" +checksum = "77eb8c83f6ebaedf5e8f970a8a44506b180b8e6268de03885c8547031ccaee00" dependencies = [ "chrono", "serde", - "serde_derive", "serde_json", ] @@ -2255,7 +2304,7 @@ checksum = "8ddb1139b5353f96e429e1a5e19fbaf663bddedaa06d1dbd49f82e352601209a" dependencies = [ "lazy_static", "new_debug_unreachable", - "phf_shared", + "phf_shared 0.8.0", "precomputed-hash", "serde", ] @@ -2266,26 +2315,26 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f24c8e5e19d22a726626f1a5e16fe15b132dcf21d10177fa5a45ce7962996b97" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.8.0", + "phf_shared 0.8.0", "proc-macro2", "quote", ] [[package]] name = "strum" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" +checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.20.1" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" +checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" dependencies = [ "heck", "proc-macro2", @@ -2397,11 +2446,12 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] @@ -2428,9 +2478,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c79ba603c337335df6ba6dd6afc38c38a7d5e1b0c871678439ea973cd62a118e" +checksum = "5fb2ed024293bb19f7a5dc54fe83bf86532a44c12a2bb8ba40d64a4509395ca2" dependencies = [ "autocfg", "bytes", @@ -2684,9 +2734,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70455df2fdf4e9bf580a92e443f1eb0303c390d682e2ea817312c9e81f8c3399" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" @@ -2712,9 +2762,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" diff --git a/cargo/BUILD.reqwest.native.bazel b/cargo/BUILD.reqwest.native.bazel index a3cf633e8..d9ad46c52 100644 --- a/cargo/BUILD.reqwest.native.bazel +++ b/cargo/BUILD.reqwest.native.bazel @@ -109,7 +109,7 @@ rust_library( "@raze__native_tls__0_2_7//:native_tls", "@raze__percent_encoding__2_1_0//:percent_encoding", "@raze__pin_project_lite__0_2_6//:pin_project_lite", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", "@raze__tokio_native_tls__0_3_0//:tokio_native_tls", "@raze__tokio_socks__0_5_1//:tokio_socks", ], diff --git a/cargo/BUILD.reqwest.rustls.bazel b/cargo/BUILD.reqwest.rustls.bazel index 1de69d207..adfe527b4 100644 --- a/cargo/BUILD.reqwest.rustls.bazel +++ b/cargo/BUILD.reqwest.rustls.bazel @@ -113,7 +113,7 @@ rust_library( "@raze__pin_project_lite__0_2_6//:pin_project_lite", "@raze__rustls__0_19_1//:rustls", "@raze__rustls_native_certs__0_5_0//:rustls_native_certs", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", "@raze__tokio_rustls__0_22_0//:tokio_rustls", "@raze__tokio_socks__0_5_1//:tokio_socks", "@raze__webpki_roots__0_21_1//:webpki_roots", diff --git a/cargo/crates.bzl b/cargo/crates.bzl index b0c0c74b1..153311344 100644 --- a/cargo/crates.bzl +++ b/cargo/crates.bzl @@ -783,12 +783,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__hermit_abi__0_1_18", - url = "https://crates.io/api/v1/crates/hermit-abi/0.1.18/download", + name = "raze__hermit_abi__0_1_19", + url = "https://crates.io/api/v1/crates/hermit-abi/0.1.19/download", type = "tar.gz", - sha256 = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c", - strip_prefix = "hermit-abi-0.1.18", - build_file = Label("//cargo/remote:BUILD.hermit-abi-0.1.18.bazel"), + sha256 = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33", + strip_prefix = "hermit-abi-0.1.19", + build_file = Label("//cargo/remote:BUILD.hermit-abi-0.1.19.bazel"), ) maybe( @@ -1031,6 +1031,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.ipnet-2.3.1.bazel"), ) + maybe( + http_archive, + name = "raze__itertools__0_10_1", + url = "https://crates.io/api/v1/crates/itertools/0.10.1/download", + type = "tar.gz", + sha256 = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf", + strip_prefix = "itertools-0.10.1", + build_file = Label("//cargo/remote:BUILD.itertools-0.10.1.bazel"), + ) + maybe( http_archive, name = "raze__itertools__0_9_0", @@ -1281,6 +1291,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.nom-6.1.2.bazel"), ) + maybe( + http_archive, + name = "raze__nom__7_0_0_alpha1", + url = "https://crates.io/api/v1/crates/nom/7.0.0-alpha1/download", + type = "tar.gz", + sha256 = "dd43cd1e53168596e629accc602ada1297f5125fed588d62cf8be81175b46002", + strip_prefix = "nom-7.0.0-alpha1", + build_file = Label("//cargo/remote:BUILD.nom-7.0.0-alpha1.bazel"), + ) + maybe( http_archive, name = "raze__ntapi__0_3_6", @@ -1363,12 +1383,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__openssl__0_10_34", - url = "https://crates.io/api/v1/crates/openssl/0.10.34/download", + name = "raze__openssl__0_10_35", + url = "https://crates.io/api/v1/crates/openssl/0.10.35/download", type = "tar.gz", - sha256 = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8", - strip_prefix = "openssl-0.10.34", - build_file = Label("//cargo/remote:BUILD.openssl-0.10.34.bazel"), + sha256 = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885", + strip_prefix = "openssl-0.10.35", + build_file = Label("//cargo/remote:BUILD.openssl-0.10.35.bazel"), ) maybe( @@ -1383,12 +1403,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__openssl_sys__0_9_63", - url = "https://crates.io/api/v1/crates/openssl-sys/0.9.63/download", + name = "raze__openssl_sys__0_9_65", + url = "https://crates.io/api/v1/crates/openssl-sys/0.9.65/download", type = "tar.gz", - sha256 = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98", - strip_prefix = "openssl-sys-0.9.63", - build_file = Label("//cargo/remote:BUILD.openssl-sys-0.9.63.bazel"), + sha256 = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d", + strip_prefix = "openssl-sys-0.9.65", + build_file = Label("//cargo/remote:BUILD.openssl-sys-0.9.65.bazel"), ) maybe( @@ -1481,6 +1501,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.phf-0.8.0.bazel"), ) + maybe( + http_archive, + name = "raze__phf__0_9_0", + url = "https://crates.io/api/v1/crates/phf/0.9.0/download", + type = "tar.gz", + sha256 = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37", + strip_prefix = "phf-0.9.0", + build_file = Label("//cargo/remote:BUILD.phf-0.9.0.bazel"), + ) + maybe( http_archive, name = "raze__phf_codegen__0_8_0", @@ -1503,12 +1533,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__phf_macros__0_8_0", - url = "https://crates.io/api/v1/crates/phf_macros/0.8.0/download", + name = "raze__phf_generator__0_9_0", + url = "https://crates.io/api/v1/crates/phf_generator/0.9.0/download", type = "tar.gz", - sha256 = "7f6fde18ff429ffc8fe78e2bf7f8b7a5a5a6e2a8b58bc5a9ac69198bbda9189c", - strip_prefix = "phf_macros-0.8.0", - build_file = Label("//cargo/remote:BUILD.phf_macros-0.8.0.bazel"), + sha256 = "0fc1437ada0f3a97d538f0bb608137bf53c53969028cab74c89893e1e9a12f0e", + strip_prefix = "phf_generator-0.9.0", + build_file = Label("//cargo/remote:BUILD.phf_generator-0.9.0.bazel"), + ) + + maybe( + http_archive, + name = "raze__phf_macros__0_9_0", + url = "https://crates.io/api/v1/crates/phf_macros/0.9.0/download", + type = "tar.gz", + sha256 = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86", + strip_prefix = "phf_macros-0.9.0", + build_file = Label("//cargo/remote:BUILD.phf_macros-0.9.0.bazel"), ) maybe( @@ -1521,6 +1561,16 @@ def raze_fetch_remote_crates(): build_file = Label("//cargo/remote:BUILD.phf_shared-0.8.0.bazel"), ) + maybe( + http_archive, + name = "raze__phf_shared__0_9_0", + url = "https://crates.io/api/v1/crates/phf_shared/0.9.0/download", + type = "tar.gz", + sha256 = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9", + strip_prefix = "phf_shared-0.9.0", + build_file = Label("//cargo/remote:BUILD.phf_shared-0.9.0.bazel"), + ) + maybe( http_archive, name = "raze__pin_project__1_0_7", @@ -2023,12 +2073,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__serde_aux__0_6_1", - url = "https://crates.io/api/v1/crates/serde-aux/0.6.1/download", + name = "raze__serde_aux__2_2_0", + url = "https://crates.io/api/v1/crates/serde-aux/2.2.0/download", type = "tar.gz", - sha256 = "ae50f53d4b01e854319c1f5b854cd59471f054ea7e554988850d3f36ca1dc852", - strip_prefix = "serde-aux-0.6.1", - build_file = Label("//cargo/remote:BUILD.serde-aux-0.6.1.bazel"), + sha256 = "77eb8c83f6ebaedf5e8f970a8a44506b180b8e6268de03885c8547031ccaee00", + strip_prefix = "serde-aux-2.2.0", + build_file = Label("//cargo/remote:BUILD.serde-aux-2.2.0.bazel"), ) maybe( @@ -2253,22 +2303,22 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__strum__0_20_0", - url = "https://crates.io/api/v1/crates/strum/0.20.0/download", + name = "raze__strum__0_21_0", + url = "https://crates.io/api/v1/crates/strum/0.21.0/download", type = "tar.gz", - sha256 = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c", - strip_prefix = "strum-0.20.0", - build_file = Label("//cargo/remote:BUILD.strum-0.20.0.bazel"), + sha256 = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2", + strip_prefix = "strum-0.21.0", + build_file = Label("//cargo/remote:BUILD.strum-0.21.0.bazel"), ) maybe( http_archive, - name = "raze__strum_macros__0_20_1", - url = "https://crates.io/api/v1/crates/strum_macros/0.20.1/download", + name = "raze__strum_macros__0_21_1", + url = "https://crates.io/api/v1/crates/strum_macros/0.21.1/download", type = "tar.gz", - sha256 = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149", - strip_prefix = "strum_macros-0.20.1", - build_file = Label("//cargo/remote:BUILD.strum_macros-0.20.1.bazel"), + sha256 = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec", + strip_prefix = "strum_macros-0.21.1", + build_file = Label("//cargo/remote:BUILD.strum_macros-0.21.1.bazel"), ) maybe( @@ -2383,12 +2433,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__time__0_1_43", - url = "https://crates.io/api/v1/crates/time/0.1.43/download", + name = "raze__time__0_1_44", + url = "https://crates.io/api/v1/crates/time/0.1.44/download", type = "tar.gz", - sha256 = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438", - strip_prefix = "time-0.1.43", - build_file = Label("//cargo/remote:BUILD.time-0.1.43.bazel"), + sha256 = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255", + strip_prefix = "time-0.1.44", + build_file = Label("//cargo/remote:BUILD.time-0.1.44.bazel"), ) maybe( @@ -2423,12 +2473,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__tokio__1_7_0", - url = "https://crates.io/api/v1/crates/tokio/1.7.0/download", + name = "raze__tokio__1_7_1", + url = "https://crates.io/api/v1/crates/tokio/1.7.1/download", type = "tar.gz", - sha256 = "c79ba603c337335df6ba6dd6afc38c38a7d5e1b0c871678439ea973cd62a118e", - strip_prefix = "tokio-1.7.0", - build_file = Label("//cargo/remote:BUILD.tokio-1.7.0.bazel"), + sha256 = "5fb2ed024293bb19f7a5dc54fe83bf86532a44c12a2bb8ba40d64a4509395ca2", + strip_prefix = "tokio-1.7.1", + build_file = Label("//cargo/remote:BUILD.tokio-1.7.1.bazel"), ) maybe( @@ -2703,12 +2753,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__vcpkg__0_2_14", - url = "https://crates.io/api/v1/crates/vcpkg/0.2.14/download", + name = "raze__vcpkg__0_2_15", + url = "https://crates.io/api/v1/crates/vcpkg/0.2.15/download", type = "tar.gz", - sha256 = "70455df2fdf4e9bf580a92e443f1eb0303c390d682e2ea817312c9e81f8c3399", - strip_prefix = "vcpkg-0.2.14", - build_file = Label("//cargo/remote:BUILD.vcpkg-0.2.14.bazel"), + sha256 = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426", + strip_prefix = "vcpkg-0.2.15", + build_file = Label("//cargo/remote:BUILD.vcpkg-0.2.15.bazel"), ) maybe( @@ -2733,12 +2783,12 @@ def raze_fetch_remote_crates(): maybe( http_archive, - name = "raze__wasi__0_10_2_wasi_snapshot_preview1", - url = "https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download", + name = "raze__wasi__0_10_0_wasi_snapshot_preview1", + url = "https://crates.io/api/v1/crates/wasi/0.10.0+wasi-snapshot-preview1/download", type = "tar.gz", - sha256 = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6", - strip_prefix = "wasi-0.10.2+wasi-snapshot-preview1", - build_file = Label("//cargo/remote:BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel"), + sha256 = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f", + strip_prefix = "wasi-0.10.0+wasi-snapshot-preview1", + build_file = Label("//cargo/remote:BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel"), ) maybe( diff --git a/cargo/licenses.json b/cargo/licenses.json index 9d2739e84..03097d240 100644 --- a/cargo/licenses.json +++ b/cargo/licenses.json @@ -721,7 +721,7 @@ }, { "name": "hermit-abi", - "version": "0.1.18", + "version": "0.1.19", "authors": "Stefan Lankes", "repository": "https://github.com/hermitcore/libhermit-rs", "license": "Apache-2.0 OR MIT", @@ -953,6 +953,15 @@ "license_file": null, "description": "Extra iterator adaptors, iterator methods, free functions, and macros." }, + { + "name": "itertools", + "version": "0.10.1", + "authors": "bluss", + "repository": "https://github.com/rust-itertools/itertools", + "license": "Apache-2.0 OR MIT", + "license_file": null, + "description": "Extra iterator adaptors, iterator methods, free functions, and macros." + }, { "name": "itoa", "version": "0.4.7", @@ -1169,6 +1178,15 @@ "license_file": null, "description": "A byte-oriented, zero-copy, parser combinators library" }, + { + "name": "nom", + "version": "7.0.0-alpha1", + "authors": "contact@geoffroycouprie.com", + "repository": "https://github.com/Geal/nom", + "license": "MIT", + "license_file": null, + "description": "A byte-oriented, zero-copy, parser combinators library" + }, { "name": "ntapi", "version": "0.3.6", @@ -1243,7 +1261,7 @@ }, { "name": "openssl", - "version": "0.10.34", + "version": "0.10.35", "authors": "Steven Fackler ", "repository": "https://github.com/sfackler/rust-openssl", "license": "Apache-2.0", @@ -1261,7 +1279,7 @@ }, { "name": "openssl-sys", - "version": "0.9.63", + "version": "0.9.65", "authors": "Alex Crichton |Steven Fackler ", "repository": "https://github.com/sfackler/rust-openssl", "license": "MIT", @@ -1349,6 +1367,15 @@ "license_file": null, "description": "Runtime support for perfect hash function data structures" }, + { + "name": "phf", + "version": "0.9.0", + "authors": "Steven Fackler ", + "repository": "https://github.com/sfackler/rust-phf", + "license": "MIT", + "license_file": null, + "description": "Runtime support for perfect hash function data structures" + }, { "name": "phf_codegen", "version": "0.8.0", @@ -1367,9 +1394,18 @@ "license_file": null, "description": "PHF generation logic" }, + { + "name": "phf_generator", + "version": "0.9.0", + "authors": "Steven Fackler ", + "repository": "https://github.com/sfackler/rust-phf", + "license": "MIT", + "license_file": null, + "description": "PHF generation logic" + }, { "name": "phf_macros", - "version": "0.8.0", + "version": "0.9.0", "authors": "Steven Fackler ", "repository": "https://github.com/sfackler/rust-phf", "license": "MIT", @@ -1385,6 +1421,15 @@ "license_file": null, "description": "Support code shared by PHF libraries" }, + { + "name": "phf_shared", + "version": "0.9.0", + "authors": "Steven Fackler ", + "repository": "https://github.com/sfackler/rust-phf", + "license": "MIT", + "license_file": null, + "description": "Support code shared by PHF libraries" + }, { "name": "pin-project", "version": "1.0.7", @@ -1846,7 +1891,7 @@ }, { "name": "serde-aux", - "version": "0.6.1", + "version": "2.2.0", "authors": "Victor Polevoy ", "repository": "https://github.com/vityafx/serde-aux", "license": "MIT", @@ -2053,7 +2098,7 @@ }, { "name": "strum", - "version": "0.20.0", + "version": "0.21.0", "authors": "Peter Glotfelty ", "repository": "https://github.com/Peternator7/strum", "license": "MIT", @@ -2062,7 +2107,7 @@ }, { "name": "strum_macros", - "version": "0.20.1", + "version": "0.21.1", "authors": "Peter Glotfelty ", "repository": "https://github.com/Peternator7/strum", "license": "MIT", @@ -2170,7 +2215,7 @@ }, { "name": "time", - "version": "0.1.43", + "version": "0.1.44", "authors": "The Rust Project Developers", "repository": "https://github.com/time-rs/time", "license": "Apache-2.0 OR MIT", @@ -2206,7 +2251,7 @@ }, { "name": "tokio", - "version": "1.7.0", + "version": "1.7.1", "authors": "Tokio Contributors ", "repository": "https://github.com/tokio-rs/tokio", "license": "MIT", @@ -2458,7 +2503,7 @@ }, { "name": "vcpkg", - "version": "0.2.14", + "version": "0.2.15", "authors": "Jim McGrath ", "repository": "https://github.com/mcgoo/vcpkg-rs", "license": "Apache-2.0 OR MIT", @@ -2494,7 +2539,7 @@ }, { "name": "wasi", - "version": "0.10.2+wasi-snapshot-preview1", + "version": "0.10.0+wasi-snapshot-preview1", "authors": "The Cranelift Project Developers", "repository": "https://github.com/bytecodealliance/wasi", "license": "Apache-2.0 OR Apache-2.0 WITH LLVM-exception OR MIT", diff --git a/cargo/remote/BUILD.async-compression-0.3.8.bazel b/cargo/remote/BUILD.async-compression-0.3.8.bazel index 871910912..3adfce2b4 100644 --- a/cargo/remote/BUILD.async-compression-0.3.8.bazel +++ b/cargo/remote/BUILD.async-compression-0.3.8.bazel @@ -61,7 +61,7 @@ rust_library( "@raze__futures_core__0_3_15//:futures_core", "@raze__memchr__2_4_0//:memchr", "@raze__pin_project_lite__0_2_6//:pin_project_lite", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", ], ) diff --git a/cargo/remote/BUILD.chrono-0.4.19.bazel b/cargo/remote/BUILD.chrono-0.4.19.bazel index fd8762f90..c8f04e394 100644 --- a/cargo/remote/BUILD.chrono-0.4.19.bazel +++ b/cargo/remote/BUILD.chrono-0.4.19.bazel @@ -65,7 +65,7 @@ rust_library( "@raze__libc__0_2_97//:libc", "@raze__num_integer__0_1_44//:num_integer", "@raze__num_traits__0_2_14//:num_traits", - "@raze__time__0_1_43//:time", + "@raze__time__0_1_44//:time", ] + selects.with_or({ # cfg(windows) ( diff --git a/cargo/remote/BUILD.h2-0.3.3.bazel b/cargo/remote/BUILD.h2-0.3.3.bazel index af338d0f8..76c393049 100644 --- a/cargo/remote/BUILD.h2-0.3.3.bazel +++ b/cargo/remote/BUILD.h2-0.3.3.bazel @@ -63,7 +63,7 @@ rust_library( "@raze__http__0_2_4//:http", "@raze__indexmap__1_6_2//:indexmap", "@raze__slab__0_4_3//:slab", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", "@raze__tokio_util__0_6_7//:tokio_util", "@raze__tracing__0_1_26//:tracing", ], diff --git a/cargo/remote/BUILD.hermit-abi-0.1.18.bazel b/cargo/remote/BUILD.hermit-abi-0.1.19.bazel similarity index 97% rename from cargo/remote/BUILD.hermit-abi-0.1.18.bazel rename to cargo/remote/BUILD.hermit-abi-0.1.19.bazel index f5d44ff75..93df29d27 100644 --- a/cargo/remote/BUILD.hermit-abi-0.1.18.bazel +++ b/cargo/remote/BUILD.hermit-abi-0.1.19.bazel @@ -47,7 +47,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.1.18", + version = "0.1.19", # buildifier: leave-alone deps = [ "@raze__libc__0_2_97//:libc", diff --git a/cargo/remote/BUILD.hyper-0.14.9.bazel b/cargo/remote/BUILD.hyper-0.14.9.bazel index c2b3c1dd5..dc9f8e726 100644 --- a/cargo/remote/BUILD.hyper-0.14.9.bazel +++ b/cargo/remote/BUILD.hyper-0.14.9.bazel @@ -115,7 +115,7 @@ rust_library( "@raze__itoa__0_4_7//:itoa", "@raze__pin_project_lite__0_2_6//:pin_project_lite", "@raze__socket2__0_4_0//:socket2", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", "@raze__tower_service__0_3_1//:tower_service", "@raze__tracing__0_1_26//:tracing", "@raze__want__0_3_0//:want", diff --git a/cargo/remote/BUILD.hyper-rustls-0.22.1.bazel b/cargo/remote/BUILD.hyper-rustls-0.22.1.bazel index 19e648590..a7e4cf50f 100644 --- a/cargo/remote/BUILD.hyper-rustls-0.22.1.bazel +++ b/cargo/remote/BUILD.hyper-rustls-0.22.1.bazel @@ -57,7 +57,7 @@ rust_library( "@raze__hyper__0_14_9//:hyper", "@raze__log__0_4_14//:log", "@raze__rustls__0_19_1//:rustls", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", "@raze__tokio_rustls__0_22_0//:tokio_rustls", "@raze__webpki__0_21_4//:webpki", ], diff --git a/cargo/remote/BUILD.hyper-timeout-0.4.1.bazel b/cargo/remote/BUILD.hyper-timeout-0.4.1.bazel index 8daff146d..5ab8fab3d 100644 --- a/cargo/remote/BUILD.hyper-timeout-0.4.1.bazel +++ b/cargo/remote/BUILD.hyper-timeout-0.4.1.bazel @@ -53,7 +53,7 @@ rust_library( deps = [ "@raze__hyper__0_14_9//:hyper", "@raze__pin_project_lite__0_2_6//:pin_project_lite", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", "@raze__tokio_io_timeout__1_1_1//:tokio_io_timeout", ], ) diff --git a/cargo/remote/BUILD.hyper-tls-0.5.0.bazel b/cargo/remote/BUILD.hyper-tls-0.5.0.bazel index d5e7753b3..8110dd683 100644 --- a/cargo/remote/BUILD.hyper-tls-0.5.0.bazel +++ b/cargo/remote/BUILD.hyper-tls-0.5.0.bazel @@ -54,7 +54,7 @@ rust_library( "@raze__bytes__1_0_1//:bytes", "@raze__hyper__0_14_9//:hyper", "@raze__native_tls__0_2_7//:native_tls", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", "@raze__tokio_native_tls__0_3_0//:tokio_native_tls", ], ) diff --git a/cargo/remote/BUILD.itertools-0.10.1.bazel b/cargo/remote/BUILD.itertools-0.10.1.bazel new file mode 100644 index 000000000..4b5e5db9e --- /dev/null +++ b/cargo/remote/BUILD.itertools-0.10.1.bazel @@ -0,0 +1,99 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT OR Apache-2.0" +]) + +# Generated Targets + +# Unsupported target "bench1" with type "bench" omitted + +# Unsupported target "combinations" with type "bench" omitted + +# Unsupported target "combinations_with_replacement" with type "bench" omitted + +# Unsupported target "fold_specialization" with type "bench" omitted + +# Unsupported target "powerset" with type "bench" omitted + +# Unsupported target "tree_fold1" with type "bench" omitted + +# Unsupported target "tuple_combinations" with type "bench" omitted + +# Unsupported target "tuples" with type "bench" omitted + +# Unsupported target "iris" with type "example" omitted + +rust_library( + name = "itertools", + srcs = glob(["**/*.rs"]), + crate_features = [ + "default", + "use_alloc", + "use_std", + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.10.1", + # buildifier: leave-alone + deps = [ + "@raze__either__1_6_1//:either", + ], +) + +# Unsupported target "adaptors_no_collect" with type "test" omitted + +# Unsupported target "flatten_ok" with type "test" omitted + +# Unsupported target "fold_specialization" with type "test" omitted + +# Unsupported target "macros_hygiene" with type "test" omitted + +# Unsupported target "merge_join" with type "test" omitted + +# Unsupported target "peeking_take_while" with type "test" omitted + +# Unsupported target "quick" with type "test" omitted + +# Unsupported target "specializations" with type "test" omitted + +# Unsupported target "test_core" with type "test" omitted + +# Unsupported target "test_std" with type "test" omitted + +# Unsupported target "tuples" with type "test" omitted + +# Unsupported target "zip" with type "test" omitted diff --git a/cargo/remote/BUILD.libsqlite3-sys-0.20.1.bazel b/cargo/remote/BUILD.libsqlite3-sys-0.20.1.bazel index c7b7a866c..a27369d3d 100644 --- a/cargo/remote/BUILD.libsqlite3-sys-0.20.1.bazel +++ b/cargo/remote/BUILD.libsqlite3-sys-0.20.1.bazel @@ -73,7 +73,7 @@ cargo_build_script( ( "@rules_rust//rust/platform:x86_64-pc-windows-msvc", ): [ - "@raze__vcpkg__0_2_14//:vcpkg", + "@raze__vcpkg__0_2_15//:vcpkg", ], "//conditions:default": [], }), diff --git a/cargo/remote/BUILD.native-tls-0.2.7.bazel b/cargo/remote/BUILD.native-tls-0.2.7.bazel index 21c4e9516..a4e1b8ed7 100644 --- a/cargo/remote/BUILD.native-tls-0.2.7.bazel +++ b/cargo/remote/BUILD.native-tls-0.2.7.bazel @@ -72,7 +72,7 @@ cargo_build_script( "@rules_rust//rust/platform:aarch64-unknown-linux-gnu", "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ - "@raze__openssl_sys__0_9_63//:openssl_sys", + "@raze__openssl_sys__0_9_65//:openssl_sys", ], "//conditions:default": [], }) + selects.with_or({ @@ -132,9 +132,9 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-linux-gnu", ): [ "@raze__log__0_4_14//:log", - "@raze__openssl__0_10_34//:openssl", + "@raze__openssl__0_10_35//:openssl", "@raze__openssl_probe__0_1_4//:openssl_probe", - "@raze__openssl_sys__0_9_63//:openssl_sys", + "@raze__openssl_sys__0_9_65//:openssl_sys", ], "//conditions:default": [], }) + selects.with_or({ diff --git a/cargo/remote/BUILD.nom-7.0.0-alpha1.bazel b/cargo/remote/BUILD.nom-7.0.0-alpha1.bazel new file mode 100644 index 000000000..b8caeea40 --- /dev/null +++ b/cargo/remote/BUILD.nom-7.0.0-alpha1.bazel @@ -0,0 +1,156 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets +# buildifier: disable=out-of-order-load +# buildifier: disable=load-on-top +load( + "@rules_rust//cargo:cargo_build_script.bzl", + "cargo_build_script", +) + +cargo_build_script( + name = "nom_build_script", + srcs = glob(["**/*.rs"]), + build_script_env = { + }, + crate_features = [ + "alloc", + "default", + "lexical", + "lexical-core", + "std", + ], + crate_root = "build.rs", + data = glob(["**"]), + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "7.0.0-alpha1", + visibility = ["//visibility:private"], + deps = [ + "@raze__version_check__0_9_3//:version_check", + ], +) + +# Unsupported target "arithmetic" with type "bench" omitted + +# Unsupported target "http" with type "bench" omitted + +# Unsupported target "ini" with type "bench" omitted + +# Unsupported target "ini_complete" with type "bench" omitted + +# Unsupported target "ini_str" with type "bench" omitted + +# Unsupported target "json" with type "bench" omitted + +# Unsupported target "number" with type "bench" omitted + +# Unsupported target "json" with type "example" omitted + +# Unsupported target "s_expression" with type "example" omitted + +# Unsupported target "string" with type "example" omitted + +rust_library( + name = "nom", + srcs = glob(["**/*.rs"]), + crate_features = [ + "alloc", + "default", + "lexical", + "lexical-core", + "std", + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "7.0.0-alpha1", + # buildifier: leave-alone + deps = [ + ":nom_build_script", + "@raze__lexical_core__0_7_6//:lexical_core", + "@raze__memchr__2_4_0//:memchr", + ], +) + +# Unsupported target "arithmetic" with type "test" omitted + +# Unsupported target "arithmetic_ast" with type "test" omitted + +# Unsupported target "bitstream" with type "test" omitted + +# Unsupported target "blockbuf-arithmetic" with type "test" omitted + +# Unsupported target "css" with type "test" omitted + +# Unsupported target "custom_errors" with type "test" omitted + +# Unsupported target "escaped" with type "test" omitted + +# Unsupported target "float" with type "test" omitted + +# Unsupported target "fnmut" with type "test" omitted + +# Unsupported target "inference" with type "test" omitted + +# Unsupported target "ini" with type "test" omitted + +# Unsupported target "ini_str" with type "test" omitted + +# Unsupported target "issues" with type "test" omitted + +# Unsupported target "json" with type "test" omitted + +# Unsupported target "mp4" with type "test" omitted + +# Unsupported target "multiline" with type "test" omitted + +# Unsupported target "named_args" with type "test" omitted + +# Unsupported target "overflow" with type "test" omitted + +# Unsupported target "reborrow_fold" with type "test" omitted + +# Unsupported target "test1" with type "test" omitted diff --git a/cargo/remote/BUILD.openssl-0.10.34.bazel b/cargo/remote/BUILD.openssl-0.10.35.bazel similarity index 89% rename from cargo/remote/BUILD.openssl-0.10.34.bazel rename to cargo/remote/BUILD.openssl-0.10.35.bazel index 7b26c30ed..3f7a65524 100644 --- a/cargo/remote/BUILD.openssl-0.10.34.bazel +++ b/cargo/remote/BUILD.openssl-0.10.35.bazel @@ -53,10 +53,10 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.10.34", + version = "0.10.35", visibility = ["//visibility:private"], deps = [ - "@raze__openssl_sys__0_9_63//:openssl_sys", + "@raze__openssl_sys__0_9_65//:openssl_sys", ], ) @@ -66,7 +66,7 @@ rust_library( name = "openssl", srcs = glob(["**/*.rs"]), aliases = { - "@raze__openssl_sys__0_9_63//:openssl_sys": "ffi", + "@raze__openssl_sys__0_9_65//:openssl_sys": "ffi", }, crate_features = [ ], @@ -81,7 +81,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.10.34", + version = "0.10.35", # buildifier: leave-alone deps = [ ":openssl_build_script", @@ -90,6 +90,6 @@ rust_library( "@raze__foreign_types__0_3_2//:foreign_types", "@raze__libc__0_2_97//:libc", "@raze__once_cell__1_8_0//:once_cell", - "@raze__openssl_sys__0_9_63//:openssl_sys", + "@raze__openssl_sys__0_9_65//:openssl_sys", ], ) diff --git a/cargo/remote/BUILD.openssl-sys-0.9.63.bazel b/cargo/remote/BUILD.openssl-sys-0.9.65.bazel similarity index 95% rename from cargo/remote/BUILD.openssl-sys-0.9.63.bazel rename to cargo/remote/BUILD.openssl-sys-0.9.65.bazel index 45797e336..153b27f7d 100644 --- a/cargo/remote/BUILD.openssl-sys-0.9.63.bazel +++ b/cargo/remote/BUILD.openssl-sys-0.9.65.bazel @@ -54,7 +54,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "0.9.63", + version = "0.9.65", visibility = ["//visibility:private"], deps = [ "@raze__autocfg__1_0_1//:autocfg", @@ -65,7 +65,7 @@ cargo_build_script( ( "@rules_rust//rust/platform:x86_64-pc-windows-msvc", ): [ - "@raze__vcpkg__0_2_14//:vcpkg", + "@raze__vcpkg__0_2_15//:vcpkg", ], "//conditions:default": [], }), @@ -89,7 +89,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.9.63", + version = "0.9.65", # buildifier: leave-alone deps = [ ":openssl_sys_build_script", diff --git a/cargo/remote/BUILD.phf-0.8.0.bazel b/cargo/remote/BUILD.phf-0.8.0.bazel index c4ff0c4ef..43a72b355 100644 --- a/cargo/remote/BUILD.phf-0.8.0.bazel +++ b/cargo/remote/BUILD.phf-0.8.0.bazel @@ -35,19 +35,12 @@ rust_library( srcs = glob(["**/*.rs"]), crate_features = [ "default", - "macros", - "phf_macros", - "proc-macro-hack", "std", ], crate_root = "src/lib.rs", crate_type = "lib", data = [], edition = "2018", - proc_macro_deps = [ - "@raze__phf_macros__0_8_0//:phf_macros", - "@raze__proc_macro_hack__0_5_19//:proc_macro_hack", - ], rustc_flags = [ "--cap-lints=allow", ], diff --git a/cargo/remote/BUILD.phf-0.9.0.bazel b/cargo/remote/BUILD.phf-0.9.0.bazel new file mode 100644 index 000000000..035be0024 --- /dev/null +++ b/cargo/remote/BUILD.phf-0.9.0.bazel @@ -0,0 +1,63 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +rust_library( + name = "phf", + srcs = glob(["**/*.rs"]), + crate_features = [ + "default", + "macros", + "phf_macros", + "proc-macro-hack", + "std", + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2018", + proc_macro_deps = [ + "@raze__phf_macros__0_9_0//:phf_macros", + "@raze__proc_macro_hack__0_5_19//:proc_macro_hack", + ], + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.9.0", + # buildifier: leave-alone + deps = [ + "@raze__phf_shared__0_9_0//:phf_shared", + ], +) diff --git a/cargo/remote/BUILD.phf_generator-0.9.0.bazel b/cargo/remote/BUILD.phf_generator-0.9.0.bazel new file mode 100644 index 000000000..a500cf17c --- /dev/null +++ b/cargo/remote/BUILD.phf_generator-0.9.0.bazel @@ -0,0 +1,83 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +# Unsupported target "benches" with type "bench" omitted + +rust_binary( + # Prefix bin name to disambiguate from (probable) collision with lib name + # N.B.: The exact form of this is subject to change. + name = "cargo_bin_gen_hash_test", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/bin/gen_hash_test.rs", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.9.0", + # buildifier: leave-alone + deps = [ + ":phf_generator", + "@raze__phf_shared__0_9_0//:phf_shared", + "@raze__rand__0_8_4//:rand", + ], +) + +rust_library( + name = "phf_generator", + srcs = glob(["**/*.rs"]), + crate_features = [ + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.9.0", + # buildifier: leave-alone + deps = [ + "@raze__phf_shared__0_9_0//:phf_shared", + "@raze__rand__0_8_4//:rand", + ], +) diff --git a/cargo/remote/BUILD.phf_macros-0.8.0.bazel b/cargo/remote/BUILD.phf_macros-0.9.0.bazel similarity index 80% rename from cargo/remote/BUILD.phf_macros-0.8.0.bazel rename to cargo/remote/BUILD.phf_macros-0.9.0.bazel index 40683d7c0..c6a6c79af 100644 --- a/cargo/remote/BUILD.phf_macros-0.8.0.bazel +++ b/cargo/remote/BUILD.phf_macros-0.9.0.bazel @@ -30,8 +30,6 @@ licenses([ # Generated Targets -# Unsupported target "bench" with type "bench" omitted - rust_library( name = "phf_macros", srcs = glob(["**/*.rs"]), @@ -51,17 +49,13 @@ rust_library( "cargo-raze", "manual", ], - version = "0.8.0", + version = "0.9.0", # buildifier: leave-alone deps = [ - "@raze__phf_generator__0_8_0//:phf_generator", - "@raze__phf_shared__0_8_0//:phf_shared", + "@raze__phf_generator__0_9_0//:phf_generator", + "@raze__phf_shared__0_9_0//:phf_shared", "@raze__proc_macro2__1_0_27//:proc_macro2", "@raze__quote__1_0_9//:quote", "@raze__syn__1_0_73//:syn", ], ) - -# Unsupported target "compiletest" with type "test" omitted - -# Unsupported target "test" with type "test" omitted diff --git a/cargo/remote/BUILD.phf_shared-0.9.0.bazel b/cargo/remote/BUILD.phf_shared-0.9.0.bazel new file mode 100644 index 000000000..b5947da2c --- /dev/null +++ b/cargo/remote/BUILD.phf_shared-0.9.0.bazel @@ -0,0 +1,55 @@ +""" +@generated +cargo-raze crate build file. + +DO NOT EDIT! Replaced on runs of cargo-raze +""" + +# buildifier: disable=load +load("@bazel_skylib//lib:selects.bzl", "selects") + +# buildifier: disable=load +load( + "@rules_rust//rust:rust.bzl", + "rust_binary", + "rust_library", + "rust_test", +) + +package(default_visibility = [ + # Public for visibility by "@raze__crate__version//" targets. + # + # Prefer access through "//cargo", which limits external + # visibility to explicit Cargo.toml dependencies. + "//visibility:public", +]) + +licenses([ + "notice", # MIT from expression "MIT" +]) + +# Generated Targets + +rust_library( + name = "phf_shared", + srcs = glob(["**/*.rs"]), + crate_features = [ + "std", + ], + crate_root = "src/lib.rs", + crate_type = "lib", + data = [], + edition = "2018", + rustc_flags = [ + "--cap-lints=allow", + ], + tags = [ + "cargo-raze", + "manual", + ], + version = "0.9.0", + # buildifier: leave-alone + deps = [ + "@raze__siphasher__0_3_5//:siphasher", + ], +) diff --git a/cargo/remote/BUILD.rand-0.8.4.bazel b/cargo/remote/BUILD.rand-0.8.4.bazel index 75c0e9dd4..61f6aedc9 100644 --- a/cargo/remote/BUILD.rand-0.8.4.bazel +++ b/cargo/remote/BUILD.rand-0.8.4.bazel @@ -42,6 +42,7 @@ rust_library( "libc", "rand_chacha", "rand_hc", + "small_rng", "std", "std_rng", ], diff --git a/cargo/remote/BUILD.reqwest-0.11.3.bazel b/cargo/remote/BUILD.reqwest-0.11.3.bazel index 197089280..2e06672c0 100644 --- a/cargo/remote/BUILD.reqwest-0.11.3.bazel +++ b/cargo/remote/BUILD.reqwest-0.11.3.bazel @@ -121,7 +121,7 @@ rust_library( "@raze__pin_project_lite__0_2_6//:pin_project_lite", "@raze__rustls__0_19_1//:rustls", "@raze__rustls_native_certs__0_5_0//:rustls_native_certs", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", "@raze__tokio_native_tls__0_3_0//:tokio_native_tls", "@raze__tokio_rustls__0_22_0//:tokio_rustls", "@raze__tokio_socks__0_5_1//:tokio_socks", diff --git a/cargo/remote/BUILD.serde-aux-0.6.1.bazel b/cargo/remote/BUILD.serde-aux-2.2.0.bazel similarity index 89% rename from cargo/remote/BUILD.serde-aux-0.6.1.bazel rename to cargo/remote/BUILD.serde-aux-2.2.0.bazel index 0017c28ac..ee02d4da2 100644 --- a/cargo/remote/BUILD.serde-aux-0.6.1.bazel +++ b/cargo/remote/BUILD.serde-aux-2.2.0.bazel @@ -40,10 +40,7 @@ rust_library( crate_root = "src/lib.rs", crate_type = "lib", data = [], - edition = "2015", - proc_macro_deps = [ - "@raze__serde_derive__1_0_126//:serde_derive", - ], + edition = "2018", rustc_flags = [ "--cap-lints=allow", ], @@ -51,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.6.1", + version = "2.2.0", # buildifier: leave-alone deps = [ "@raze__chrono__0_4_19//:chrono", diff --git a/cargo/remote/BUILD.strum-0.20.0.bazel b/cargo/remote/BUILD.strum-0.21.0.bazel similarity index 93% rename from cargo/remote/BUILD.strum-0.20.0.bazel rename to cargo/remote/BUILD.strum-0.21.0.bazel index 35a515c69..8cf471798 100644 --- a/cargo/remote/BUILD.strum-0.20.0.bazel +++ b/cargo/remote/BUILD.strum-0.21.0.bazel @@ -42,7 +42,7 @@ rust_library( data = [], edition = "2018", proc_macro_deps = [ - "@raze__strum_macros__0_20_1//:strum_macros", + "@raze__strum_macros__0_21_1//:strum_macros", ], rustc_flags = [ "--cap-lints=allow", @@ -51,7 +51,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.20.0", + version = "0.21.0", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.strum_macros-0.20.1.bazel b/cargo/remote/BUILD.strum_macros-0.21.1.bazel similarity index 97% rename from cargo/remote/BUILD.strum_macros-0.20.1.bazel rename to cargo/remote/BUILD.strum_macros-0.21.1.bazel index 20817899c..dfbe973b1 100644 --- a/cargo/remote/BUILD.strum_macros-0.20.1.bazel +++ b/cargo/remote/BUILD.strum_macros-0.21.1.bazel @@ -46,7 +46,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.20.1", + version = "0.21.1", # buildifier: leave-alone deps = [ "@raze__heck__0_3_3//:heck", diff --git a/cargo/remote/BUILD.time-0.1.43.bazel b/cargo/remote/BUILD.time-0.1.44.bazel similarity index 98% rename from cargo/remote/BUILD.time-0.1.43.bazel rename to cargo/remote/BUILD.time-0.1.44.bazel index 73316afcf..67b16eb08 100644 --- a/cargo/remote/BUILD.time-0.1.43.bazel +++ b/cargo/remote/BUILD.time-0.1.44.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.1.43", + version = "0.1.44", # buildifier: leave-alone deps = [ "@raze__libc__0_2_97//:libc", diff --git a/cargo/remote/BUILD.tokio-1.7.0.bazel b/cargo/remote/BUILD.tokio-1.7.1.bazel similarity index 99% rename from cargo/remote/BUILD.tokio-1.7.0.bazel rename to cargo/remote/BUILD.tokio-1.7.1.bazel index e2d8eed03..5d232262c 100644 --- a/cargo/remote/BUILD.tokio-1.7.0.bazel +++ b/cargo/remote/BUILD.tokio-1.7.1.bazel @@ -67,7 +67,7 @@ cargo_build_script( "cargo-raze", "manual", ], - version = "1.7.0", + version = "1.7.1", visibility = ["//visibility:private"], deps = [ "@raze__autocfg__1_0_1//:autocfg", @@ -124,7 +124,7 @@ rust_library( "cargo-raze", "manual", ], - version = "1.7.0", + version = "1.7.1", # buildifier: leave-alone deps = [ ":tokio_build_script", diff --git a/cargo/remote/BUILD.tokio-io-timeout-1.1.1.bazel b/cargo/remote/BUILD.tokio-io-timeout-1.1.1.bazel index 9a3e68a8a..d08a15fb3 100644 --- a/cargo/remote/BUILD.tokio-io-timeout-1.1.1.bazel +++ b/cargo/remote/BUILD.tokio-io-timeout-1.1.1.bazel @@ -50,6 +50,6 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__pin_project_lite__0_2_6//:pin_project_lite", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", ], ) diff --git a/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel b/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel index 1eb8c7b52..67c98d40b 100644 --- a/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel +++ b/cargo/remote/BUILD.tokio-native-tls-0.3.0.bazel @@ -56,7 +56,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__native_tls__0_2_7//:native_tls", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", ] + selects.with_or({ # cfg(all(not(target_os = "macos"), not(windows), not(target_os = "ios"))) ( diff --git a/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel b/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel index 01f8d370a..06592ec2e 100644 --- a/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel +++ b/cargo/remote/BUILD.tokio-rustls-0.22.0.bazel @@ -50,7 +50,7 @@ rust_library( # buildifier: leave-alone deps = [ "@raze__rustls__0_19_1//:rustls", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", "@raze__webpki__0_21_4//:webpki", ], ) diff --git a/cargo/remote/BUILD.tokio-socks-0.5.1.bazel b/cargo/remote/BUILD.tokio-socks-0.5.1.bazel index c366d8312..98ea3cc1b 100644 --- a/cargo/remote/BUILD.tokio-socks-0.5.1.bazel +++ b/cargo/remote/BUILD.tokio-socks-0.5.1.bazel @@ -58,7 +58,7 @@ rust_library( "@raze__either__1_6_1//:either", "@raze__futures_util__0_3_15//:futures_util", "@raze__thiserror__1_0_25//:thiserror", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", ], ) diff --git a/cargo/remote/BUILD.tokio-util-0.6.7.bazel b/cargo/remote/BUILD.tokio-util-0.6.7.bazel index 0902a81c2..a9576f1e1 100644 --- a/cargo/remote/BUILD.tokio-util-0.6.7.bazel +++ b/cargo/remote/BUILD.tokio-util-0.6.7.bazel @@ -57,7 +57,7 @@ rust_library( "@raze__futures_sink__0_3_15//:futures_sink", "@raze__log__0_4_14//:log", "@raze__pin_project_lite__0_2_6//:pin_project_lite", - "@raze__tokio__1_7_0//:tokio", + "@raze__tokio__1_7_1//:tokio", ], ) diff --git a/cargo/remote/BUILD.vcpkg-0.2.14.bazel b/cargo/remote/BUILD.vcpkg-0.2.15.bazel similarity index 97% rename from cargo/remote/BUILD.vcpkg-0.2.14.bazel rename to cargo/remote/BUILD.vcpkg-0.2.15.bazel index 0a3d54c13..fd21e4d1b 100644 --- a/cargo/remote/BUILD.vcpkg-0.2.14.bazel +++ b/cargo/remote/BUILD.vcpkg-0.2.15.bazel @@ -46,7 +46,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.2.14", + version = "0.2.15", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel b/cargo/remote/BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel similarity index 95% rename from cargo/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel rename to cargo/remote/BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel index 49e605d4f..d1e590648 100644 --- a/cargo/remote/BUILD.wasi-0.10.2+wasi-snapshot-preview1.bazel +++ b/cargo/remote/BUILD.wasi-0.10.0+wasi-snapshot-preview1.bazel @@ -48,7 +48,7 @@ rust_library( "cargo-raze", "manual", ], - version = "0.10.2+wasi-snapshot-preview1", + version = "0.10.0+wasi-snapshot-preview1", # buildifier: leave-alone deps = [ ], diff --git a/cargo/remote/BUILD.xml5ever-0.16.1.bazel b/cargo/remote/BUILD.xml5ever-0.16.1.bazel index 0e2424a1a..4d50f2b04 100644 --- a/cargo/remote/BUILD.xml5ever-0.16.1.bazel +++ b/cargo/remote/BUILD.xml5ever-0.16.1.bazel @@ -58,6 +58,6 @@ rust_library( "@raze__log__0_4_14//:log", "@raze__mac__0_1_1//:mac", "@raze__markup5ever__0_10_1//:markup5ever", - "@raze__time__0_1_43//:time", + "@raze__time__0_1_44//:time", ], ) diff --git a/cargo/remote/BUILD.zip-0.5.13.bazel b/cargo/remote/BUILD.zip-0.5.13.bazel index b413dd658..79c991869 100644 --- a/cargo/remote/BUILD.zip-0.5.13.bazel +++ b/cargo/remote/BUILD.zip-0.5.13.bazel @@ -70,7 +70,7 @@ rust_library( "@raze__crc32fast__1_2_1//:crc32fast", "@raze__flate2__1_0_20//:flate2", "@raze__thiserror__1_0_25//:thiserror", - "@raze__time__0_1_43//:time", + "@raze__time__0_1_44//:time", ], ) diff --git a/pylib/rsbridge/Cargo.toml b/pylib/rsbridge/Cargo.toml index bc76b4cd3..6daedb800 100644 --- a/pylib/rsbridge/Cargo.toml +++ b/pylib/rsbridge/Cargo.toml @@ -11,7 +11,7 @@ anki = { path = "../../rslib" } # /cargo/update.py needs to be run if updating the version below [dependencies.pyo3] -version = "0.13" +version = "0.13.2" features = ["extension-module", "abi3"] [lib] diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml index 43436cd35..074e3fdea 100644 --- a/rslib/Cargo.toml +++ b/rslib/Cargo.toml @@ -14,15 +14,19 @@ path = "src/lib.rs" # After updating anything below, run ../cargo/update.py [build-dependencies] -prost-build = "0.7" +prost-build = "0.7.0" [dev-dependencies] -env_logger = "0.8.1" +env_logger = "0.8.4" [dependencies] # pinned as any changes could invalidate sqlite indexes unicase = "=2.6.0" +# temporarily pinned due to memchr conflict; functionally equiv. to 6.x +nom = "=7.0.0-alpha1" + + # transitive dependency; 0.1.7 is broken on Windows # https://github.com/bazelbuild/rules_rust/issues/710 proc-macro-nested = "=0.1.6" @@ -30,32 +34,31 @@ proc-macro-nested = "=0.1.6" # https://github.com/google/cargo-raze/issues/416 slog-term = "=2.6.0" -anki_i18n = { path = "i18n" } +anki_i18n = { path="i18n" } -askama = "0.10.1" -async-compression = { version = "0.3.5", features = ["tokio", "gzip"] } -blake3 = "0.3.5" -bytes = "1" -chrono = "0.4.13" -coarsetime = "0.1.16" -flate2 = "1.0.16" -fluent = "0.15" -fluent-bundle = "0.15" -futures = "0.3.5" -hex = "0.4.2" +askama = "0.10.5" +async-compression = { version="0.3.8", features=["tokio", "gzip"] } +blake3 = "0.3.8" +bytes = "1.0.1" +chrono = "0.4.19" +coarsetime = "0.1.19" +flate2 = "1.0.20" +fluent = "0.15.0" +fluent-bundle = "0.15.1" +futures = "0.3.15" +hex = "0.4.3" htmlescape = "0.3.1" -intl-memoizer = "0.5" -itertools = "0.9.0" +intl-memoizer = "0.5.1" +itertools = "0.10.1" lazy_static = "1.4.0" -nom = "6.0.1" -num_enum = "0.5.0" -num-integer = "0.1.43" -once_cell = "1.4.1" -pin-project = "1" -prost = "0.7" -rand = "0.7.3" -regex = "1.3.9" -reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "7591444614de02b658ddab125efba7b2bb4e2335", default-features = false, features = [ +num_enum = "0.5.1" +num-integer = "0.1.44" +once_cell = "1.8.0" +pin-project = "1.0.7" +prost = "0.7.0" +rand = "0.8.4" +regex = "1.5.4" +reqwest = { git="https://github.com/ankitects/reqwest.git", rev="7591444614de02b658ddab125efba7b2bb4e2335", default-features=false, features=[ "json", "socks", "stream", @@ -66,27 +69,27 @@ reqwest = { git = "https://github.com/ankitects/reqwest.git", rev = "7591444614d "rustls-tls-webpki-roots", "rustls-tls-native-roots", ] } -rusqlite = { version = "0.24.1", features = ["trace", "functions", "collation", "bundled"] } +rusqlite = { version="0.24.1", features=["trace", "functions", "collation", "bundled"] } scopeguard = "1.1.0" -serde = "1.0.114" -serde_derive = "1.0.114" -serde_json = "1.0.56" -serde_repr = "0.1.6" +serde = "1.0.126" +serde_derive = "1.0.126" +serde_json = "1.0.64" +serde_repr = "0.1.7" serde_tuple = "0.5.0" -serde-aux = "0.6.1" +serde-aux = "2.2.0" sha1 = "0.6.0" -slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_debug"] } -slog-async = "2.5.0" +slog = { version="2.7.0", features=["max_level_trace", "release_max_level_debug"] } +slog-async = "2.6.0" slog-envlogger = "2.2.0" -tempfile = "3.1.0" -tokio = { version = "1", features = ["fs", "rt-multi-thread"] } -unic-langid = { version = "0.9", features = ["macros"] } -unicode-normalization = "0.1.13" +tempfile = "3.2.0" +tokio = { version="1.7.1", features=["fs", "rt-multi-thread"] } +unic-langid = { version="0.9.0", features=["macros"] } +unicode-normalization = "0.1.19" utime = "0.3.1" -zip = { version = "0.5.6", default-features = false, features = ["deflate", "time"] } -async-trait = "0.1.42" -ammonia = "3.1.0" +zip = { version="0.5.13", default-features=false, features=["deflate", "time"] } +async-trait = "0.1.50" +ammonia = "3.1.1" pulldown-cmark = "0.8.0" fnv = "1.0.7" -strum = { version = "0.20.0", features = ["derive"] } -tokio-util = { version = "0.6.6", features = ["io"] } +strum = { version="0.21.0", features=["derive"] } +tokio-util = { version="0.6.7", features=["io"] } diff --git a/rslib/cargo/BUILD.bazel b/rslib/cargo/BUILD.bazel index cc1a3c135..dbbaf9678 100644 --- a/rslib/cargo/BUILD.bazel +++ b/rslib/cargo/BUILD.bazel @@ -167,7 +167,7 @@ alias( alias( name = "itertools", - actual = "@raze__itertools__0_9_0//:itertools", + actual = "@raze__itertools__0_10_1//:itertools", tags = [ "cargo-raze", "manual", @@ -185,7 +185,7 @@ alias( alias( name = "nom", - actual = "@raze__nom__6_1_2//:nom", + actual = "@raze__nom__7_0_0_alpha1//:nom", tags = [ "cargo-raze", "manual", @@ -266,7 +266,7 @@ alias( alias( name = "rand", - actual = "@raze__rand__0_7_3//:rand", + actual = "@raze__rand__0_8_4//:rand", tags = [ "cargo-raze", "manual", @@ -320,7 +320,7 @@ alias( alias( name = "serde_aux", - actual = "@raze__serde_aux__0_6_1//:serde_aux", + actual = "@raze__serde_aux__2_2_0//:serde_aux", tags = [ "cargo-raze", "manual", @@ -410,7 +410,7 @@ alias( alias( name = "strum", - actual = "@raze__strum__0_20_0//:strum", + actual = "@raze__strum__0_21_0//:strum", tags = [ "cargo-raze", "manual", @@ -428,7 +428,7 @@ alias( alias( name = "tokio", - actual = "@raze__tokio__1_7_0//:tokio", + actual = "@raze__tokio__1_7_1//:tokio", tags = [ "cargo-raze", "manual", diff --git a/rslib/i18n/Cargo.toml b/rslib/i18n/Cargo.toml index 481b6dd65..f1bea0c0c 100644 --- a/rslib/i18n/Cargo.toml +++ b/rslib/i18n/Cargo.toml @@ -20,17 +20,17 @@ path = "build/write_json.rs" [build-dependencies] fluent-syntax = "0.11.0" fluent = "0.15.0" -unic-langid = { version = "0.9", features = ["macros"] } -serde = { version = "1.0.114", features = ["derive"] } -serde_json = "1.0.56" +unic-langid = { version = "0.9.0", features = ["macros"] } +serde = { version = "1.0.126", features = ["derive"] } +serde_json = "1.0.64" inflections = "1.1.1" [dependencies] -phf = { version = "0.8", features = ["macros"] } +phf = { version = "0.9.0", features = ["macros"] } fluent = "0.15.0" num-format = "0.4.0" -unic-langid = { version = "0.9", features = ["macros"] } -serde = { version = "1.0.114", features = ["derive"] } -serde_json = "1.0.56" -intl-memoizer = "0.5" -fluent-bundle = "0.15.0" +unic-langid = { version = "0.9.0", features = ["macros"] } +serde = { version = "1.0.126", features = ["derive"] } +serde_json = "1.0.64" +intl-memoizer = "0.5.1" +fluent-bundle = "0.15.1" diff --git a/rslib/i18n/cargo/BUILD.bazel b/rslib/i18n/cargo/BUILD.bazel index 26a00d3cb..4d4be4acb 100644 --- a/rslib/i18n/cargo/BUILD.bazel +++ b/rslib/i18n/cargo/BUILD.bazel @@ -68,7 +68,7 @@ alias( alias( name = "phf", - actual = "@raze__phf__0_8_0//:phf", + actual = "@raze__phf__0_9_0//:phf", tags = [ "cargo-raze", "manual", diff --git a/rslib/src/notetype/cardgen.rs b/rslib/src/notetype/cardgen.rs index 721e0728c..5f99a12f6 100644 --- a/rslib/src/notetype/cardgen.rs +++ b/rslib/src/notetype/cardgen.rs @@ -345,7 +345,7 @@ impl Collection { fn random_position(highest_position: u32) -> u32 { let mut rng = StdRng::seed_from_u64(highest_position as u64); - rng.gen_range(0, highest_position.max(1000)) + rng.gen_range(0..highest_position.max(1000)) } #[cfg(test)] @@ -355,8 +355,8 @@ mod test { #[test] fn random() { // predictable output and a minimum range of 1000 - assert_eq!(random_position(5), 626); - assert_eq!(random_position(500), 898); - assert_eq!(random_position(5001), 2282); + assert_eq!(random_position(5), 179); + assert_eq!(random_position(500), 12); + assert_eq!(random_position(5001), 3731); } } diff --git a/rslib/src/scheduler/answering/learning.rs b/rslib/src/scheduler/answering/learning.rs index 92f532648..7896dc2f7 100644 --- a/rslib/src/scheduler/answering/learning.rs +++ b/rslib/src/scheduler/answering/learning.rs @@ -61,7 +61,7 @@ impl CardStateUpdater { if secs >= upper_exclusive { secs } else { - rng.gen_range(secs, upper_exclusive) + rng.gen_range(secs..upper_exclusive) } } else { secs diff --git a/rslib/src/scheduler/states/mod.rs b/rslib/src/scheduler/states/mod.rs index 74450c4b7..45f12fb16 100644 --- a/rslib/src/scheduler/states/mod.rs +++ b/rslib/src/scheduler/states/mod.rs @@ -113,7 +113,7 @@ impl<'a> StateContext<'a> { if lower >= upper { lower } else { - rng.gen_range(lower, upper) + rng.gen_range(lower..upper) } } else { interval