diff --git a/Cargo.lock b/Cargo.lock index 2df98809a1c..ab505a0434a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4345,7 +4345,7 @@ dependencies = [ "omicron-passwords 0.1.0", "omicron-rpaths", "omicron-workspace-hack", - "parse-display", + "parse-display 0.8.2", "pq-sys", "rand 0.8.5", "ref-cast", @@ -4495,7 +4495,7 @@ dependencies = [ "oximeter-client", "oximeter-collector", "oximeter-producer 0.1.0", - "parse-display", + "parse-display 0.8.2", "serde", "serde_json", "serde_urlencoded", @@ -4533,7 +4533,7 @@ dependencies = [ "openssl", "openssl-probe", "openssl-sys", - "parse-display", + "parse-display 0.8.2", "schemars", "serde", "serde_json", @@ -4865,7 +4865,7 @@ dependencies = [ "libc", "macaddr", "omicron-workspace-hack", - "parse-display", + "parse-display 0.8.2", "progenitor", "proptest", "rand 0.8.5", @@ -4909,7 +4909,7 @@ dependencies = [ "ipnetwork", "lazy_static", "macaddr", - "parse-display", + "parse-display 0.7.0", "progenitor", "rand 0.8.5", "reqwest", @@ -5094,7 +5094,7 @@ dependencies = [ "oximeter-db", "oximeter-instruments", "oximeter-producer 0.1.0", - "parse-display", + "parse-display 0.8.2", "paste", "pem 1.1.1", "petgraph", @@ -5440,6 +5440,7 @@ dependencies = [ "rand_chacha 0.3.1", "regex", "regex-automata 0.4.3", + "regex-syntax 0.6.29", "regex-syntax 0.8.2", "reqwest", "ring 0.16.20", @@ -5987,7 +5988,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac6b32f6c8212838b74c0f5ba412194e88897923020810d9bec72d3594c2588d" dependencies = [ "once_cell", - "parse-display-derive", + "parse-display-derive 0.7.0", + "regex", +] + +[[package]] +name = "parse-display" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6509d08722b53e8dafe97f2027b22ccbe3a5db83cb352931e9716b0aa44bc5c" +dependencies = [ + "once_cell", + "parse-display-derive 0.8.2", "regex", ] @@ -6002,10 +6014,25 @@ dependencies = [ "quote", "regex", "regex-syntax 0.6.29", - "structmeta", + "structmeta 0.1.6", "syn 1.0.109", ] +[[package]] +name = "parse-display-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68517892c8daf78da08c0db777fcc17e07f2f63ef70041718f8a7630ad84f341" +dependencies = [ + "once_cell", + "proc-macro2", + "quote", + "regex", + "regex-syntax 0.7.5", + "structmeta 0.2.0", + "syn 2.0.32", +] + [[package]] name = "partial-io" version = "0.5.4" @@ -8547,10 +8574,22 @@ checksum = "104842d6278bf64aa9d2f182ba4bde31e8aec7a131d29b7f444bb9b344a09e2a" dependencies = [ "proc-macro2", "quote", - "structmeta-derive", + "structmeta-derive 0.1.6", "syn 1.0.109", ] +[[package]] +name = "structmeta" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ad9e09554f0456d67a69c1584c9798ba733a5b50349a6c0d0948710523922d" +dependencies = [ + "proc-macro2", + "quote", + "structmeta-derive 0.2.0", + "syn 2.0.32", +] + [[package]] name = "structmeta-derive" version = "0.1.6" @@ -8562,6 +8601,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "structmeta-derive" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a60bcaff7397072dca0017d1db428e30d5002e00b6847703e2e42005c95fbe00" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "structopt" version = "0.3.26" @@ -8794,7 +8844,7 @@ checksum = "62d6408d1406657be2f9d1701fbae379331d30d2f6e92050710edb0d34eeb480" dependencies = [ "proc-macro2", "quote", - "structmeta", + "structmeta 0.1.6", "syn 1.0.109", ] diff --git a/Cargo.toml b/Cargo.toml index 999fc680a56..849031cf683 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -271,7 +271,7 @@ oximeter-instruments = { path = "oximeter/instruments" } oximeter-macro-impl = { path = "oximeter/oximeter-macro-impl" } oximeter-producer = { path = "oximeter/producer" } p256 = "0.13" -parse-display = "0.7.0" +parse-display = "0.8.2" partial-io = { version = "0.5.4", features = ["proptest1", "tokio1"] } paste = "1.0.14" percent-encoding = "2.3.0" diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml index 72854ed29ad..9158eafb91d 100644 --- a/workspace-hack/Cargo.toml +++ b/workspace-hack/Cargo.toml @@ -73,7 +73,7 @@ rand = { version = "0.8.5", features = ["min_const_gen", "small_rng"] } rand_chacha = { version = "0.3.1" } regex = { version = "1.10.2" } regex-automata = { version = "0.4.3", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] } -regex-syntax = { version = "0.8.2" } +regex-syntax-c38e5c1d305a1b54 = { package = "regex-syntax", version = "0.8.2" } reqwest = { version = "0.11.20", features = ["blocking", "json", "rustls-tls", "stream"] } ring = { version = "0.16.20", features = ["std"] } schemars = { version = "0.8.13", features = ["bytes", "chrono", "uuid1"] } @@ -165,7 +165,8 @@ rand = { version = "0.8.5", features = ["min_const_gen", "small_rng"] } rand_chacha = { version = "0.3.1" } regex = { version = "1.10.2" } regex-automata = { version = "0.4.3", default-features = false, features = ["dfa-onepass", "hybrid", "meta", "nfa-backtrack", "perf-inline", "perf-literal", "unicode"] } -regex-syntax = { version = "0.8.2" } +regex-syntax-3b31131e45eafb45 = { package = "regex-syntax", version = "0.6.29" } +regex-syntax-c38e5c1d305a1b54 = { package = "regex-syntax", version = "0.8.2" } reqwest = { version = "0.11.20", features = ["blocking", "json", "rustls-tls", "stream"] } ring = { version = "0.16.20", features = ["std"] } schemars = { version = "0.8.13", features = ["bytes", "chrono", "uuid1"] }