remove &str special handling

Author: anonrig

src/rust/api/dns.rs

@@ -136,7 +136,7 @@ impl DnsUtil {
     /// `DnsParserError::InvalidHexString`
     /// `DnsParserError::ParseIntError`
     #[jsg_method]
-    pub fn parse_caa_record(&self, record: &str) -> Result<CaaRecord, DnsParserError> {
+    pub fn parse_caa_record(&self, record: String) -> Result<CaaRecord, DnsParserError> {
         // Let's remove "\\#" and the length of data from the beginning of the record
         let data = record.split_ascii_whitespace().collect::<Vec<_>>()[2..].to_vec();
         let critical = data[0].parse::<u8>()?;
@@ -191,7 +191,7 @@ impl DnsUtil {
     /// `DnsParserError::InvalidHexString`
     /// `DnsParserError::ParseIntError`
     #[jsg_method]
-    pub fn parse_naptr_record(&self, record: &str) -> jsg::Result<NaptrRecord, DnsParserError> {
+    pub fn parse_naptr_record(&self, record: String) -> jsg::Result<NaptrRecord, DnsParserError> {
         let data = record.split_ascii_whitespace().collect::<Vec<_>>()[1..].to_vec();
 
         let order_str = data[1..3].to_vec();
@@ -262,7 +262,7 @@ mod tests {
             _state: ResourceState::default(),
         };
         let record = dns_util
-            .parse_caa_record("\\# 15 00 05 69 73 73 75 65 70 6b 69 2e 67 6f 6f 67")
+            .parse_caa_record("\\# 15 00 05 69 73 73 75 65 70 6b 69 2e 67 6f 6f 67".to_owned())
             .unwrap();
 
         assert_eq!(record.critical, 0);
@@ -277,7 +277,8 @@ mod tests {
         };
         let record = dns_util
             .parse_caa_record(
-                "\\# 21 00 09 69 73 73 75 65 77 69 6c 64 6c 65 74 73 65 6e 63 72 79 70 74",
+                "\\# 21 00 09 69 73 73 75 65 77 69 6c 64 6c 65 74 73 65 6e 63 72 79 70 74"
+                    .to_owned(),
             )
             .unwrap();
 
@@ -291,8 +292,9 @@ mod tests {
         let dns_util = DnsUtil {
             _state: ResourceState::default(),
         };
-        let result =
-            dns_util.parse_caa_record("\\# 15 00 05 69 6e 76 61 6c 69 64 70 6b 69 2e 67 6f 6f 67");
+        let result = dns_util.parse_caa_record(
+            "\\# 15 00 05 69 6e 76 61 6c 69 64 70 6b 69 2e 67 6f 6f 67".to_owned(),
+        );
 
         assert!(result.is_err());
     }
@@ -303,7 +305,7 @@ mod tests {
             _state: ResourceState::default(),
         };
         let record = dns_util
-            .parse_naptr_record("\\# 37 15 b3 08 ae 01 73 0a 6d 79 2d 73 65 72 76 69 63 65 06 72 65 67 65 78 70 0b 72 65 70 6c 61 63 65 6d 65 6e 74 00")
+            .parse_naptr_record("\\# 37 15 b3 08 ae 01 73 0a 6d 79 2d 73 65 72 76 69 63 65 06 72 65 67 65 78 70 0b 72 65 70 6c 61 63 65 6d 65 6e 74 00".to_owned())
             .unwrap();
 
         assert_eq!(record.flags, "s");

src/rust/jsg-macros/BUILD.bazel

@@ -4,7 +4,6 @@ wd_rust_proc_macro(
     name = "jsg-macros",
     visibility = ["//visibility:public"],
     deps = [
-        "@crates_vendor//:proc-macro2",
         "@crates_vendor//:quote",
         "@crates_vendor//:syn",
     ],

src/rust/jsg-macros/README.md

@@ -9,7 +9,7 @@ Generates the `jsg::Struct` and `jsg::Type` implementations for data structures.
 ```rust
 #[jsg_struct]
 pub struct CaaRecord {
-    pub critical: u8,
+    pub critical: f64,
     pub field: String,
     pub value: String,
 }
@@ -29,7 +29,7 @@ Parameters and return values are handled via the `jsg::Wrappable` trait. Any typ
 ```rust
 impl DnsUtil {
     #[jsg_method(name = "parseCaaRecord")]
-    pub fn parse_caa_record(&self, record: &str) -> Result<CaaRecord, DnsParserError> {
+    pub fn parse_caa_record(&self, record: String) -> Result<CaaRecord, DnsParserError> {
         // Errors are thrown as JavaScript exceptions
     }
 
@@ -65,7 +65,7 @@ pub struct MyUtil {
 #[jsg_resource]
 impl DnsUtil {
     #[jsg_method]
-    pub fn parse_caa_record(&self, record: &str) -> Result<CaaRecord, DnsParserError> {
+    pub fn parse_caa_record(&self, record: String) -> Result<CaaRecord, DnsParserError> {
         // implementation
     }
 }

src/rust/jsg-macros/lib.rs

@@ -1,7 +1,4 @@
-mod types;
-
 use proc_macro::TokenStream;
-use proc_macro2::TokenStream as TokenStream2;
 use quote::ToTokens;
 use quote::quote;
 use syn::Data;
@@ -10,10 +7,8 @@ use syn::Fields;
 use syn::FnArg;
 use syn::ItemFn;
 use syn::ItemImpl;
-use syn::Type;
 use syn::parse_macro_input;
 use syn::spanned::Spanned;
-use types::is_str_ref;
 
 /// Generates `jsg::Struct` and `jsg::Type` implementations for data structures.
 ///
@@ -104,13 +99,15 @@ pub fn jsg_method(_attr: TokenStream, item: TokenStream) -> TokenStream {
         })
         .collect();
 
-    let (unwraps, arg_refs): (Vec<_>, Vec<_>) = params
+    let (unwraps, arg_names): (Vec<_>, Vec<_>) = params
         .iter()
         .enumerate()
         .map(|(i, ty)| {
             let arg = syn::Ident::new(&format!("arg{i}"), fn_name.span());
-            let (unwrap, arg_ref) = generate_unwrap(&arg, ty, i);
-            (unwrap, arg_ref)
+            let unwrap = quote! {
+                let Some(#arg) = <#ty as jsg::Wrappable>::try_unwrap(&mut lock, args.get(#i)) else { return; };
+            };
+            (unwrap, arg)
         })
         .unzip();
 
@@ -124,29 +121,13 @@ pub fn jsg_method(_attr: TokenStream, item: TokenStream) -> TokenStream {
             #(#unwraps)*
             let this = args.this();
             let self_ = jsg::unwrap_resource::<Self>(&mut lock, this);
-            let result = self_.#fn_name(#(#arg_refs),*);
+            let result = self_.#fn_name(#(#arg_names),*);
             jsg::Wrappable::wrap_return(result, &mut lock, &mut args);
         }
     }
     .into()
 }
 
-fn generate_unwrap(arg: &syn::Ident, ty: &Type, index: usize) -> (TokenStream2, TokenStream2) {
-    // &str: unwrap as String and borrow
-    if is_str_ref(ty) {
-        let unwrap = quote! {
-            let Some(#arg) = <String as jsg::Wrappable>::try_unwrap(&mut lock, args.get(#index)) else { return; };
-        };
-        return (unwrap, quote! { &#arg });
-    }
-
-    // All types use Wrappable::try_unwrap
-    let unwrap = quote! {
-        let Some(#arg) = <#ty as jsg::Wrappable>::try_unwrap(&mut lock, args.get(#index)) else { return; };
-    };
-    (unwrap, quote! { #arg })
-}
-
 /// Generates boilerplate for JSG resources.
 ///
 /// On structs: generates `jsg::Type` and `ResourceTemplate`.

src/rust/jsg-macros/types.rs

@@ -26,7 +26,7 @@ struct EchoResource {
 #[expect(clippy::unnecessary_wraps)]
 impl EchoResource {
     #[jsg_method]
-    pub fn echo(&self, message: &str) -> Result<String, String> {
+    pub fn echo(&self, message: String) -> Result<String, String> {
         Ok(format!("{}{}", self.prefix, message))
     }
 }