first iteration

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"

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

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.

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"] }

paste-macro/src/lib.rs

@@ -0,0 +1,3 @@
+//! A minimal implementation of the paste-macro crate, allowing identifier concatenation in macros.
+
+mod paste;

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 [<Q R S T>]: &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<TokenStream
 
     // Collect and process segments
     let mut segments = Vec::new();
+    let mut has_lifetime = false;
+
     while let Some(token) = tokens.next() {
         match &token {
             TokenTree::Punct(punct) if punct.as_char() == '>' => break,
@@ -84,12 +101,15 @@ fn process_paste_operation(input: TokenStream, span: Span) -> Result<TokenStream
             TokenTree::Literal(lit) => {
                 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<TokenStream
     }
 
     // Create identifier from the concatenated segments
-    let pasted = segments.join("");
+    let mut pasted = segments.join("");
 
-    // Convert to a valid Rust identifier
-    let ident = match panic::catch_unwind(|| Ident::new(&pasted, span)) {
-        Ok(ident) => 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

paste/Cargo.toml

@@ -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