From 14a67240af14e46ff1107601bbc75d8ae1e7e2e7 Mon Sep 17 00:00:00 2001 From: Matteo Bovetti Date: Mon, 10 Mar 2025 16:21:12 +0100 Subject: [PATCH] first iteration --- Cargo.lock | 17 +++-- Cargo.toml | 3 +- actix-service/src/boxed.rs | 2 + paste-macro/Cargo.toml | 13 ++++ paste-macro/src/lib.rs | 3 + paste/src/lib.rs => paste-macro/src/paste.rs | 67 +++++++++++++------- paste/Cargo.toml | 14 ---- 7 files changed, 76 insertions(+), 43 deletions(-) create mode 100644 paste-macro/Cargo.toml create mode 100644 paste-macro/src/lib.rs rename paste/src/lib.rs => paste-macro/src/paste.rs (75%) delete mode 100644 paste/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index fca93316..9fe2c28d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -230,7 +230,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e4e8200b9a4a5801a769d50eeabc05670fec7e959a8cb7a63a93e4e519942ae" dependencies = [ "aws-lc-sys", - "paste 1.0.15", + "paste", "zeroize", ] @@ -245,7 +245,7 @@ dependencies = [ "cmake", "dunce", "fs_extra", - "paste 1.0.15", + "paste", ] [[package]] @@ -1334,16 +1334,21 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "paste" -version = "0.1.0" - [[package]] name = "paste" version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +[[package]] +name = "paste-macro" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "pem" version = "3.0.5" diff --git a/Cargo.toml b/Cargo.toml index 9c155826..22c67625 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ members = [ "bytestring", "local-channel", "local-waker", - "paste", + "paste-macro", ] [workspace.package] @@ -32,6 +32,7 @@ actix-utils = { path = "actix-utils" } bytestring = { path = "bytestring" } local-channel = { path = "local-channel" } local-waker = { path = "local-waker" } +paste-macro = { path = "paste-macro" } [profile.release] lto = true diff --git a/actix-service/src/boxed.rs b/actix-service/src/boxed.rs index 329eb3f5..121f1729 100644 --- a/actix-service/src/boxed.rs +++ b/actix-service/src/boxed.rs @@ -3,6 +3,8 @@ use alloc::{boxed::Box, rc::Rc}; use core::{future::Future, pin::Pin}; +use paste_macro::paste; + use crate::{Service, ServiceFactory}; /// A boxed future with no send bound or lifetime parameters. diff --git a/paste-macro/Cargo.toml b/paste-macro/Cargo.toml new file mode 100644 index 00000000..82cc619a --- /dev/null +++ b/paste-macro/Cargo.toml @@ -0,0 +1,13 @@ +[package] +name = "paste-macro" +version = "0.1.0" +edition = "2021" +description = "Minimal implementation of the paste crate for identifier concatenation" + +[lib] +proc-macro = true + +[dependencies] +proc-macro2 = "1.0" +quote = "1.0" +syn = { version = "2.0", features = ["full"] } \ No newline at end of file diff --git a/paste-macro/src/lib.rs b/paste-macro/src/lib.rs new file mode 100644 index 00000000..76abad37 --- /dev/null +++ b/paste-macro/src/lib.rs @@ -0,0 +1,3 @@ +//! A minimal implementation of the paste-macro crate, allowing identifier concatenation in macros. + +mod paste; diff --git a/paste/src/lib.rs b/paste-macro/src/paste.rs similarity index 75% rename from paste/src/lib.rs rename to paste-macro/src/paste.rs index 2f13f660..2c588e8f 100644 --- a/paste/src/lib.rs +++ b/paste-macro/src/paste.rs @@ -1,4 +1,4 @@ -//! A minimal implementation of the paste crate, allowing identifier concatenation in macros. +//! A minimal implementation of the paste-macro crate, allowing identifier concatenation in macros. use proc_macro::{ Delimiter, Group, Ident, Punct, Spacing, Span, TokenStream, TokenTree @@ -6,6 +6,21 @@ use proc_macro::{ use std::{iter, str::FromStr}; use std::panic; +// Pastes identifiers together to form a single identifier. +// +// Within the `paste!` macro, identifiers inside `[<`...`>]` are pasted +// together to form a single identifier. +// +// # Examples +// +// ``` +// use paste_macro::paste; +// +// paste! { +// // Defines a const called `QRST`. +// const []: &str = "success!"; +// } +// ``` #[proc_macro] pub fn paste(input: TokenStream) -> TokenStream { let mut expanded = TokenStream::new(); @@ -19,7 +34,7 @@ pub fn paste(input: TokenStream) -> TokenStream { let span = group.span(); if delimiter == Delimiter::Bracket && is_paste_operation(&content) { - // Process [< ... >] paste operation + // Process [< ... >] paste-macro operation if let Ok(pasted) = process_paste_operation(content, span) { expanded.extend(pasted); } else { @@ -42,7 +57,7 @@ pub fn paste(input: TokenStream) -> TokenStream { expanded } -// Check if a token stream is a paste operation: [< ... >] +// Check if a token stream is a paste-macro operation: [< ... >] fn is_paste_operation(input: &TokenStream) -> bool { let mut tokens = input.clone().into_iter(); @@ -77,6 +92,8 @@ fn process_paste_operation(input: TokenStream, span: Span) -> Result' => break, @@ -84,12 +101,15 @@ fn process_paste_operation(input: TokenStream, span: Span) -> Result { let lit_str = lit.to_string(); if lit_str.starts_with('"') && lit_str.ends_with('"') && lit_str.len() >= 2 { - segments.push(lit_str[1..lit_str.len() - 1].to_owned()); + segments.push(lit_str[1..lit_str.len() - 1].to_owned().replace('-', "_")); } else { - segments.push(lit_str); + segments.push(lit_str.replace('-', "_")); } }, TokenTree::Punct(punct) if punct.as_char() == '_' => segments.push("_".to_owned()), + TokenTree::Punct(punct) if punct.as_char() == '\'' => { + has_lifetime = true; + }, TokenTree::Punct(punct) if punct.as_char() == ':' => { if segments.is_empty() { return Err(()); @@ -118,28 +138,31 @@ fn process_paste_operation(input: TokenStream, span: Span) -> Result TokenTree::Ident(ident), - Err(_) => { - // If it starts with a number, try to create a literal - if pasted.starts_with(|c: char| c.is_ascii_digit()) { - match TokenStream::from_str(&pasted) { - Ok(ts) => { - if let Some(token) = ts.into_iter().next() { - return Ok(iter::once(token).collect()); - } - } - Err(_) => {} + // Add lifetime symbol if needed + if has_lifetime { + pasted.insert(0, '\''); + } + + // Convert to a valid Rust identifier or literal + if pasted.starts_with(|c: char| c.is_ascii_digit()) { + // If it starts with a number, try to create a literal + match TokenStream::from_str(&pasted) { + Ok(ts) => { + if let Some(token) = ts.into_iter().next() { + return Ok(iter::once(token).collect()); } } - return Err(()); + Err(_) => return Err(()), } - }; + } - Ok(iter::once(ident).collect()) + // Try to create an identifier + match panic::catch_unwind(|| Ident::new(&pasted, span)) { + Ok(ident) => Ok(iter::once(TokenTree::Ident(ident)).collect()), + Err(_) => Err(()), + } } // Helper function to convert CamelCase to snake_case diff --git a/paste/Cargo.toml b/paste/Cargo.toml deleted file mode 100644 index a3c9edd2..00000000 --- a/paste/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "paste" -version = "0.1.0" -license.workspace = true -edition.workspace = true -rust-version.workspace = true - -[dependencies] - -[lints] -workspace = true - -[lib] -proc-macro = true \ No newline at end of file