Fix clippy warnings

helgoboss · Nov 17, 2021 · 79ea87a · 79ea87a
1 parent c0c05a5
commit 79ea87a
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api/src/schema/generated/realearn.schema.json b/api/src/schema/generated/realearn.schema.json
@@ -112,6 +112,15 @@
         }
       ]
     },
+    "AnyOnParameter": {
+      "type": "string",
+      "enum": [
+        "TrackSolo",
+        "TrackMute",
+        "TrackArm",
+        "TrackSelection"
+      ]
+    },
     "AutomationMode": {
       "type": "string",
       "enum": [
@@ -823,8 +832,8 @@
         "feedback_enabled": {
           "type": "boolean"
         },
-        "key": {
-          "description": "An optional key that you can assign to this group in order to refer to it from somewhere else.\n\nThis key should be unique within this list of groups.",
+        "id": {
+          "description": "An optional ID that you can assign to this group in order to refer to it from somewhere else.\n\nThis ID should be unique within all groups in the same compartment.",
           "type": "string"
         },
         "name": {
@@ -953,8 +962,8 @@
         "group": {
           "type": "string"
         },
-        "key": {
-          "description": "An optional key that you can assign to this mapping in order to refer to it from somewhere else.\n\nThis key should be unique within this list of mappings.",
+        "id": {
+          "description": "An optional ID that you can assign to this mapping in order to refer to it from somewhere else.\n\nThis ID should be unique within all mappings in the compartment.",
           "type": "string"
         },
         "name": {
@@ -1146,15 +1155,15 @@
         "index"
       ],
       "properties": {
+        "id": {
+          "description": "An optional ID that you can assign to this parameter in order to refer to it from somewhere else.\n\nThis ID should be unique within all parameters in the same compartment.",
+          "type": "string"
+        },
         "index": {
           "type": "integer",
           "format": "uint32",
           "minimum": 0.0
         },
-        "key": {
-          "description": "An optional key that you can assign to this parameter in order to refer to it from somewhere else.\n\nThis key should be unique within this list of parameters.",
-          "type": "string"
-        },
         "name": {
           "type": "string"
         }
@@ -1944,6 +1953,28 @@
           },
           "additionalProperties": false
         },
+        {
+          "type": "object",
+          "required": [
+            "kind",
+            "parameter"
+          ],
+          "properties": {
+            "kind": {
+              "type": "string",
+              "enum": [
+                "AnyOn"
+              ]
+            },
+            "parameter": {
+              "$ref": "#/definitions/AnyOnParameter"
+            },
+            "unit": {
+              "$ref": "#/definitions/TargetUnit"
+            }
+          },
+          "additionalProperties": false
+        },
         {
           "type": "object",
           "required": [
@@ -2343,6 +2374,27 @@
           },
           "additionalProperties": false
         },
+        {
+          "type": "object",
+          "required": [
+            "kind"
+          ],
+          "properties": {
+            "kind": {
+              "type": "string",
+              "enum": [
+                "TrackTool"
+              ]
+            },
+            "track": {
+              "$ref": "#/definitions/TrackDescriptor"
+            },
+            "unit": {
+              "$ref": "#/definitions/TargetUnit"
+            }
+          },
+          "additionalProperties": false
+        },
         {
           "type": "object",
           "required": [

diff --git a/main/Cargo.toml b/main/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "realearn"
-version = "2.11.0-pre.13"
+version = "2.11.0-pre.14"
 authors = ["Benjamin Klum <[email protected]>"]
 edition = "2018"
 build = "build.rs"

diff --git a/main/src/domain/unresolved_reaper_target.rs b/main/src/domain/unresolved_reaper_target.rs
@@ -162,27 +162,27 @@ impl UnresolvedReaperTarget {
             return Descriptors {
                 track: Some(&d.fx_descriptor.track_descriptor),
                 fx: Some(&d.fx_descriptor),
-                fx_param: Some(&d),
+                fx_param: Some(d),
                 ..Default::default()
             };
         }
         if let Some(d) = self.fx_descriptor() {
             return Descriptors {
                 track: Some(&d.track_descriptor),
-                fx: Some(&d),
+                fx: Some(d),
                 ..Default::default()
             };
         }
         if let Some(d) = self.route_descriptor() {
             return Descriptors {
                 track: Some(&d.track_descriptor),
-                route: Some(&d),
+                route: Some(d),
                 ..Default::default()
             };
         }
         if let Some(d) = self.track_descriptor() {
             return Descriptors {
-                track: Some(&d),
+                track: Some(d),
                 ..Default::default()
             };
         }

diff --git a/main/src/infrastructure/ui/mapping_panel.rs b/main/src/infrastructure/ui/mapping_panel.rs
@@ -5165,9 +5165,9 @@ impl<'a> ImmutableMappingPanel<'a> {
         let text = if self.mode.feedback_color.get_ref().is_some()
             || self.mode.feedback_background_color.get_ref().is_some()
         {
-            format!("...*")
+            "...*"
         } else {
-            "...".to_string()
+            "..."
         };
         self.view
             .require_control(root::IDC_MODE_FEEDBACK_TYPE_BUTTON)