ref(relay): Remove syn v1 dependency (#4354)

Fixes: #4308

Cargo.toml

@@ -172,10 +172,8 @@ sqlx = { version = "0.8.2", default-features = false }
 statsdproxy = { version = "0.2.0", default-features = false }
 symbolic-common = { version = "12.12.3", default-features = false }
 symbolic-unreal = { version = "12.12.3", default-features = false }
-syn = "1.0.109"
-syn2 = { package = "syn", version = "2.0.11" }
-synstructure = "0.12.6"
-synstructure2 = { package = "synstructure", version = "0.13.1" }
+syn = { version = "2.0.90" }
+synstructure = { version = "0.13.1" }
 # This dependency was added through git since we are experimenting with a fork of sysinfo which adds additional
 # capabilities of reading cgroups memory stats. Such stats are used in Relay to correctly determine memory usage.
 sysinfo = { git = "https://github.com/getsentry/sysinfo.git", rev = "e2e5d530600f96bdd79652c856918da23e5dd938" }

relay-event-derive/Cargo.toml

@@ -14,8 +14,8 @@ workspace = true
 
 [dependencies]
 quote = { workspace = true }
-syn2 = { workspace = true }
-synstructure2 = { workspace = true }
+syn = { workspace = true }
+synstructure = { workspace = true }
 proc-macro2 = { workspace = true }
 
 [lib]

relay-event-derive/src/lib.rs

@@ -12,8 +12,8 @@
 
 use proc_macro2::{Span, TokenStream};
 use quote::{quote, ToTokens};
-use syn2::{self as syn, Ident, Lit, LitBool, LitInt, LitStr};
-use synstructure2::{self as synstructure, decl_derive};
+use syn::{Ident, Lit, LitBool, LitInt, LitStr};
+use synstructure::decl_derive;
 
 mod utils;
 

relay-event-derive/src/utils.rs

@@ -1,7 +1,6 @@
 use proc_macro2::TokenStream;
 use quote::ToTokens;
-use syn2 as syn;
-use synstructure2::{Structure, VariantInfo};
+use synstructure::{Structure, VariantInfo};
 
 pub trait SynstructureExt {
     fn try_each_variant<F, R>(&self, f: F) -> syn::Result<TokenStream>

relay-ffi-macros/Cargo.toml

@@ -16,5 +16,5 @@ proc-macro = true
 workspace = true
 
 [dependencies]
-syn2 = { workspace = true, features = ["fold", "full"] }
+syn = { workspace = true, features = ["fold", "full"] }
 quote = { workspace = true }

relay-ffi-macros/src/lib.rs

@@ -11,19 +11,19 @@
 
 use proc_macro::TokenStream;
 use quote::ToTokens;
-use syn2::fold::Fold;
+use syn::fold::Fold;
 
 struct CatchUnwind;
 
 impl CatchUnwind {
     fn fold(&mut self, input: TokenStream) -> TokenStream {
-        let f = syn2::parse(input).expect("#[catch_unwind] can only be applied to functions");
+        let f = syn::parse(input).expect("#[catch_unwind] can only be applied to functions");
         self.fold_item_fn(f).to_token_stream().into()
     }
 }
 
 impl Fold for CatchUnwind {
-    fn fold_item_fn(&mut self, i: syn2::ItemFn) -> syn2::ItemFn {
+    fn fold_item_fn(&mut self, i: syn::ItemFn) -> syn::ItemFn {
         if i.sig.unsafety.is_none() {
             panic!("#[catch_unwind] requires `unsafe fn`");
         }
@@ -38,8 +38,8 @@ impl Fold for CatchUnwind {
             })
         }};
 
-        let block = Box::new(syn2::parse2(folded).unwrap());
-        syn2::ItemFn { block, ..i }
+        let block = Box::new(syn::parse2(folded).unwrap());
+        syn::ItemFn { block, ..i }
     }
 }
 

relay-protocol-derive/Cargo.toml

@@ -14,8 +14,8 @@ workspace = true
 
 [dependencies]
 quote = { workspace = true }
-syn2 = { workspace = true }
-synstructure2 = { workspace = true }
+syn = { workspace = true }
+synstructure = { workspace = true }
 proc-macro2 = { workspace = true }
 
 [lib]

relay-protocol-derive/src/lib.rs

@@ -10,9 +10,9 @@ use std::str::FromStr;
 
 use proc_macro2::{Span, TokenStream};
 use quote::{quote, ToTokens};
-use syn2::spanned::Spanned;
-use syn2::{self as syn, Data, Error, Lit, LitStr};
-use synstructure2::{self as synstructure, decl_derive};
+use syn::spanned::Spanned;
+use syn::{Data, Error, Lit, LitStr};
+use synstructure::decl_derive;
 
 mod utils;
 

relay-protocol-derive/src/utils.rs

@@ -1,7 +1,6 @@
 use proc_macro2::TokenStream;
 use quote::ToTokens;
