Merge pull request #130 from czocher/syn2

Migrate to `syn` version `2.0`
1Password · Feb 14, 2024 · 3f7527a · 3f7527a
2 parents c3ee2ad + 558c1fb
commit 3f7527a
Show file tree

Hide file tree

Showing 10 changed files with 253 additions and 292 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -54,7 +54,7 @@ fn strip_configuration_attribute(item: &mut DeriveInput) {
     fn remove_configuration_from_attributes(attributes: &mut Vec<Attribute>) {
         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
@@ -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
@@ -10,8 +10,8 @@ repository = "https://github.com/1Password/typeshare"
 [dependencies]
 proc-macro2 = "1"
 quote = "1"
-syn = { version = "1.0", features = ["full"] }
-thiserror = "1"
+syn = { version = "2.0.18", features = ["full"] }
+thiserror = "1.0.40"
 itertools = "0.10"
 lazy_format = "1.8"
 joinery = "2"

diff --git a/core/src/language/kotlin.rs b/core/src/language/kotlin.rs
@@ -1,8 +1,8 @@
 use super::Language;
 use crate::language::SupportedLanguage;
+use crate::parser::remove_dash_from_identifier;
 use crate::rust_types::{RustTypeFormatError, SpecialRustType};
 use crate::{
-    parser::remove_dash_from_identifier,
     rename::RenameExt,
     rust_types::{RustEnum, RustEnumVariant, RustField, RustStruct, RustTypeAlias},
 };

diff --git a/core/src/language/scala.rs b/core/src/language/scala.rs
@@ -1,11 +1,8 @@
 use super::Language;
 use crate::language::SupportedLanguage;
-use crate::parser::ParsedData;
+use crate::parser::{remove_dash_from_identifier, ParsedData};
+use crate::rust_types::{RustEnum, RustEnumVariant, RustField, RustStruct, RustTypeAlias};
 use crate::rust_types::{RustType, RustTypeFormatError, SpecialRustType};
-use crate::{
-    parser::remove_dash_from_identifier,
-    rust_types::{RustEnum, RustEnumVariant, RustField, RustStruct, RustTypeAlias},
-};
 use itertools::Itertools;
 use joinery::JoinableIterator;
 use lazy_format::lazy_format;

diff --git a/core/src/language/swift.rs b/core/src/language/swift.rs
@@ -1,7 +1,7 @@
+use crate::parser::remove_dash_from_identifier;
 use crate::rust_types::{RustTypeFormatError, SpecialRustType};
 use crate::{
     language::{Language, SupportedLanguage},
-    parser::remove_dash_from_identifier,
     rename::RenameExt,
     rust_types::{RustEnum, RustEnumVariant, RustStruct, RustTypeAlias},
 };