Merge pull request #848 from cecini/rslibdep

Update Rust deps, and nom to v6
This commit is contained in:
Damien Elmes 2020-12-15 20:04:02 +10:00 committed by GitHub
commit 75cbbea048
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
40 changed files with 356 additions and 533 deletions

65
Cargo.lock generated
View File

@ -17,9 +17,9 @@ checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e"
[[package]]
name = "ahash"
version = "0.4.6"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c"
checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e"
[[package]]
name = "aho-corasick"
@ -51,7 +51,7 @@ dependencies = [
"intl-memoizer",
"itertools",
"lazy_static",
"nom 5.1.2",
"nom",
"num-format",
"num-integer",
"num_enum",
@ -96,9 +96,9 @@ checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4"
[[package]]
name = "arc-swap"
version = "0.4.7"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034"
checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8"
[[package]]
name = "arrayref"
@ -157,7 +157,7 @@ checksum = "2582b77e0f3c506ec4838a25fa8a5f97b9bed72bb6d3d272ea1c031d8bd373bc"
dependencies = [
"askama_escape",
"humansize",
"nom 6.0.1",
"nom",
"num-traits",
"percent-encoding",
"proc-macro2",
@ -853,9 +853,9 @@ checksum = "e9025058dae765dee5070ec375f591e2ba14638c63feff74f13805a72e523163"
[[package]]
name = "http"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9"
checksum = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26"
dependencies = [
"bytes 0.5.6",
"fnv",
@ -973,9 +973,9 @@ dependencies = [
[[package]]
name = "indexmap"
version = "1.6.0"
version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2"
checksum = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b"
dependencies = [
"autocfg",
"hashbrown",
@ -1021,9 +1021,9 @@ dependencies = [
[[package]]
name = "inventory"
version = "0.1.9"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fedd49de24d8c263613701406611410687148ae8c37cd6452650b250f753a0dd"
checksum = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f"
dependencies = [
"ctor",
"ghost",
@ -1032,9 +1032,9 @@ dependencies = [
[[package]]
name = "inventory-impl"
version = "0.1.9"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddead8880bc50f57fcd3b5869a7f6ff92570bb4e8f6870c22e2483272f2256da"
checksum = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51"
dependencies = [
"proc-macro2",
"quote",
@ -1245,9 +1245,9 @@ dependencies = [
[[package]]
name = "net2"
version = "0.2.36"
version = "0.2.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7cf75f38f16cb05ea017784dc6dbfd354f76c223dba37701734c4f5a9337d02"
checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae"
dependencies = [
"cfg-if 0.1.10",
"libc",
@ -1260,17 +1260,6 @@ version = "0.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
[[package]]
name = "nom"
version = "5.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af"
dependencies = [
"lexical-core",
"memchr",
"version_check",
]
[[package]]
name = "nom"
version = "6.0.1"
@ -1358,12 +1347,12 @@ checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
[[package]]
name = "openssl"
version = "0.10.30"
version = "0.10.31"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4"
checksum = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187"
dependencies = [
"bitflags",
"cfg-if 0.1.10",
"cfg-if 1.0.0",
"foreign-types",
"lazy_static",
"libc",
@ -1378,9 +1367,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
[[package]]
name = "openssl-sys"
version = "0.9.58"
version = "0.9.59"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de"
checksum = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe"
dependencies = [
"autocfg",
"cc",
@ -1416,9 +1405,9 @@ dependencies = [
[[package]]
name = "paste"
version = "1.0.3"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9"
checksum = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1"
[[package]]
name = "percent-encoding"
@ -2251,9 +2240,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "0.2.23"
version = "0.2.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff"
checksum = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48"
dependencies = [
"bytes 0.5.6",
"fnv",
@ -2510,9 +2499,9 @@ dependencies = [
[[package]]
name = "vcpkg"
version = "0.2.10"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c"
checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
[[package]]
name = "version_check"

View File

@ -107,7 +107,7 @@ rust_library(
# buildifier: leave-alone
deps = [
"@raze__bytes__0_5_6//:bytes",
"@raze__http__0_2_1//:http",
"@raze__http__0_2_2//:http",
"@raze__hyper_timeout__0_3_1//:hyper_timeout",
"@raze__mime_guess__2_0_3//:mime_guess",
"@raze__serde__1_0_118//:serde",
@ -135,7 +135,7 @@ rust_library(
"@raze__mime__0_3_16//:mime",
"@raze__percent_encoding__2_1_0//:percent_encoding",
"@raze__pin_project_lite__0_1_11//:pin_project_lite",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
"@raze__tokio_socks__0_3_0//:tokio_socks",
],
"//conditions:default": [],

View File

@ -33,12 +33,12 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__ahash__0_4_6",
url = "https://crates.io/api/v1/crates/ahash/0.4.6/download",
name = "raze__ahash__0_4_7",
url = "https://crates.io/api/v1/crates/ahash/0.4.7/download",
type = "tar.gz",
sha256 = "f6789e291be47ace86a60303502173d84af8327e3627ecf334356ee0f87a164c",
strip_prefix = "ahash-0.4.6",
build_file = Label("//cargo/remote:BUILD.ahash-0.4.6.bazel"),
sha256 = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e",
strip_prefix = "ahash-0.4.7",
build_file = Label("//cargo/remote:BUILD.ahash-0.4.7.bazel"),
)
maybe(
@ -63,12 +63,12 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__arc_swap__0_4_7",
url = "https://crates.io/api/v1/crates/arc-swap/0.4.7/download",
name = "raze__arc_swap__0_4_8",
url = "https://crates.io/api/v1/crates/arc-swap/0.4.8/download",
type = "tar.gz",
sha256 = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034",
strip_prefix = "arc-swap-0.4.7",
build_file = Label("//cargo/remote:BUILD.arc-swap-0.4.7.bazel"),
sha256 = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8",
strip_prefix = "arc-swap-0.4.8",
build_file = Label("//cargo/remote:BUILD.arc-swap-0.4.8.bazel"),
)
maybe(
@ -883,12 +883,12 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__http__0_2_1",
url = "https://crates.io/api/v1/crates/http/0.2.1/download",
name = "raze__http__0_2_2",
url = "https://crates.io/api/v1/crates/http/0.2.2/download",
type = "tar.gz",
sha256 = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9",
strip_prefix = "http-0.2.1",
build_file = Label("//cargo/remote:BUILD.http-0.2.1.bazel"),
sha256 = "84129d298a6d57d246960ff8eb831ca4af3f96d29e2e28848dae275408658e26",
strip_prefix = "http-0.2.2",
build_file = Label("//cargo/remote:BUILD.http-0.2.2.bazel"),
)
maybe(
@ -993,12 +993,12 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__indexmap__1_6_0",
url = "https://crates.io/api/v1/crates/indexmap/1.6.0/download",
name = "raze__indexmap__1_6_1",
url = "https://crates.io/api/v1/crates/indexmap/1.6.1/download",
type = "tar.gz",
sha256 = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2",
strip_prefix = "indexmap-1.6.0",
build_file = Label("//cargo/remote:BUILD.indexmap-1.6.0.bazel"),
sha256 = "4fb1fa934250de4de8aef298d81c729a7d33d8c239daa3a7575e6b92bfc7313b",
strip_prefix = "indexmap-1.6.1",
build_file = Label("//cargo/remote:BUILD.indexmap-1.6.1.bazel"),
)
maybe(
@ -1043,22 +1043,22 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__inventory__0_1_9",
url = "https://crates.io/api/v1/crates/inventory/0.1.9/download",
name = "raze__inventory__0_1_10",
url = "https://crates.io/api/v1/crates/inventory/0.1.10/download",
type = "tar.gz",
sha256 = "fedd49de24d8c263613701406611410687148ae8c37cd6452650b250f753a0dd",
strip_prefix = "inventory-0.1.9",
build_file = Label("//cargo/remote:BUILD.inventory-0.1.9.bazel"),
sha256 = "0f0f7efb804ec95e33db9ad49e4252f049e37e8b0a4652e3cd61f7999f2eff7f",
strip_prefix = "inventory-0.1.10",
build_file = Label("//cargo/remote:BUILD.inventory-0.1.10.bazel"),
)
maybe(
http_archive,
name = "raze__inventory_impl__0_1_9",
url = "https://crates.io/api/v1/crates/inventory-impl/0.1.9/download",
name = "raze__inventory_impl__0_1_10",
url = "https://crates.io/api/v1/crates/inventory-impl/0.1.10/download",
type = "tar.gz",
sha256 = "ddead8880bc50f57fcd3b5869a7f6ff92570bb4e8f6870c22e2483272f2256da",
strip_prefix = "inventory-impl-0.1.9",
build_file = Label("//cargo/remote:BUILD.inventory-impl-0.1.9.bazel"),
sha256 = "75c094e94816723ab936484666968f5b58060492e880f3c8d00489a1e244fa51",
strip_prefix = "inventory-impl-0.1.10",
build_file = Label("//cargo/remote:BUILD.inventory-impl-0.1.10.bazel"),
)
maybe(
@ -1283,12 +1283,12 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__net2__0_2_36",
url = "https://crates.io/api/v1/crates/net2/0.2.36/download",
name = "raze__net2__0_2_37",
url = "https://crates.io/api/v1/crates/net2/0.2.37/download",
type = "tar.gz",
sha256 = "d7cf75f38f16cb05ea017784dc6dbfd354f76c223dba37701734c4f5a9337d02",
strip_prefix = "net2-0.2.36",
build_file = Label("//cargo/remote:BUILD.net2-0.2.36.bazel"),
sha256 = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae",
strip_prefix = "net2-0.2.37",
build_file = Label("//cargo/remote:BUILD.net2-0.2.37.bazel"),
)
maybe(
@ -1301,16 +1301,6 @@ def raze_fetch_remote_crates():
build_file = Label("//cargo/remote:BUILD.nodrop-0.1.14.bazel"),
)
maybe(
http_archive,
name = "raze__nom__5_1_2",
url = "https://crates.io/api/v1/crates/nom/5.1.2/download",
type = "tar.gz",
sha256 = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af",
strip_prefix = "nom-5.1.2",
build_file = Label("//cargo/remote:BUILD.nom-5.1.2.bazel"),
)
maybe(
http_archive,
name = "raze__nom__6_0_1",
@ -1403,12 +1393,12 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__openssl__0_10_30",
url = "https://crates.io/api/v1/crates/openssl/0.10.30/download",
name = "raze__openssl__0_10_31",
url = "https://crates.io/api/v1/crates/openssl/0.10.31/download",
type = "tar.gz",
sha256 = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4",
strip_prefix = "openssl-0.10.30",
build_file = Label("//cargo/remote:BUILD.openssl-0.10.30.bazel"),
sha256 = "8d008f51b1acffa0d3450a68606e6a51c123012edaacb0f4e1426bd978869187",
strip_prefix = "openssl-0.10.31",
build_file = Label("//cargo/remote:BUILD.openssl-0.10.31.bazel"),
)
maybe(
@ -1423,12 +1413,12 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__openssl_sys__0_9_58",
url = "https://crates.io/api/v1/crates/openssl-sys/0.9.58/download",
name = "raze__openssl_sys__0_9_59",
url = "https://crates.io/api/v1/crates/openssl-sys/0.9.59/download",
type = "tar.gz",
sha256 = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de",
strip_prefix = "openssl-sys-0.9.58",
build_file = Label("//cargo/remote:BUILD.openssl-sys-0.9.58.bazel"),
sha256 = "de52d8eabd217311538a39bba130d7dea1f1e118010fee7a033d966845e7d5fe",
strip_prefix = "openssl-sys-0.9.59",
build_file = Label("//cargo/remote:BUILD.openssl-sys-0.9.59.bazel"),
)
maybe(
@ -1453,12 +1443,12 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__paste__1_0_3",
url = "https://crates.io/api/v1/crates/paste/1.0.3/download",
name = "raze__paste__1_0_4",
url = "https://crates.io/api/v1/crates/paste/1.0.4/download",
type = "tar.gz",
sha256 = "7151b083b0664ed58ed669fcdd92f01c3d2fdbf10af4931a301474950b52bfa9",
strip_prefix = "paste-1.0.3",
build_file = Label("//cargo/remote:BUILD.paste-1.0.3.bazel"),
sha256 = "c5d65c4d95931acda4498f675e332fcbdc9a06705cd07086c510e9b6009cd1c1",
strip_prefix = "paste-1.0.4",
build_file = Label("//cargo/remote:BUILD.paste-1.0.4.bazel"),
)
maybe(
@ -2303,12 +2293,12 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__tokio__0_2_23",
url = "https://crates.io/api/v1/crates/tokio/0.2.23/download",
name = "raze__tokio__0_2_24",
url = "https://crates.io/api/v1/crates/tokio/0.2.24/download",
type = "tar.gz",
sha256 = "a6d7ad61edd59bfcc7e80dababf0f4aed2e6d5e0ba1659356ae889752dfc12ff",
strip_prefix = "tokio-0.2.23",
build_file = Label("//cargo/remote:BUILD.tokio-0.2.23.bazel"),
sha256 = "099837d3464c16a808060bb3f02263b412f6fafcb5d01c533d309985fbeebe48",
strip_prefix = "tokio-0.2.24",
build_file = Label("//cargo/remote:BUILD.tokio-0.2.24.bazel"),
)
maybe(
@ -2573,12 +2563,12 @@ def raze_fetch_remote_crates():
maybe(
http_archive,
name = "raze__vcpkg__0_2_10",
url = "https://crates.io/api/v1/crates/vcpkg/0.2.10/download",
name = "raze__vcpkg__0_2_11",
url = "https://crates.io/api/v1/crates/vcpkg/0.2.11/download",
type = "tar.gz",
sha256 = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c",
strip_prefix = "vcpkg-0.2.10",
build_file = Label("//cargo/remote:BUILD.vcpkg-0.2.10.bazel"),
sha256 = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb",
strip_prefix = "vcpkg-0.2.11",
build_file = Label("//cargo/remote:BUILD.vcpkg-0.2.11.bazel"),
)
maybe(

File diff suppressed because it is too large Load Diff

View File

@ -49,7 +49,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "0.4.6",
version = "0.4.7",
# buildifier: leave-alone
deps = [
],

View File

@ -45,7 +45,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "0.4.7",
version = "0.4.8",
# buildifier: leave-alone
deps = [
],

View File

@ -59,10 +59,10 @@ rust_library(
"@raze__futures_core__0_3_8//:futures_core",
"@raze__futures_sink__0_3_8//:futures_sink",
"@raze__futures_util__0_3_8//:futures_util",
"@raze__http__0_2_1//:http",
"@raze__indexmap__1_6_0//:indexmap",
"@raze__http__0_2_2//:http",
"@raze__indexmap__1_6_1//:indexmap",
"@raze__slab__0_4_2//:slab",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
"@raze__tokio_util__0_3_1//:tokio_util",
"@raze__tracing__0_1_22//:tracing",
"@raze__tracing_futures__0_2_4//:tracing_futures",

View File

@ -54,7 +54,7 @@ rust_library(
version = "0.9.1",
# buildifier: leave-alone
deps = [
"@raze__ahash__0_4_6//:ahash",
"@raze__ahash__0_4_7//:ahash",
],
)

View File

@ -53,7 +53,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "0.2.1",
version = "0.2.2",
# buildifier: leave-alone
deps = [
"@raze__bytes__0_5_6//:bytes",

View File

@ -49,7 +49,7 @@ rust_library(
# buildifier: leave-alone
deps = [
"@raze__bytes__0_5_6//:bytes",
"@raze__http__0_2_1//:http",
"@raze__http__0_2_2//:http",
],
)

View File

@ -99,14 +99,14 @@ rust_library(
"@raze__futures_core__0_3_8//:futures_core",
"@raze__futures_util__0_3_8//:futures_util",
"@raze__h2__0_2_7//:h2",
"@raze__http__0_2_1//:http",
"@raze__http__0_2_2//:http",
"@raze__http_body__0_3_1//:http_body",
"@raze__httparse__1_3_4//:httparse",
"@raze__httpdate__0_3_2//:httpdate",
"@raze__itoa__0_4_6//:itoa",
"@raze__pin_project__1_0_2//:pin_project",
"@raze__socket2__0_3_17//:socket2",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
"@raze__tower_service__0_3_0//:tower_service",
"@raze__tracing__0_1_22//:tracing",
"@raze__want__0_3_0//:want",

View File

@ -57,7 +57,7 @@ rust_library(
"@raze__hyper__0_13_9//:hyper",
"@raze__log__0_4_11//:log",
"@raze__rustls__0_18_1//:rustls",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
"@raze__tokio_rustls__0_14_1//:tokio_rustls",
"@raze__webpki__0_21_4//:webpki",
],

View File

@ -52,7 +52,7 @@ rust_library(
deps = [
"@raze__bytes__0_5_6//:bytes",
"@raze__hyper__0_13_9//:hyper",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
"@raze__tokio_io_timeout__0_4_0//:tokio_io_timeout",
],
)

View File

@ -53,7 +53,7 @@ rust_library(
"@raze__bytes__0_5_6//:bytes",
"@raze__hyper__0_13_9//:hyper",
"@raze__native_tls__0_2_6//:native_tls",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
"@raze__tokio_tls__0_3_1//:tokio_tls",
],
)

View File

@ -52,7 +52,7 @@ cargo_build_script(
"cargo-raze",
"manual",
],
version = "1.6.0",
version = "1.6.1",
visibility = ["//visibility:private"],
deps = [
"@raze__autocfg__1_0_1//:autocfg",
@ -78,7 +78,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "1.6.0",
version = "1.6.1",
# buildifier: leave-alone
deps = [
":indexmap_build_script",

View File

@ -52,7 +52,7 @@ cargo_build_script(
"cargo-raze",
"manual",
],
version = "0.1.9",
version = "0.1.10",
visibility = ["//visibility:private"],
deps = [
],
@ -71,7 +71,7 @@ rust_library(
proc_macro_deps = [
"@raze__ctor__0_1_16//:ctor",
"@raze__ghost__0_1_2//:ghost",
"@raze__inventory_impl__0_1_9//:inventory_impl",
"@raze__inventory_impl__0_1_10//:inventory_impl",
],
rustc_flags = [
"--cap-lints=allow",
@ -80,7 +80,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "0.1.9",
version = "0.1.10",
# buildifier: leave-alone
deps = [
":inventory_build_script",

View File

@ -45,7 +45,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "0.1.9",
version = "0.1.10",
# buildifier: leave-alone
deps = [
"@raze__proc_macro2__1_0_24//:proc_macro2",

View File

@ -71,7 +71,7 @@ cargo_build_script(
(
"@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc",
): [
"@raze__vcpkg__0_2_10//:vcpkg",
"@raze__vcpkg__0_2_11//:vcpkg",
],
"//conditions:default": [],
}),

View File

@ -55,7 +55,7 @@ rust_library(
"@raze__cfg_if__0_1_10//:cfg_if",
"@raze__iovec__0_1_4//:iovec",
"@raze__log__0_4_11//:log",
"@raze__net2__0_2_36//:net2",
"@raze__net2__0_2_37//:net2",
"@raze__slab__0_4_2//:slab",
] + selects.with_or({
# cfg(unix)

View File

@ -49,7 +49,7 @@ rust_library(
# buildifier: leave-alone
deps = [
"@raze__kernel32_sys__0_2_2//:kernel32_sys",
"@raze__net2__0_2_36//:net2",
"@raze__net2__0_2_37//:net2",
"@raze__winapi__0_2_8//:winapi",
"@raze__ws2_32_sys__0_2_1//:ws2_32_sys",
],

View File

@ -70,7 +70,7 @@ cargo_build_script(
(
"@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu",
): [
"@raze__openssl_sys__0_9_58//:openssl_sys",
"@raze__openssl_sys__0_9_59//:openssl_sys",
],
"//conditions:default": [],
}) + selects.with_or({
@ -128,9 +128,9 @@ rust_library(
"@io_bazel_rules_rust//rust/platform:x86_64-unknown-linux-gnu",
): [
"@raze__log__0_4_11//:log",
"@raze__openssl__0_10_30//:openssl",
"@raze__openssl__0_10_31//:openssl",
"@raze__openssl_probe__0_1_2//:openssl_probe",
"@raze__openssl_sys__0_9_58//:openssl_sys",
"@raze__openssl_sys__0_9_59//:openssl_sys",
],
"//conditions:default": [],
}) + selects.with_or({

View File

@ -49,7 +49,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "0.2.36",
version = "0.2.37",
# buildifier: leave-alone
deps = [
"@raze__cfg_if__0_1_10//:cfg_if",

View File

@ -1,148 +0,0 @@
"""
@generated
cargo-raze crate build file.
DO NOT EDIT! Replaced on runs of cargo-raze
"""
# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
)
# buildifier: disable=load
load("@bazel_skylib//lib:selects.bzl", "selects")
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=load-on-top
load(
"@io_bazel_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 = "5.1.2",
visibility = ["//visibility:private"],
deps = [
"@raze__version_check__0_9_2//: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 "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",
edition = "2018",
rustc_flags = [
"--cap-lints=allow",
],
tags = [
"cargo-raze",
"manual",
],
version = "5.1.2",
# buildifier: leave-alone
deps = [
":nom_build_script",
"@raze__lexical_core__0_7_4//:lexical_core",
"@raze__memchr__2_3_4//:memchr",
],
)
# Unsupported target "arithmetic" with type "test" omitted
# Unsupported target "arithmetic_ast" 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 "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

View File

@ -52,10 +52,10 @@ cargo_build_script(
"cargo-raze",
"manual",
],
version = "0.10.30",
version = "0.10.31",
visibility = ["//visibility:private"],
deps = [
"@raze__openssl_sys__0_9_58//:openssl_sys",
"@raze__openssl_sys__0_9_59//:openssl_sys",
],
)
@ -76,15 +76,15 @@ rust_library(
"cargo-raze",
"manual",
],
version = "0.10.30",
version = "0.10.31",
# buildifier: leave-alone
deps = [
":openssl_build_script",
"@raze__bitflags__1_2_1//:bitflags",
"@raze__cfg_if__0_1_10//:cfg_if",
"@raze__cfg_if__1_0_0//:cfg_if",
"@raze__foreign_types__0_3_2//:foreign_types",
"@raze__lazy_static__1_4_0//:lazy_static",
"@raze__libc__0_2_81//:libc",
"@raze__openssl_sys__0_9_58//:openssl_sys",
"@raze__openssl_sys__0_9_59//:openssl_sys",
],
)

View File

@ -52,7 +52,7 @@ cargo_build_script(
"cargo-raze",
"manual",
],
version = "0.9.58",
version = "0.9.59",
visibility = ["//visibility:private"],
deps = [
"@raze__autocfg__1_0_1//:autocfg",
@ -63,7 +63,7 @@ cargo_build_script(
(
"@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc",
): [
"@raze__vcpkg__0_2_10//:vcpkg",
"@raze__vcpkg__0_2_11//:vcpkg",
],
"//conditions:default": [],
}),
@ -86,7 +86,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "0.9.58",
version = "0.9.59",
# buildifier: leave-alone
deps = [
":openssl_sys_build_script",

View File

@ -45,7 +45,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "1.0.3",
version = "1.0.4",
# buildifier: leave-alone
deps = [
],

View File

@ -61,7 +61,7 @@ rust_library(
# buildifier: leave-alone
deps = [
"@raze__fixedbitset__0_2_0//:fixedbitset",
"@raze__indexmap__1_6_0//:indexmap",
"@raze__indexmap__1_6_1//:indexmap",
],
)

View File

@ -102,7 +102,7 @@ rust_library(
proc_macro_deps = [
"@raze__ctor__0_1_16//:ctor",
"@raze__indoc__1_0_3//:indoc",
"@raze__paste__1_0_3//:paste",
"@raze__paste__1_0_4//:paste",
"@raze__pyo3cls__0_12_4//:pyo3cls",
],
rustc_flags = [
@ -117,7 +117,7 @@ rust_library(
deps = [
":pyo3_build_script",
"@raze__cfg_if__1_0_0//:cfg_if",
"@raze__inventory__0_1_9//:inventory",
"@raze__inventory__0_1_10//:inventory",
"@raze__libc__0_2_81//:libc",
"@raze__parking_lot__0_11_1//:parking_lot",
"@raze__unindent__0_1_7//:unindent",

View File

@ -82,7 +82,7 @@ rust_library(
# buildifier: leave-alone
deps = [
"@raze__bytes__0_5_6//:bytes",
"@raze__http__0_2_1//:http",
"@raze__http__0_2_2//:http",
"@raze__hyper_timeout__0_3_1//:hyper_timeout",
"@raze__mime_guess__2_0_3//:mime_guess",
"@raze__serde__1_0_118//:serde",
@ -114,7 +114,7 @@ rust_library(
"@raze__percent_encoding__2_1_0//:percent_encoding",
"@raze__pin_project_lite__0_1_11//:pin_project_lite",
"@raze__rustls__0_18_1//:rustls",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
"@raze__tokio_rustls__0_14_1//:tokio_rustls",
"@raze__tokio_socks__0_3_0//:tokio_socks",
"@raze__tokio_tls__0_3_1//:tokio_tls",

View File

@ -50,7 +50,7 @@ rust_library(
version = "4.3.0",
# buildifier: leave-alone
deps = [
"@raze__arc_swap__0_4_7//:arc_swap",
"@raze__arc_swap__0_4_8//:arc_swap",
"@raze__lazy_static__1_4_0//:lazy_static",
"@raze__slog__2_7_0//:slog",
],

View File

@ -66,7 +66,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "0.2.23",
version = "0.2.24",
# buildifier: leave-alone
deps = [
"@raze__bytes__0_5_6//:bytes",

View File

@ -49,6 +49,6 @@ rust_library(
# buildifier: leave-alone
deps = [
"@raze__bytes__0_5_6//:bytes",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
],
)

View File

@ -50,7 +50,7 @@ rust_library(
deps = [
"@raze__futures_core__0_3_8//:futures_core",
"@raze__rustls__0_18_1//:rustls",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
"@raze__webpki__0_21_4//:webpki",
],
)

View File

@ -56,7 +56,7 @@ rust_library(
"@raze__either__1_6_1//:either",
"@raze__futures__0_3_8//:futures",
"@raze__thiserror__1_0_22//:thiserror",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
],
)

View File

@ -55,7 +55,7 @@ rust_library(
# buildifier: leave-alone
deps = [
"@raze__native_tls__0_2_6//:native_tls",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
] + selects.with_or({
# cfg(all(not(target_os = "macos"), not(windows), not(target_os = "ios")))
(

View File

@ -55,7 +55,7 @@ rust_library(
"@raze__futures_sink__0_3_8//:futures_sink",
"@raze__log__0_4_11//:log",
"@raze__pin_project_lite__0_1_11//:pin_project_lite",
"@raze__tokio__0_2_23//:tokio",
"@raze__tokio__0_2_24//:tokio",
],
)

View File

@ -45,7 +45,7 @@ rust_library(
"cargo-raze",
"manual",
],
version = "0.2.10",
version = "0.2.11",
# buildifier: leave-alone
deps = [
],

View File

@ -41,7 +41,7 @@ intl-memoizer = "0.5"
#intl-memoizer = { git = "https://github.com/ankitects/fluent-rs.git", branch="32bit-panic" }
itertools = "0.9.0"
lazy_static = "1.4.0"
nom = "5.1.2"
nom = "6.0.1"
num_enum = "0.5.0"
num-format = "0.4.0"
num-integer = "0.1.43"

View File

@ -167,7 +167,7 @@ alias(
alias(
name = "nom",
actual = "@raze__nom__5_1_2//:nom",
actual = "@raze__nom__6_0_1//:nom",
tags = [
"cargo-raze",
"manual",
@ -392,7 +392,7 @@ alias(
alias(
name = "tokio",
actual = "@raze__tokio__0_2_23//:tokio",
actual = "@raze__tokio__0_2_24//:tokio",
tags = [
"cargo-raze",
"manual",

View File

@ -12,6 +12,7 @@ use nom::{
bytes::complete::{escaped, is_not, tag},
character::complete::{anychar, char, none_of, one_of},
combinator::{all_consuming, map, map_res, verify},
error::{Error, ErrorKind},
sequence::{delimited, preceded, separated_pair},
{multi::many0, IResult},
};
@ -32,8 +33,8 @@ impl From<num::ParseFloatError> for ParseError {
}
}
impl<I> From<nom::Err<(I, nom::error::ErrorKind)>> for ParseError {
fn from(_: nom::Err<(I, nom::error::ErrorKind)>) -> Self {
impl<I> From<nom::Err<(I, ErrorKind)>> for ParseError {
fn from(_: nom::Err<(I, ErrorKind)>) -> Self {
ParseError {}
}
}
@ -149,7 +150,7 @@ fn group_inner(input: &str) -> IResult<&str, Vec<Node>> {
// before adding the node, if the length is even then the node
// must not be a boolean
if matches!(node, Node::And | Node::Or) {
return Err(nom::Err::Failure(("", nom::error::ErrorKind::NoneOf)));
return Err(nom::Err::Failure(Error::new("", ErrorKind::NoneOf)));
}
} else {
// if the length is odd, the next item must be a boolean. if it's
@ -168,10 +169,10 @@ fn group_inner(input: &str) -> IResult<&str, Vec<Node>> {
}
if nodes.is_empty() {
Err(nom::Err::Error((remaining, nom::error::ErrorKind::Many1)))
Err(nom::Err::Error(Error::new(remaining, ErrorKind::Many1)))
} else if matches!(nodes.last().unwrap(), Node::And | Node::Or) {
// no trailing and/or
Err(nom::Err::Failure(("", nom::error::ErrorKind::NoneOf)))
Err(nom::Err::Failure(Error::new("", ErrorKind::NoneOf)))
} else {
// chomp any trailing whitespace
let (remaining, _) = whitespace0(remaining)?;