diff --git a/Cargo.lock b/Cargo.lock index 3d5de458..e526df3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -482,22 +482,22 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.145" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.145" +version = "1.0.164" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" dependencies = [ "proc-macro2", "quote", - "syn 1.0.100", + "syn", ] [[package]] @@ -517,17 +517,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "syn" -version = "1.0.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52205623b1b0f064a4e71182c3b18ae902267282930c6d5462c91b859668426e" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - [[package]] name = "syn" version = "2.0.18" @@ -556,22 +545,22 @@ checksum = "949517c0cf1bf4ee812e2e07e08ab448e3ae0d23472aee8a06c985f0c8815b16" [[package]] name = "thiserror" -version = "1.0.35" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c53f98874615aea268107765aa1ed8f6116782501d18e53d08b471733bea6c85" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.35" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8b463991b4eab2d801e724172285ec4195c650e8ec79b149e6c2a8e6dd3f783" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.100", + "syn", ] [[package]] @@ -607,7 +596,7 @@ name = "typeshare-annotation" version = "1.0.2" dependencies = [ "quote", - "syn 1.0.100", + "syn", ] [[package]] @@ -636,7 +625,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.18", + "syn", "thiserror", ] @@ -659,9 +648,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -669,24 +658,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.100", + "syn", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -694,22 +683,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 1.0.100", + "syn", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "winapi" diff --git a/annotation/Cargo.toml b/annotation/Cargo.toml index cad2d2d3..cf30a27a 100644 --- a/annotation/Cargo.toml +++ b/annotation/Cargo.toml @@ -11,5 +11,5 @@ repository = "https://github.com/1Password/typeshare" proc-macro = true [dependencies] -syn = { version = "1.0", features = ["parsing", "proc-macro"] } +syn = { version = "2.0.18", features = ["parsing", "proc-macro"] } quote = "1.0" diff --git a/annotation/src/lib.rs b/annotation/src/lib.rs index 996b50d8..71d9a0d5 100644 --- a/annotation/src/lib.rs +++ b/annotation/src/lib.rs @@ -54,7 +54,7 @@ fn strip_configuration_attribute(item: &mut DeriveInput) { fn remove_configuration_from_attributes(attributes: &mut Vec) { const CONFIG_ATTRIBUTE_NAME: &str = "typeshare"; - attributes.retain(|x| x.path.to_token_stream().to_string() != CONFIG_ATTRIBUTE_NAME); + attributes.retain(|x| x.path().to_token_stream().to_string() != CONFIG_ATTRIBUTE_NAME); } fn remove_configuration_from_fields(fields: &mut Fields) { diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 1b41b11a..68dbf8ca 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -21,6 +21,6 @@ clap_complete_command = "0.3" ignore = "0.4" once_cell = "1" rayon = "1.5" -serde = { version = "1.0", features = ["derive"] } +serde = { version = "1.0.164", features = ["derive"] } toml = "0.5" typeshare-core = { path = "../core", version = "1.7.0" } diff --git a/core/Cargo.toml b/core/Cargo.toml index f64606f6..ad2a3677 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -11,7 +11,7 @@ repository = "https://github.com/1Password/typeshare" proc-macro2 = "1" quote = "1" syn = { version = "2.0.18", features = ["full"] } -thiserror = "1" +thiserror = "1.0.40" itertools = "0.10" lazy_format = "1.8" joinery = "2" diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 425afa89..085f5934 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -10,6 +10,6 @@ repository = "https://github.com/1Password/typeshare" [dependencies] chrono = { version = "0.4", default-features = false, features = ["clock", "std", "wasmbind"] } -serde = { version = "1", features = ["derive"] } +serde = { version = "1.0.164", features = ["derive"] } serde_json = "1" typeshare-annotation = { path = "../annotation", version = "1.0.0" }