From 91fb1260a2a51846ebeb0354d63b52fe767158de Mon Sep 17 00:00:00 2001 From: yiffyrusdev Date: Wed, 30 Apr 2025 17:36:24 +0500 Subject: [PATCH] breaking: sync with latest proc_macro function signatures on nightly. Shall break with nightly before 2025-04-(~28). --- sabry_procmacro/src/lib.rs | 12 ++++++++++-- sabry_procmacro_impl/Cargo.toml | 1 - 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sabry_procmacro/src/lib.rs b/sabry_procmacro/src/lib.rs index 71136a5..98f056a 100644 --- a/sabry_procmacro/src/lib.rs +++ b/sabry_procmacro/src/lib.rs @@ -1,6 +1,8 @@ #![doc = include_str!("../README.md")] #![cfg_attr(feature = "nightly", feature(proc_macro_span))] +use std::str::FromStr; + use cfg_if::cfg_if; use proc_macro::TokenStream; use sabry_procmacro_impl::impls::{ @@ -39,7 +41,10 @@ pub fn scssy(input: TokenStream) -> TokenStream { cfg_if! { if #[cfg(feature = "nightly")] { use proc_macro::Span; - let source_path = Span::call_site().source_file().path().parent().map(|p| p.to_owned()); + use std::path::PathBuf; + let source_path = Some(PathBuf::from_str( + &Span::call_site().file()).expect("&str to be Infallible converted into PathBuf") + ); } else { let source_path = None; } @@ -109,7 +114,10 @@ pub fn styly(input: TokenStream) -> TokenStream { cfg_if! { if #[cfg(feature = "nightly")] { use proc_macro::Span; - let source_path = Span::call_site().source_file().path().parent().map(|p| p.to_owned()); + use std::path::PathBuf; + let source_path = Some(PathBuf::from_str( + &Span::call_site().file()).expect("&str to be Infallible converted into PathBuf") + ); } else { let source_path = None; } diff --git a/sabry_procmacro_impl/Cargo.toml b/sabry_procmacro_impl/Cargo.toml index e121b3f..8e468f6 100644 --- a/sabry_procmacro_impl/Cargo.toml +++ b/sabry_procmacro_impl/Cargo.toml @@ -10,7 +10,6 @@ license.workspace = true [dependencies] sabry_intrnl = { workspace = true } - syn = { version = "^2", features = ["parsing"] } quote = { version = "^1" } proc-macro2 = { version = "^1", features = ["span-locations"] }