diff --git a/Cargo.lock b/Cargo.lock index b2d2e3ce..983e52ae 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -80,7 +80,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -215,7 +215,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -236,7 +236,7 @@ dependencies = [ "serde_json", "serde_qs", "serde_urlencoded", - "thiserror", + "thiserror 1.0.61", "validator", ] @@ -387,7 +387,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -398,7 +398,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -861,7 +861,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -872,7 +872,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -1123,7 +1123,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -1847,7 +1847,7 @@ dependencies = [ "serde", "serde_json", "serial_test", - "thiserror", + "thiserror 1.0.61", "tokio", "tracing", "tracing-actix-web", @@ -1884,7 +1884,7 @@ dependencies = [ "rrule", "serde", "serde_json", - "thiserror", + "thiserror 1.0.61", "tracing", "ts-rs", "url", @@ -2053,7 +2053,7 @@ dependencies = [ "js-sys", "once_cell", "pin-project-lite", - "thiserror", + "thiserror 1.0.61", ] [[package]] @@ -2076,7 +2076,7 @@ dependencies = [ "reqwest 0.11.27", "rmp", "ryu", - "thiserror", + "thiserror 1.0.61", "url", ] @@ -2108,7 +2108,7 @@ dependencies = [ "opentelemetry_sdk", "prost", "reqwest 0.11.27", - "thiserror", + "thiserror 1.0.61", "tokio", "tonic", ] @@ -2148,7 +2148,7 @@ dependencies = [ "ordered-float", "percent-encoding", "rand", - "thiserror", + "thiserror 1.0.61", "tokio", "tokio-stream", ] @@ -2286,7 +2286,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.61", "ucd-trie", ] @@ -2310,7 +2310,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -2379,7 +2379,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -2459,9 +2459,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] @@ -2486,7 +2486,7 @@ dependencies = [ "itertools", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -2744,7 +2744,7 @@ dependencies = [ "lazy_static", "log", "regex", - "thiserror", + "thiserror 1.0.61", ] [[package]] @@ -2998,7 +2998,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -3022,7 +3022,7 @@ dependencies = [ "futures", "percent-encoding", "serde", - "thiserror", + "thiserror 1.0.61", ] [[package]] @@ -3249,7 +3249,7 @@ dependencies = [ "sha2", "smallvec", "sqlformat", - "thiserror", + "thiserror 1.0.61", "tokio", "tokio-stream", "tracing", @@ -3268,7 +3268,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -3291,7 +3291,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.68", + "syn 2.0.96", "tempfile", "tokio", "url", @@ -3335,7 +3335,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.61", "tracing", "uuid", "whoami", @@ -3375,7 +3375,7 @@ dependencies = [ "smallvec", "sqlx-core", "stringprep", - "thiserror", + "thiserror 1.0.61", "tracing", "uuid", "whoami", @@ -3441,9 +3441,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", @@ -3517,7 +3517,7 @@ checksum = "5999e24eaa32083191ba4e425deb75cdf25efefabe5aaccb7446dd0d4122a3f5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -3526,7 +3526,16 @@ version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.61", +] + +[[package]] +name = "thiserror" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", ] [[package]] @@ -3537,7 +3546,18 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", +] + +[[package]] +name = "thiserror-impl" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", ] [[package]] @@ -3661,7 +3681,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -3840,7 +3860,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -3931,25 +3951,27 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "ts-rs" -version = "10.0.0" -source = "git+https://github.com/Aleph-Alpha/ts-rs.git?rev=4aea173270f5de8490ec9bfd43d58fc0758089c0#4aea173270f5de8490ec9bfd43d58fc0758089c0" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e640d9b0964e9d39df633548591090ab92f7a4567bc31d3891af23471a3365c6" dependencies = [ "chrono", "lazy_static", "serde_json", - "thiserror", + "thiserror 2.0.11", "ts-rs-macros", "uuid", ] [[package]] name = "ts-rs-macros" -version = "10.0.0" -source = "git+https://github.com/Aleph-Alpha/ts-rs.git?rev=4aea173270f5de8490ec9bfd43d58fc0758089c0#4aea173270f5de8490ec9bfd43d58fc0758089c0" +version = "10.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e9d8656589772eeec2cf7a8264d9cda40fb28b9bc53118ceb9e8c07f8f38730" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", "termcolor", ] @@ -4064,7 +4086,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] @@ -4128,7 +4150,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", "wasm-bindgen-shared", ] @@ -4162,7 +4184,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -4446,7 +4468,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.96", ] [[package]] diff --git a/crates/api_structs/Cargo.toml b/crates/api_structs/Cargo.toml index 65822104..177e9d3f 100644 --- a/crates/api_structs/Cargo.toml +++ b/crates/api_structs/Cargo.toml @@ -17,9 +17,7 @@ validator = { version = "0.18", features = ["derive"] } chrono = { version = "0.4.19", features = ["serde"] } chrono-tz = { version = "0.8.1", features = ["serde"] } uuid = { version = "1.1.2", features = ["serde"] } -# TODO: Adapt this once a release is done with the JSON value changes -# https://github.com/Aleph-Alpha/ts-rs/pull/358 and https://github.com/Aleph-Alpha/ts-rs/pull/359 -ts-rs = { git = "https://github.com/Aleph-Alpha/ts-rs.git", rev = "4aea173270f5de8490ec9bfd43d58fc0758089c0", features = [ +ts-rs = { version = "10.1.0", features = [ "uuid-impl", "chrono-impl", "serde-json-impl", diff --git a/crates/domain/Cargo.toml b/crates/domain/Cargo.toml index fa388cfd..fc802d2d 100644 --- a/crates/domain/Cargo.toml +++ b/crates/domain/Cargo.toml @@ -24,9 +24,7 @@ thiserror = "1.0" itertools = "0.11.0" rand = "0.8.4" tracing = "0.1.25" -# TODO: Adapt this once a release is done with the JSON value changes -# https://github.com/Aleph-Alpha/ts-rs/pull/358 and https://github.com/Aleph-Alpha/ts-rs/pull/359 -ts-rs = { git = "https://github.com/Aleph-Alpha/ts-rs.git", rev = "4aea173270f5de8490ec9bfd43d58fc0758089c0", features = [ +ts-rs = { version = "10.1.0", features = [ "uuid-impl", "chrono-impl", "serde-json-impl",