Skip to content

Commit

Permalink
Merge of #7189
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Jul 12, 2023
2 parents 5be9262 + 2b36f91 commit ac694bf
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 11 deletions.
24 changes: 18 additions & 6 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2428,7 +2428,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
dependencies = [
"regex-automata",
"regex-automata 0.1.10",
]

[[package]]
Expand Down Expand Up @@ -3608,13 +3608,14 @@ dependencies = [

[[package]]
name = "regex"
version = "1.8.4"
version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
dependencies = [
"aho-corasick 1.0.2",
"memchr",
"regex-syntax 0.7.2",
"regex-automata 0.3.2",
"regex-syntax 0.7.3",
]

[[package]]
Expand All @@ -3626,6 +3627,17 @@ dependencies = [
"regex-syntax 0.6.29",
]

[[package]]
name = "regex-automata"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "83d3daa6976cffb758ec878f108ba0e062a45b2d6ca3a2cca965338855476caf"
dependencies = [
"aho-corasick 1.0.2",
"memchr",
"regex-syntax 0.7.3",
]

[[package]]
name = "regex-syntax"
version = "0.6.29"
Expand All @@ -3634,9 +3646,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"

[[package]]
name = "regex-syntax"
version = "0.7.2"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
checksum = "2ab07dc67230e4a4718e70fd5c20055a4334b121f1f9db8fe63ef39ce9b8c846"

[[package]]
name = "reqwest"
Expand Down
2 changes: 1 addition & 1 deletion zebra-network/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ordered-map = "0.4.2"
pin-project = "1.1.2"
rand = "0.8.5"
rayon = "1.7.0"
regex = "1.8.4"
regex = "1.9.1"
serde = { version = "1.0.168", features = ["serde_derive"] }
tempfile = "3.5.0"
thiserror = "1.0.43"
Expand Down
2 changes: 1 addition & 1 deletion zebra-state/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ itertools = "0.11.0"
lazy_static = "1.4.0"
metrics = "0.21.1"
mset = "0.1.1"
regex = "1.8.4"
regex = "1.9.1"
rlimit = "0.10.0"
rocksdb = { version = "0.21.0", default-features = false, features = ["lz4"] }
semver = "1.0.17"
Expand Down
2 changes: 1 addition & 1 deletion zebra-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ insta = "1.30.0"
proptest = "1.2.0"
once_cell = "1.18.0"
rand = "0.8.5"
regex = "1.8.4"
regex = "1.9.1"

tokio = { version = "1.29.1", features = ["full", "tracing", "test-util"] }
tower = { version = "0.4.13", features = ["util"] }
Expand Down
2 changes: 1 addition & 1 deletion zebra-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ zebra-rpc = { path = "../zebra-rpc", version = "1.0.0-beta.27", optional = true
itertools = { version = "0.11.0", optional = true }

# These crates are needed for the search-issue-refs binary
regex = { version = "1.8.4", optional = true }
regex = { version = "1.9.1", optional = true }
reqwest = { version = "0.11.18", optional = true }

# These crates are needed for the zebra-checkpoints and search-issue-refs binaries
Expand Down
2 changes: 1 addition & 1 deletion zebrad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ abscissa_core = { version = "0.7.0", features = ["testing"] }
hex = "0.4.3"
jsonrpc-core = "18.0.0"
once_cell = "1.18.0"
regex = "1.8.4"
regex = "1.9.1"

# zebra-rpc needs the preserve_order feature, it also makes test results more stable
serde_json = { version = "1.0.100", features = ["preserve_order"] }
Expand Down

0 comments on commit ac694bf

Please sign in to comment.