Change the syntax for soa_derive to be close to derive

Author: Luthaf

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "soa_derive"
-version = "0.10.0"
+version = "0.11.0"
 edition = "2018"
 authors = ["Guillaume Fraux <[email protected]>"]
 license = "MIT/Apache-2.0"
@@ -19,7 +19,7 @@ members = [
 ]
 
 [dependencies]
-soa_derive_internal = {path = "soa-derive-internal", version = "0.10"}
+soa_derive_internal = {path = "soa-derive-internal", version = "0.11"}
 
 [dev-dependencies]
 bencher = "0.1"

README.md

@@ -40,12 +40,12 @@ You can use `<Cheese as StructOfArray>::Type` instead of the explicitly named ty
 
 Add `#[derive(StructOfArray)]` to each struct you want to derive a struct of
 array version. If you need the helper structs to derive additional traits (such
-as `Debug` or `PartialEq`), you can add an attribute `#[soa_derive = "Debug,
-PartialEq"]` to the struct declaration.
+as `Debug` or `PartialEq`), you can add an attribute `#[soa_derive(Debug,
+PartialEq)]` to the struct declaration.
 
 ```rust
 #[derive(Debug, PartialEq, StructOfArray)]
-#[soa_derive = "Debug, PartialEq"]
+#[soa_derive(Debug, PartialEq)]
 pub struct Cheese {
     pub smell: f64,
     pub color: (f64, f64, f64),
@@ -54,9 +54,9 @@ pub struct Cheese {
 }
 ```
 
-If you want to add attribute to a specific generated struct(such as 
+If you want to add attribute to a specific generated struct(such as
 `#[cfg_attr(test, derive(PartialEq))]` on `CheeseVec`), you can add an
-attribute `#[soa_attr(Vec, cfg_attr(test, derive(PartialEq)))]` to the 
+attribute `#[soa_attr(Vec, cfg_attr(test, derive(PartialEq)))]` to the
 struct declaration.
 
 ```rust
@@ -70,7 +70,7 @@ pub struct Cheese {
 }
 ```
 
-Mappings for first argument of ``soa_attr`` to the generated struct for ``Cheese``: 
+Mappings for first argument of ``soa_attr`` to the generated struct for ``Cheese``:
 * `Vec` => `CheeseVec`
 * `Slice` => `CheeseSlice`
 * `SliceMut` => `CheeseSliceMut`

benches/soa.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::needless_return)]
+
 use soa_derive::StructOfArray;
 
 use bencher::{Bencher, benchmark_group, benchmark_main};

example/lib.rs

@@ -42,7 +42,7 @@ extern crate soa_derive;
 
 /// A basic Particle type
 #[derive(Debug, PartialEq, StructOfArray)]
