Merge pull request #579 from swimos/rename-lanes

Adds the ability to rename lanes of agents in the derive macro.

Author: SirCipher

Cargo.toml

@@ -103,3 +103,5 @@ percent-encoding = "2.1.0"
 mime = "0.3"
 serde_json = "1.0"
 serde = "1.0"
+convert_case = "0.6"
+frunk = "0.4"

api/swim_form/src/tests/derive/form/enum_duplicate_fields.rs

@@ -0,0 +1,20 @@
+use swim_form_derive::*;
+
+fn main() {
+    #[allow(non_snake_case)]
+    #[derive(Form)]
+    #[form_root(::swim_form)]
+    enum Duplicates {
+        First {
+            #[form(convention = "camel")]
+            first_field: i32,
+            firstField: i32,
+        },
+        #[form(fields_convention = "camel")]
+        Second {
+            first_field: i32,
+            #[form(name = "firstField")]
+            second_field: i32,
+        }
+    }
+}

api/swim_form/src/tests/derive/form/enum_duplicate_fields.stderr

@@ -0,0 +1,20 @@
+error: Form field names must be unique. Duplicated names: [firstField]
+  --> src/tests/derive/form/enum_duplicate_fields.rs:8:9
+   |
+8  | /         First {
+9  | |             #[form(convention = "camel")]
+10 | |             first_field: i32,
+11 | |             firstField: i32,
+12 | |         },
+   | |_________^
+
+error: Form field names must be unique. Duplicated names: [firstField]
+  --> src/tests/derive/form/enum_duplicate_fields.rs:13:9
+   |
+13 | /         #[form(fields_convention = "camel")]
+14 | |         Second {
+15 | |             first_field: i32,
+16 | |             #[form(name = "firstField")]
+17 | |             second_field: i32,
+18 | |         }
+   | |_________^

api/swim_form/src/tests/derive/form/enum_duplicate_tags.rs

@@ -0,0 +1,15 @@
+use swim_form_derive::*;
+
+fn main() {
+    #[allow(non_snake_case)]
+    #[derive(Form)]
+    #[form_root(::swim_form)]
+    enum Duplicates {
+        First {
+            first_field: i32,
+            second_Field: i32,
+        },
+        #[form(tag = "First")]
+        Second,
+    }
+}

api/swim_form/src/tests/derive/form/enum_duplicate_tags.stderr

@@ -0,0 +1,11 @@
+error: Duplicate enumeration tag: "First"
+  --> src/tests/derive/form/enum_duplicate_tags.rs:4:5
+   |
+4  | /     #[allow(non_snake_case)]
+5  | |     #[derive(Form)]
+6  | |     #[form_root(::swim_form)]
+7  | |     enum Duplicates {
+...  |
+13 | |         Second,
+14 | |     }
+   | |_____^

api/swim_form/src/tests/derive/form/invalid_tag_placement_enum.stderr

@@ -1,8 +1,5 @@
-error: A tag name cannot be specified for an enum type, only its variants
-  --> src/tests/derive/form/invalid_tag_placement_enum.rs:20:5
+error: Unrecognized attribute for 'form'.
+  --> src/tests/derive/form/invalid_tag_placement_enum.rs:20:12
    |
-20 | /     #[form(tag = "Enumeration")]
-21 | |     enum E {
-22 | |         A,
-23 | |     }
-   | |_____^
+20 |     #[form(tag = "Enumeration")]
+   |            ^^^^^^^^^^^^^^^^^^^

api/swim_form/src/tests/derive/form/newtype_enum.stderr

@@ -1,9 +1,5 @@
-error: Cannot use `newtype` annotation with enums
-  --> src/tests/derive/form/newtype_enum.rs:6:5
-   |
-6  | /     #[form(newtype)]
-7  | |     enum A {
-8  | |         B,
-9  | |         C,
-10 | |     }
-   | |_____^
+error: Unrecognized attribute for 'form'.
+ --> src/tests/derive/form/newtype_enum.rs:6:12
+  |
+6 |     #[form(newtype)]
+  |            ^^^^^^^

api/swim_form/src/tests/derive/form/struct_duplicate_fields.rs

@@ -0,0 +1,12 @@
+use swim_form_derive::*;
+
+fn main() {
+    #[derive(Form)]
+    #[form_root(::swim_form)]
+    #[allow(non_snake_case)]
+    struct Duplicates {
+        #[form(convention = "camel")]
+        second_field: i32,
+        secondField: String,
+    }
+}

api/swim_form/src/tests/derive/form/struct_duplicate_fields.stderr

@@ -0,0 +1,10 @@
+error: Form field names must be unique. Duplicated names: [secondField]
+  --> src/tests/derive/form/struct_duplicate_fields.rs:6:5
+   |
+6  | /     #[allow(non_snake_case)]
+7  | |     struct Duplicates {
+8  | |         #[form(convention = "camel")]
+9  | |         second_field: i32,
+10 | |         secondField: String,
+11 | |     }
+   | |_____^

api/swim_form/src/tests/derive/form/unknown_container_attr.stderr

@@ -1,4 +1,4 @@
-error: Unknown container attribute
+error: Unrecognized attribute for 'form'.
   --> src/tests/derive/form/unknown_container_attr.rs:20:12
    |
 20 |     #[form(swim)]