From 4e93146559b271047d19f48a9f41c537a2eec48f Mon Sep 17 00:00:00 2001 From: Adam Chalmers Date: Thu, 14 Sep 2023 15:05:07 -0600 Subject: [PATCH] Remove old deps (#529) Updates chrono to remove time 0.1 Updates openapitor to remove clap 3 --- src/wasm-lib/Cargo.lock | 180 ++++++++++------------------ src/wasm-lib/derive-docs/Cargo.toml | 2 +- 2 files changed, 66 insertions(+), 116 deletions(-) diff --git a/src/wasm-lib/Cargo.lock b/src/wasm-lib/Cargo.lock index 235bdfbf8..14f6dc015 100644 --- a/src/wasm-lib/Cargo.lock +++ b/src/wasm-lib/Cargo.lock @@ -306,7 +306,7 @@ dependencies = [ "serde", "serde_bytes", "serde_json", - "time 0.3.27", + "time", "uuid", ] @@ -363,18 +363,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" dependencies = [ "android-tzdata", "iana-time-zone", - "js-sys", "num-traits", "serde", - "time 0.1.45", - "wasm-bindgen", - "winapi", + "windows-targets 0.48.5", ] [[package]] @@ -388,24 +385,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive 3.2.25", - "clap_lex 0.2.4", - "indexmap 1.9.3", - "once_cell", - "strsim", - "termcolor", - "textwrap", - "unicase", -] - [[package]] name = "clap" version = "4.4.3" @@ -413,7 +392,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" dependencies = [ "clap_builder", - "clap_derive 4.4.2", + "clap_derive", ] [[package]] @@ -424,25 +403,13 @@ checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" dependencies = [ "anstream", "anstyle", - "clap_lex 0.5.1", + "clap_lex", "strsim", + "terminal_size", "unicase", "unicode-width", ] -[[package]] -name = "clap_derive" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "clap_derive" version = "4.4.2" @@ -455,15 +422,6 @@ dependencies = [ "syn 2.0.33", ] -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - [[package]] name = "clap_lex" version = "0.5.1" @@ -985,7 +943,7 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "wasm-bindgen", ] @@ -1244,7 +1202,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", - "serde", ] [[package]] @@ -1255,6 +1212,7 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" dependencies = [ "equivalent", "hashbrown 0.14.0", + "serde", ] [[package]] @@ -1269,6 +1227,17 @@ dependencies = [ "web-sys", ] +[[package]] +name = "io-lifetimes" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" +dependencies = [ + "hermit-abi 0.3.2", + "libc", + "windows-sys 0.48.0", +] + [[package]] name = "ipnet" version = "2.8.0" @@ -1282,7 +1251,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.2", - "rustix", + "rustix 0.38.9", "windows-sys 0.48.0", ] @@ -1345,7 +1314,7 @@ version = "0.1.26" dependencies = [ "anyhow", "bson", - "clap 4.4.3", + "clap", "dashmap", "derive-docs 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "expectorate", @@ -1393,7 +1362,7 @@ dependencies = [ "rand", "reqwest", "reqwest-conditional-middleware", - "reqwest-middleware 0.2.3", + "reqwest-middleware", "reqwest-retry", "reqwest-tracing", "schemars", @@ -1447,6 +1416,12 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" +[[package]] +name = "linux-raw-sys" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" + [[package]] name = "linux-raw-sys" version = "0.4.5" @@ -1554,7 +1529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -1675,22 +1650,22 @@ checksum = "44d11de466f4a3006fe8a5e7ec84e93b79c70cb992ae0aa0eb631ad2df8abfe2" [[package]] name = "openapitor" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "120168eae5b6485690af708bd1030547df62cca10a643763d416ab0e6831decb" +version = "0.0.9" +source = "git+https://github.com/KittyCAD/kittycad.rs?branch=main#3d74c1dfb41146a268a644e9fde2c19a8cd66895" dependencies = [ "Inflector", "anyhow", "chrono", - "clap 3.2.25", + "clap", "data-encoding", "format_serde_error", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.0.0", "json-patch", "log", "numeral", + "once_cell", "openapiv3", "phonenumber", "proc-macro2", @@ -1698,7 +1673,7 @@ dependencies = [ "rand", "regex", "reqwest", - "reqwest-middleware 0.1.6", + "reqwest-middleware", "rustfmt-wrapper", "schemars", "serde", @@ -1711,18 +1686,17 @@ dependencies = [ "slog-stdlog", "slog-term", "thiserror", - "tokio", "url", "uuid", ] [[package]] name = "openapiv3" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b1a9f106eb0a780abd17ba9fca8e0843e3461630bcbe2af0ad4d5d3ba4e9aa4" +checksum = "75e56d5c441965b6425165b7e3223cc933ca469834f4a8b4786817a1f9dc4f13" dependencies = [ - "indexmap 1.9.3", + "indexmap 2.0.0", "serde", "serde_json", ] @@ -1752,12 +1726,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - [[package]] name = "parking_lot" version = "0.11.2" @@ -2183,26 +2151,10 @@ checksum = "59e50a2e70970896c99d1b8f20ddc30a70b30d3ac6e619a03a8353b64a49b277" dependencies = [ "async-trait", "reqwest", - "reqwest-middleware 0.2.3", + "reqwest-middleware", "task-local-extensions", ] -[[package]] -name = "reqwest-middleware" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69539cea4148dce683bec9dc95be3f0397a9bb2c248a49c8296a9d21659a8cdd" -dependencies = [ - "anyhow", - "async-trait", - "futures", - "http", - "reqwest", - "serde", - "task-local-extensions", - "thiserror", -] - [[package]] name = "reqwest-middleware" version = "0.2.3" @@ -2233,7 +2185,7 @@ dependencies = [ "hyper", "parking_lot 0.11.2", "reqwest", - "reqwest-middleware 0.2.3", + "reqwest-middleware", "retry-policies", "task-local-extensions", "tokio", @@ -2253,7 +2205,7 @@ dependencies = [ "matchit", "opentelemetry", "reqwest", - "reqwest-middleware 0.2.3", + "reqwest-middleware", "task-local-extensions", "tracing", "tracing-opentelemetry", @@ -2310,6 +2262,20 @@ dependencies = [ "toolchain_find", ] +[[package]] +name = "rustix" +version = "0.37.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +dependencies = [ + "bitflags 1.3.2", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys 0.3.8", + "windows-sys 0.48.0", +] + [[package]] name = "rustix" version = "0.38.9" @@ -2319,7 +2285,7 @@ dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.5", "windows-sys 0.48.0", ] @@ -2677,7 +2643,7 @@ dependencies = [ "serde", "serde_json", "slog", - "time 0.3.27", + "time", ] [[package]] @@ -2712,7 +2678,7 @@ dependencies = [ "slog", "term", "thread_local", - "time 0.3.27", + "time", ] [[package]] @@ -2837,7 +2803,7 @@ dependencies = [ "cfg-if", "fastrand", "redox_syscall 0.3.5", - "rustix", + "rustix 0.38.9", "windows-sys 0.48.0", ] @@ -2862,12 +2828,13 @@ dependencies = [ ] [[package]] -name = "textwrap" -version = "0.16.0" +name = "terminal_size" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "unicode-width", + "rustix 0.37.23", + "windows-sys 0.48.0", ] [[package]] @@ -2911,17 +2878,6 @@ dependencies = [ "weezl", ] -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - [[package]] name = "time" version = "0.3.27" @@ -3400,12 +3356,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" diff --git a/src/wasm-lib/derive-docs/Cargo.toml b/src/wasm-lib/derive-docs/Cargo.toml index 46259b62a..2797b8c33 100644 --- a/src/wasm-lib/derive-docs/Cargo.toml +++ b/src/wasm-lib/derive-docs/Cargo.toml @@ -20,5 +20,5 @@ syn = { version = "2.0.33", features = ["full"] } [dev-dependencies] expectorate = "1.0.7" -openapitor = "0.0.5" +openapitor = { git = "https://github.com/KittyCAD/kittycad.rs", branch = "main" } pretty_assertions = "1.4.0"