Merge branch 'master' into update-dependencies

.github/workflows/integration.yml

@@ -16,14 +16,9 @@ jobs:
     name: Test examples with ${{ matrix.version }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: ${{ matrix.version }}
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --examples
+      - run: cargo test --examples

.github/workflows/publish.yml

@@ -10,12 +10,10 @@ jobs:
     name: Publish to crates.io
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: stable
-          override: true
       - name: Hack publish-crates to not fail on paths
         run: |
           sed 's/, path = ".*"//' -i Cargo.toml

.github/workflows/test.yml

@@ -12,21 +12,12 @@ jobs:
     name: Check and test on ${{ matrix.os }} with ${{ matrix.version }}
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          profile: minimal
           toolchain: ${{ matrix.version }}
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-      - run: rustup component add clippy
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
+          components: clippy
+      - run: cargo check
+      - run: cargo clippy -- -D warnings
+      - run: cargo test

redis-macros-derive/src/lib.rs

@@ -1,39 +1,22 @@
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
-use quote::quote;
-use syn::{
-    parenthesized,
-    parse::{Parse, ParseStream},
-    parse_macro_input, token, Attribute, DeriveInput, GenericParam, Result,
-};
-
-struct ParseParenthesed {
-    _p: token::Paren,
-    field: TokenStream2,
-}
-
-impl Parse for ParseParenthesed {
-    fn parse(input: ParseStream) -> Result<Self> {
-        let content;
-        Ok(ParseParenthesed {
-            _p: parenthesized!(content in input),
-            field: content.parse()?,
-        })
-    }
-}
+use quote::{quote, ToTokens};
+use syn::{parse_macro_input, Attribute, DeriveInput, Expr, GenericParam};
 
 fn get_serializer(attrs: Vec<Attribute>, default: &str) -> TokenStream2 {
     let default_token = default.parse::<TokenStream2>().unwrap();
+
     attrs
         .into_iter()
-        .find(|a| a.path.segments.len() == 1 && a.path.segments[0].ident == "redis_serializer")
-        .map(|Attribute { tokens, .. }| {
-            let tokens = tokens.into();
-            let ParseParenthesed { field, .. } = parse_macro_input!(tokens as ParseParenthesed);
-            field.into()
+        .find(|attr| attr.path().is_ident("redis_serializer"))
+        .and_then(|attr| {
+            let Ok(Expr::Path(path)) = attr.parse_args::<Expr>() else {
+                return None;
+            };
+
+            Some(TokenStream2::from(path.to_token_stream()))
         })
         .unwrap_or(default_token.into())
-        .into()
 }
 
 /// Derive macro for the redis crate's [`FromRedisValue`](../redis/trait.FromRedisValue.html) trait to allow parsing Redis responses to this type.