fix(derive): fix compiles when using quoted rtype form

Cargo.toml

@@ -7,6 +7,8 @@ members = [
 ]
 
 [workspace.package]
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/actix/actix"
 edition = "2021"
 rust-version = "1.72"
 

actix-derive/CHANGES.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+## 0.6.2
+
+- Fix compile failures when using quoted rtype (i.e., `#[rtype("()")]`) form.
+
 ## 0.6.1
 
 - Update `syn` dependency to `2`.

actix-derive/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "actix_derive"
-version = "0.6.1"
+version = "0.6.2"
 authors = [
     "Callym <[email protected]>",
     "Nikolay Kim <[email protected]>",
     "Rob Ede <[email protected]>",
 ]
 description = "Derive macros for `actix` actors"
 keywords = ["actix", "actors", "derive", "macro"]
-repository = "https://github.com/actix/actix"
-license = "MIT OR Apache-2.0"
+license.workspace = true
+repository.workspace = true
 edition.workspace = true
 rust-version.workspace = true
 
@@ -27,4 +27,4 @@ proc-macro2 = "1"
 [dev-dependencies]
 actix = "0.13"
 trybuild = "1"
-rustversion = "1"
+rustversion-msrv = "0.100"

actix-derive/README.md

@@ -5,10 +5,10 @@
 <!-- prettier-ignore-start -->
 
 [![crates.io](https://img.shields.io/crates/v/actix-derive?label=latest)](https://crates.io/crates/actix-derive)
-[![Documentation](https://docs.rs/actix-derive/badge.svg?version=0.6.1)](https://docs.rs/actix-derive/0.6.1)
+[![Documentation](https://docs.rs/actix-derive/badge.svg?version=0.6.2)](https://docs.rs/actix-derive/0.6.2)
 ![Minimum Supported Rust Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
 ![License](https://img.shields.io/crates/l/actix-derive.svg)
-[![Dependency Status](https://deps.rs/crate/actix/0.6.1/status.svg)](https://deps.rs/crate/actix/0.6.1)
+[![Dependency Status](https://deps.rs/crate/actix/0.6.2/status.svg)](https://deps.rs/crate/actix/0.6.2)
 
 <!-- prettier-ignore-end -->
 

actix-derive/src/message.rs

@@ -45,18 +45,20 @@ fn get_attribute_type_multiple(
     ast: &syn::DeriveInput,
     name: &str,
 ) -> syn::Result<Vec<Option<syn::Type>>> {
-    let attr = ast
-        .attrs
-        .iter()
-        .find_map(|attr| {
-            if attr.path().is_ident(name) {
-                attr.parse_args().ok()
-            } else {
-                None
-            }
-        })
+    let mut target_attrs = ast.attrs.iter().filter(|attr| attr.path().is_ident(name));
+
+    if let Some(Ok(typ)) = target_attrs
+        .clone()
+        .find_map(|attr| attr.parse_args::<syn::LitStr>().ok())
+        .map(|lit_str| lit_str.parse::<syn::Type>())
+    {
+        return Ok(vec![Some(typ)]);
+    }
+
+    let attr = target_attrs
+        .find_map(|attr| attr.parse_args().ok())
         .ok_or_else(|| {
-            syn::Error::new(Span::call_site(), format!("Expect an attribute `{name}`"))
+            syn::Error::new(Span::call_site(), format!("Expected an attribute `{name}`"))
         })?;
 
     match attr {

actix-derive/tests/trybuild.rs

@@ -1,7 +1,7 @@
 /// Proc macro compile tests.
 ///
 /// Only run on MSRV to ensure stable compile errors.
-#[rustversion::stable(1.68)]
+#[rustversion_msrv::msrv]
 #[test]
 fn compile_macros() {
     let t = trybuild::TestCases::new();

actix-derive/tests/trybuild/message.rs

@@ -11,6 +11,10 @@ struct Sum(usize, usize);
 #[rtype(Added)]
 struct SumBareType(usize, usize);
 
+#[derive(Message)]
+#[rtype("()")]
+struct UnitReturnInString;
+
 #[derive(Default)]
 struct Adder;
 

actix/tests/test_address.rs

@@ -460,7 +460,9 @@ fn test_address_hash() {
         let addr0 = MyActor(count0).start();
         let addr01 = addr0.clone();
 
+        #[allow(clippy::mutable_key_type)]
         let mut addresses = HashSet::new();
+
         addresses.insert(addr0.clone());
         addresses.insert(addr01.clone());
 

justfile

@@ -5,6 +5,17 @@ msrv := ```
 ```
 msrv_rustup := "+" + msrv
 
+# Format project.
+[group("lint")]
+fmt:
+    cargo +nightly fmt
+    fd --type=file --hidden --extension=yml --extension=md --extension=js --exec-batch npx -y prettier --write
+
+# Run Clippy over workspace.
+[group("lint")]
+clippy:
+    cargo clippy --workspace --all-targets --all-features
+
 # Downgrade dev-dependencies necessary to run MSRV checks/tests.
 [private]
 downgrade-for-msrv: