diff --git a/Cargo.lock b/Cargo.lock
index 9326006959b..ba93a5ed681 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -210,7 +210,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -221,7 +221,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -332,7 +332,7 @@ checksum = "57d123550fa8d071b7255cb0cc04dc302baa6c8c4a79f55701552684d8399bce"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -440,7 +440,7 @@ dependencies = [
"regex",
"rustc-hash",
"shlex",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -706,7 +706,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -963,7 +963,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -986,7 +986,7 @@ dependencies = [
"ident_case",
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -997,7 +997,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
dependencies = [
"darling_core",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -1046,7 +1046,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustc_version",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -1082,7 +1082,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -1095,7 +1095,7 @@ dependencies = [
"serde",
"serde_json",
"serde_yaml",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -1110,7 +1110,7 @@ dependencies = [
"quote",
"serde",
"serde_json",
- "syn 2.0.90",
+ "syn",
"walkdir",
]
@@ -1201,7 +1201,7 @@ dependencies = [
"heck",
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -1222,7 +1222,7 @@ dependencies = [
"darling",
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -1441,7 +1441,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -1990,7 +1990,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -2612,7 +2612,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -2684,7 +2684,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -2731,7 +2731,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -2920,7 +2920,7 @@ dependencies = [
"pest_meta",
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -2960,7 +2960,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -3064,7 +3064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
dependencies = [
"proc-macro2",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -3139,7 +3139,7 @@ dependencies = [
"itertools 0.13.0",
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -3546,7 +3546,7 @@ version = "24.11.1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
"synstructure",
]
@@ -3620,7 +3620,7 @@ name = "relay-ffi-macros"
version = "24.11.1"
dependencies = [
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -3807,7 +3807,7 @@ version = "24.11.1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
"synstructure",
]
@@ -4283,7 +4283,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -4502,7 +4502,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -4681,7 +4681,7 @@ checksum = "0eb01866308440fc64d6c44d9e86c5cc17adfe33c4d6eed55da9145044d0ffc1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -4741,7 +4741,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -4806,7 +4806,7 @@ dependencies = [
"quote",
"sqlx-core",
"sqlx-macros-core",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -4827,7 +4827,7 @@ dependencies = [
"sha2",
"sqlx-core",
"sqlx-sqlite",
- "syn 2.0.90",
+ "syn",
"tempfile",
"tokio",
"url",
@@ -5023,17 +5023,6 @@ dependencies = [
"time",
]
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
[[package]]
name = "syn"
version = "2.0.90"
@@ -5068,7 +5057,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -5146,7 +5135,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -5270,7 +5259,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -5455,7 +5444,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -5758,7 +5747,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
"wasm-bindgen-shared",
]
@@ -5793,7 +5782,7 @@ checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -5923,7 +5912,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -5934,7 +5923,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -6175,7 +6164,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
"synstructure",
]
@@ -6197,7 +6186,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
@@ -6217,7 +6206,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
"synstructure",
]
@@ -6246,7 +6235,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.90",
+ "syn",
]
[[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 1121bf216b3..0743f320316 100644
--- a/Cargo.toml
+++ b/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" }
diff --git a/relay-event-derive/Cargo.toml b/relay-event-derive/Cargo.toml
index df820d496d9..9b23cce22c1 100644
--- a/relay-event-derive/Cargo.toml
+++ b/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]
diff --git a/relay-event-derive/src/lib.rs b/relay-event-derive/src/lib.rs
index 601bfccffeb..6d12ea016fc 100644
--- a/relay-event-derive/src/lib.rs
+++ b/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;
diff --git a/relay-event-derive/src/utils.rs b/relay-event-derive/src/utils.rs
index a60290df7a6..4c058048993 100644
--- a/relay-event-derive/src/utils.rs
+++ b/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>
diff --git a/relay-ffi-macros/Cargo.toml b/relay-ffi-macros/Cargo.toml
index 97ec4e703a4..cfd4304feb1 100644
--- a/relay-ffi-macros/Cargo.toml
+++ b/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 }
diff --git a/relay-ffi-macros/src/lib.rs b/relay-ffi-macros/src/lib.rs
index 8291644bc57..14d58037d29 100644
--- a/relay-ffi-macros/src/lib.rs
+++ b/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 }
}
}
diff --git a/relay-protocol-derive/Cargo.toml b/relay-protocol-derive/Cargo.toml
index 6d9522526a8..23aa127145d 100644
--- a/relay-protocol-derive/Cargo.toml
+++ b/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]
diff --git a/relay-protocol-derive/src/lib.rs b/relay-protocol-derive/src/lib.rs
index 4173b82b30e..08af8dbc2bc 100644
--- a/relay-protocol-derive/src/lib.rs
+++ b/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;
diff --git a/relay-protocol-derive/src/utils.rs b/relay-protocol-derive/src/utils.rs
index a60290df7a6..4c058048993 100644
--- a/relay-protocol-derive/src/utils.rs
+++ b/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>
diff --git a/tools/document-metrics/Cargo.toml b/tools/document-metrics/Cargo.toml
index deccc5f235a..3aeaad95e36 100644
--- a/tools/document-metrics/Cargo.toml
+++ b/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 }
diff --git a/tools/document-metrics/src/main.rs b/tools/document-metrics/src/main.rs
index dcfc54fc948..f65c274e05d 100644
--- a/tools/document-metrics/src/main.rs
+++ b/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 {
diff --git a/tools/document-pii/Cargo.toml b/tools/document-pii/Cargo.toml
index bb048feeaec..5356f711fc8 100644
--- a/tools/document-pii/Cargo.toml
+++ b/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]
diff --git a/tools/document-pii/src/item_collector.rs b/tools/document-pii/src/item_collector.rs
index 7970ea1ed0c..fe816b786bf 100644
--- a/tools/document-pii/src/item_collector.rs
+++ b/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());
diff --git a/tools/document-pii/src/main.rs b/tools/document-pii/src/main.rs
index 5a79eedb8cd..e2e36cefc9f 100644
--- a/tools/document-pii/src/main.rs
+++ b/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;
diff --git a/tools/document-pii/src/pii_finder.rs b/tools/document-pii/src/pii_finder.rs
index 64048406bca..411724775cb 100644
--- a/tools/document-pii/src/pii_finder.rs
+++ b/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);
}
}