-#[soa_derive = "Debug, PartialEq"]
+#[soa_derive(Debug, PartialEq)]
 pub struct Particle {
     /// Mass of the particle
     pub mass: f64,

soa-derive-internal/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "soa_derive_internal"
-version = "0.10.1"
+version = "0.11.0"
 edition = "2018"
 authors = ["Guillaume Fraux <[email protected]>"]
 license = "MIT/Apache-2.0"

soa-derive-internal/src/input.rs

@@ -3,8 +3,8 @@ use std::convert::TryInto;
 use proc_macro2::Span;
 use quote::quote;
 
-use syn::{Data, DeriveInput, Field, Ident, Lit, Path, Visibility};
-use syn::{Meta, MetaList, MetaNameValue, NestedMeta};
+use syn::{Data, DeriveInput, Field, Ident, Path, Visibility};
+use syn::{Meta, MetaList, NestedMeta};
 
 /// Representing the struct we are deriving
 pub struct Input {
@@ -106,11 +106,19 @@ impl ExtraAttributes {
     }
 
     /// Add a single trait from `#[soa_derive]`
-    fn add_derive(&mut self, trait_: &str) {
-        static EXCEPTIONS: &[&str] = &["Clone", "Deserialize", "Serialize"];
+    fn add_derive(&mut self, path: &Path) {
+        let derive_only_vec = |path: &Path| {
+            static EXCEPTIONS: &[&str] = &["Clone", "Deserialize", "Serialize"];
+            for exception in EXCEPTIONS {
+                if path.is_ident(exception) {
+                    return true;
+                }
+            }
+            return false;
+        };
 
-        let derive = create_derive_meta(trait_);
-        if !EXCEPTIONS.contains(&trait_) {
+        let derive = create_derive_meta(path.clone());
+        if !derive_only_vec(path) {
             self.slice.push(derive.clone());
             self.slice_mut.push(derive.clone());
             self.ref_.push(derive.clone());
@@ -122,17 +130,15 @@ impl ExtraAttributes {
         // always add this derive to the Vec struct
         self.vec.push(derive);
 
-        if trait_ == "Clone" {
+        if path.is_ident("Clone") {
             self.derive_clone = true;
         }
     }
 }
 
-fn create_derive_meta(name: &str) -> Meta {
+fn create_derive_meta(path: Path) -> Meta {
     let mut nested = syn::punctuated::Punctuated::new();
-    nested.push(NestedMeta::Meta(Meta::Path(Path::from(
-        Ident::new(name, Span::call_site())
-    ))));
+    nested.push(NestedMeta::Meta(Meta::Path(path)));
 
     Meta::List(MetaList {
         path: Path::from(Ident::new("derive", Span::call_site())),
@@ -158,20 +164,28 @@ impl Input {
             if let Ok(meta) = attr.parse_meta() {
                 if meta.path().is_ident("soa_derive") {
                     match meta {
-                        Meta::NameValue(MetaNameValue {
-                            lit: Lit::Str(string),
-                            ..
-                        }) => {
-                            for value in string.value().split(',') {
-                                let value = value.trim();
-                                if value == "Copy" {
-                                    panic!("can not derive Copy for SoA vectors");
+                        Meta::List(ref list) => {
+                            for element in &list.nested {
+                                match element {
+                                    NestedMeta::Meta(meta) => {
+                                        let path = meta.path();
+                                        if path.is_ident("Copy") {
+                                            panic!("can not derive Copy for SoA vectors");
+                                        }
+                                        extra_attrs.add_derive(path);
+                                    }
+                                    NestedMeta::Lit(_) => {
+                                        panic!(
+                                            "expected #[soa_derive(Traits, To, Derive)], got #[{}]",
+                                            quote!(#meta)
+                                        );
+                                    }
                                 }
-                                extra_attrs.add_derive(value);
                             }
+
                         }
                         _ => panic!(
-                            "expected #[soa_derive = \"Traits, To, Derive\"], got #[{}]",
+                            "expected #[soa_derive(Traits, To, Derive)], got #[{}]",
                             quote!(#meta)
                         ),
                     }

src/lib.rs

@@ -42,7 +42,7 @@
 //! # #[macro_use] extern crate soa_derive;
 //! # fn main() {
 //! #[derive(Debug, PartialEq, StructOfArray)]
-//! #[soa_derive = "Debug, PartialEq"]
+//! #[soa_derive(Debug, PartialEq)]
 //! pub struct Cheese {
 //!     pub smell: f64,
 //!     pub color: (f64, f64, f64),

tests/particles/mod.rs

@@ -1,7 +1,7 @@
 use soa_derive::StructOfArray;
 
 #[derive(Debug, Clone, PartialEq, StructOfArray)]
-#[soa_derive = "Debug, Clone, PartialEq"]
+#[soa_derive(Debug, Clone, PartialEq)]
 pub struct Particle {
     pub name: String,
     pub mass: f64,

tests/serde.rs

@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 use soa_derive::StructOfArray;
 
 #[derive(Debug, Clone, PartialEq, StructOfArray)]
-#[soa_derive = "Debug, Clone, PartialEq, Serialize, Deserialize"]
+#[soa_derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct Particle {
     pub name: String,
     pub mass: f64,