diff --git a/Cargo.lock b/Cargo.lock index d4a694a..ae01bfc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -243,7 +243,7 @@ dependencies = [ [[package]] name = "dropshot" version = "0.7.1-dev" -source = "git+https://github.com/oxidecomputer/dropshot#2b8c3e3499ad960fedf5af334b08b7c96c469bd5" +source = "git+https://github.com/oxidecomputer/dropshot#53106a852b4936e3a4b5d54e9801f3dc58ba9238" dependencies = [ "async-stream", "async-trait", @@ -275,14 +275,14 @@ dependencies = [ "tokio-rustls", "toml", "usdt", - "uuid 0.8.2", + "uuid", "version_check", ] [[package]] name = "dropshot_endpoint" version = "0.7.1-dev" -source = "git+https://github.com/oxidecomputer/dropshot#2b8c3e3499ad960fedf5af334b08b7c96c469bd5" +source = "git+https://github.com/oxidecomputer/dropshot#53106a852b4936e3a4b5d54e9801f3dc58ba9238" dependencies = [ "proc-macro2", "quote", @@ -333,7 +333,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "uuid 1.0.0", + "uuid", ] [[package]] @@ -345,7 +345,7 @@ dependencies = [ "reqwest", "schemars", "serde", - "uuid 1.0.0", + "uuid", ] [[package]] @@ -1013,11 +1013,11 @@ checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "proc-macro2" -version = "1.0.38" +version = "1.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9027b48e9d4c9175fa2218adf3557f91c1137021739951d4932f5f8268ac48aa" +checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -1037,7 +1037,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "uuid 1.0.0", + "uuid", ] [[package]] @@ -1210,9 +1210,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.4" +version = "0.20.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbfeb8d0ddb84706bc597a5574ab8912817c52a397f819e5b614e2265206921" +checksum = "5aab8ee6c7097ed6057f43c187a62418d0c05a4bd5f18b3571db50ee0f9ce033" dependencies = [ "log", "ring", @@ -1262,23 +1262,23 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6b5a3c80cea1ab61f4260238409510e814e38b4b563c06044edf91e7dc070e3" +checksum = "1847b767a3d62d95cbf3d8a9f0e421cf57a0d8aa4f411d4b16525afb0284d4ed" dependencies = [ "chrono", "dyn-clone", "schemars_derive", "serde", "serde_json", - "uuid 0.8.2", + "uuid", ] [[package]] name = "schemars_derive" -version = "0.8.8" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ae4dce13e8614c46ac3c38ef1c0d668b101df6ac39817aebdaa26642ddae9b" +checksum = "af4d7e1b012cb3d9129567661a63755ea4b8a7386d339dc945ae187e403c6743" dependencies = [ "proc-macro2", "quote", @@ -1365,9 +1365,9 @@ dependencies = [ [[package]] name = "serde_derive_internals" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dbab34ca63057a1f15280bdf3c39f2b1eb1b54c17e98360e511637aef7418c6" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ "proc-macro2", "quote", @@ -1793,9 +1793,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "typify" -version = "0.0.6" +version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75e642ba5bfa5a7b2e085a700f5f5111b069a833156f82c53a365210e545258d" +checksum = "0fcda9918fb3098219b36e3deca897c3be450dd9bfdb8e7a43e12380e0054f6c" dependencies = [ "typify-impl", "typify-macro", @@ -1803,9 +1803,9 @@ dependencies = [ [[package]] name = "typify-impl" -version = "0.0.6" +version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b1b5a377f1e0dceb8a18b25c86c80b32d0882b01e1585fd520354a56b7c30c" +checksum = "8011d3c44c06af5930d7c9b0fbdc74a8ed4c4b5d35be07adc910a2679a4b9748" dependencies = [ "heck", "log", @@ -1821,9 +1821,9 @@ dependencies = [ [[package]] name = "typify-macro" -version = "0.0.6" +version = "0.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cad3517ce4190a7f108cd6360da245c7e289060003d077156f2da7dcf1f568" +checksum = "6804c9de8bccf2e4be79d54442b165d0134766d99529712e139460fdc3a9db66" dependencies = [ "proc-macro2", "quote", @@ -1847,6 +1847,12 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +[[package]] +name = "unicode-ident" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" + [[package]] name = "unicode-normalization" version = "0.1.19" @@ -1947,16 +1953,6 @@ dependencies = [ "usdt-impl", ] -[[package]] -name = "uuid" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" -dependencies = [ - "getrandom", - "serde", -] - [[package]] name = "uuid" version = "1.0.0" diff --git a/example-macro/Cargo.toml b/example-macro/Cargo.toml index 2d870f0..84f9ae8 100644 --- a/example-macro/Cargo.toml +++ b/example-macro/Cargo.toml @@ -8,6 +8,6 @@ edition = "2018" chrono = { version = "0.4", features = ["serde"] } progenitor = { path = "../progenitor" } reqwest = { version = "0.11", features = ["json", "stream"] } -schemars = "0.8" +schemars = { version = "0.8.10", features = ["uuid1"] } serde = { version = "1.0", features = ["derive"] } uuid = { version = "1.0", features = ["serde", "v4"] } diff --git a/progenitor-impl/Cargo.toml b/progenitor-impl/Cargo.toml index c976a7f..f7ed11d 100644 --- a/progenitor-impl/Cargo.toml +++ b/progenitor-impl/Cargo.toml @@ -15,16 +15,16 @@ proc-macro2 = "1.0" quote = "1.0" regex = "1.5" rustfmt-wrapper = "0.1" -schemars = { version = "0.8", features = ["chrono", "uuid"] } +schemars = { version = "0.8.10", features = ["chrono", "uuid1"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" syn = { version = "1.0", features = ["parsing"] } thiserror = "1.0" -typify = "0.0.6" +typify = "0.0.7" unicode-xid = "0.2" [dev-dependencies] -dropshot = { git = "https://github.com/oxidecomputer/dropshot" } +dropshot = { git = "https://github.com/oxidecomputer/dropshot", default-features = false } expectorate = "1.0" http = "0.2.6" hyper = "0.14.18" diff --git a/progenitor/Cargo.toml b/progenitor/Cargo.toml index e6d3804..3643cb4 100644 --- a/progenitor/Cargo.toml +++ b/progenitor/Cargo.toml @@ -21,5 +21,5 @@ chrono = { version = "0.4", features = ["serde"] } futures = "0.3.21" percent-encoding = "2.1" reqwest = { version = "0.11", features = ["json", "stream"] } -schemars = "0.8" +schemars = { version = "0.8.10", features = ["uuid1"] } uuid = { version = "1.0", features = ["serde", "v4"] }