-use syn2 as syn;
-use synstructure2::{Structure, VariantInfo};
+use synstructure::{Structure, VariantInfo};
 
 pub trait SynstructureExt {
     fn try_each_variant<F, R>(&self, f: F) -> syn::Result<TokenStream>

tools/document-metrics/Cargo.toml

@@ -14,7 +14,7 @@ clap = { workspace = true, features = ["derive"] }
 serde = { workspace = true }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
-syn2 = { workspace = true, features = ["full"] }
+syn = { workspace = true, features = ["full"] }
 
 [dev-dependencies]
 insta = { workspace = true }

tools/document-metrics/src/main.rs

@@ -11,7 +11,7 @@ use std::path::PathBuf;
 use anyhow::{Context, Result};
 use clap::{Parser, ValueEnum};
 use serde::Serialize;
-use syn2::{self as syn, Expr, Lit, LitStr};
+use syn::{Expr, Lit, LitStr};
 
 #[derive(Clone, Copy, Debug, ValueEnum)]
 enum SchemaFormat {

tools/document-pii/Cargo.toml

@@ -16,7 +16,7 @@ proc-macro2 = { workspace = true }
 quote = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-syn2 = { workspace = true, features = ["visit", "full", "extra-traits"] }
+syn = { workspace = true, features = ["visit", "full", "extra-traits"] }
 walkdir = { workspace = true }
 
 [dev-dependencies]

tools/document-pii/src/item_collector.rs

@@ -8,9 +8,9 @@ use std::io::BufRead;
 use std::path::{Path, PathBuf};
 
 use anyhow::anyhow;
-use syn2::punctuated::Punctuated;
-use syn2::visit::Visit;
-use syn2::{ItemEnum, ItemStruct, UseTree};
+use syn::punctuated::Punctuated;
+use syn::visit::Visit;
+use syn::{ItemEnum, ItemStruct, UseTree};
 
 use crate::pii_finder::{FieldsWithAttribute, PiiFinder};
 use crate::EnumOrStruct;
@@ -113,9 +113,9 @@ impl AstItemCollector {
         for path in paths {
             self.module_path = module_name_from_file(path)?;
 
-            let syntax_tree: syn2::File = {
+            let syntax_tree: syn::File = {
                 let file_content = fs::read_to_string(path.as_path())?;
-                syn2::parse_file(&file_content)?
+                syn::parse_file(&file_content)?
             };
 
             self.visit_file(&syntax_tree);
@@ -139,7 +139,7 @@ impl<'ast> Visit<'ast> for AstItemCollector {
             .insert(enum_name, EnumOrStruct::Enum(node.clone()));
     }
 
-    fn visit_item_use(&mut self, i: &'ast syn2::ItemUse) {
+    fn visit_item_use(&mut self, i: &'ast syn::ItemUse) {
         let use_statements = usetree_to_paths(&i.tree, &self.module_path)
             .iter()
             .filter(|s| s.contains("relay"))
@@ -171,7 +171,7 @@ fn normalize_type_path(mut path: String, crate_root: &str, module_path: &str) ->
 fn usetree_to_paths(use_tree: &UseTree, module_path: &str) -> Vec<String> {
     let crate_root = module_path.split_once("::").map_or(module_path, |s| s.0);
     let paths = flatten_use_tree(
-        syn2::Path {
+        syn::Path {
             leading_colon: None,
             segments: Punctuated::new(),
         },
@@ -188,7 +188,7 @@ fn usetree_to_paths(use_tree: &UseTree, module_path: &str) -> Vec<String> {
 ///
 /// For example: `use protocol::{Foo, Bar, Baz}` into `[protocol::Foo, protocol::Bar,
 /// protocol::Baz]`.
-fn flatten_use_tree(mut leading_path: syn2::Path, use_tree: &UseTree) -> Vec<String> {
+fn flatten_use_tree(mut leading_path: syn::Path, use_tree: &UseTree) -> Vec<String> {
     match use_tree {
         UseTree::Path(use_path) => {
             leading_path.segments.push(use_path.ident.clone().into());

tools/document-pii/src/main.rs

@@ -9,8 +9,7 @@ use std::path::PathBuf;
 
 use clap::{command, Parser};
 use serde::Serialize;
-use syn2::ItemEnum;
-use syn2::ItemStruct;
+use syn::{ItemEnum, ItemStruct};
 use walkdir::WalkDir;
 
 use crate::item_collector::AstItemCollector;

tools/document-pii/src/pii_finder.rs

@@ -8,8 +8,8 @@ use std::collections::{BTreeMap, BTreeSet, HashMap};
 
 use anyhow::anyhow;
 use proc_macro2::TokenTree;
-use syn2::visit::Visit;
-use syn2::{Attribute, Field, ItemEnum, ItemStruct, Meta, Path, Type, TypePath};
+use syn::visit::Visit;
+use syn::{Attribute, Field, ItemEnum, ItemStruct, Meta, Path, Type, TypePath};
 
 use crate::EnumOrStruct;
 
@@ -236,9 +236,9 @@ fn get_field_types(path: &Path, segments: &mut BTreeSet<String>) {
         let mut ident = first_segment.ident.to_string();
 
         // Recursion on AngleBracketed args is necessary for nested generic types
-        if let syn2::PathArguments::AngleBracketed(angle_bracketed) = &first_segment.arguments {
+        if let syn::PathArguments::AngleBracketed(angle_bracketed) = &first_segment.arguments {
             for generic_arg in angle_bracketed.args.iter() {
-                if let syn2::GenericArgument::Type(Type::Path(path)) = generic_arg {
+                if let syn::GenericArgument::Type(Type::Path(path)) = generic_arg {
                     get_field_types(&path.path, segments);
                 }
             }