From 287e76847a9ac33359b0b2d3aeee509b4a348127 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@igalia.com>
Date: Tue, 31 May 2022 16:14:47 -0400
Subject: [PATCH] plugin: Fix some clippy issues

And minor reformat
---
 plugins/src/signaller/imp.rs   |  4 +++-
 plugins/src/webrtcsink/imp.rs  |  4 ++--
 signalling/src/handlers/mod.rs | 20 ++++++++++++++++----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/plugins/src/signaller/imp.rs b/plugins/src/signaller/imp.rs
index 4cb50205..26ef1e90 100644
--- a/plugins/src/signaller/imp.rs
+++ b/plugins/src/signaller/imp.rs
@@ -107,7 +107,9 @@ impl Signaller {
         };
 
         websocket_sender
-            .send(p::IncomingMessage::Register(p::RegisterMessage::Producer { meta, }))
+            .send(p::IncomingMessage::Register(p::RegisterMessage::Producer {
+                meta,
+            }))
             .await?;
 
         let element_clone = element.downgrade();
diff --git a/plugins/src/webrtcsink/imp.rs b/plugins/src/webrtcsink/imp.rs
index 06a921f7..c311e3b7 100644
--- a/plugins/src/webrtcsink/imp.rs
+++ b/plugins/src/webrtcsink/imp.rs
@@ -2292,7 +2292,7 @@ impl WebRTCSink {
                 gst::MessageView::Error(err) => {
                     pipe.0.debug_to_dot_file_with_ts(
                         gst::DebugGraphDetails::all(),
-                        "webrtcsink-discovery-error".to_string(),
+                        "webrtcsink-discovery-error",
                     );
                     return Err(err.error().into());
                 }
@@ -2301,7 +2301,7 @@ impl WebRTCSink {
 
                     pipe.0.debug_to_dot_file_with_ts(
                         gst::DebugGraphDetails::all(),
-                        "webrtcsink-discovery-done".to_string(),
+                        "webrtcsink-discovery-done",
                     );
 
                     if let Some(s) = caps.structure(0) {
diff --git a/signalling/src/handlers/mod.rs b/signalling/src/handlers/mod.rs
index 11425ec0..c33d9f7c 100644
--- a/signalling/src/handlers/mod.rs
+++ b/signalling/src/handlers/mod.rs
@@ -342,7 +342,11 @@ impl Handler {
 
     /// Register peer as a producer
     #[instrument(level = "debug", skip(self))]
-    fn register_producer(&mut self, peer_id: &str, meta: Option<serde_json::Value>) -> Result<(), Error> {
+    fn register_producer(
+        &mut self,
+        peer_id: &str,
+        meta: Option<serde_json::Value>,
+    ) -> Result<(), Error> {
         if self.producers.contains_key(peer_id) {
             Err(anyhow!("{} is already registered as a producer", peer_id))
         } else {
@@ -376,7 +380,11 @@ impl Handler {
 
     /// Register peer as a consumer
     #[instrument(level = "debug", skip(self))]
-    fn register_consumer(&mut self, peer_id: &str, meta: Option<serde_json::Value>) -> Result<(), Error> {
+    fn register_consumer(
+        &mut self,
+        peer_id: &str,
+        meta: Option<serde_json::Value>,
+    ) -> Result<(), Error> {
         if self.consumers.contains_key(peer_id) {
             Err(anyhow!("{} is already registered as a consumer", peer_id))
         } else {
@@ -400,7 +408,11 @@ impl Handler {
 
     /// Register peer as a listener
     #[instrument(level = "debug", skip(self))]
-    fn register_listener(&mut self, peer_id: &str, meta: Option<serde_json::Value>) -> Result<(), Error> {
+    fn register_listener(
+        &mut self,
+        peer_id: &str,
+        meta: Option<serde_json::Value>,
+    ) -> Result<(), Error> {
         if !self.listeners.insert(peer_id.to_string()) {
             Err(anyhow!("{} is already registered as a listener", peer_id))
         } else {
@@ -536,7 +548,7 @@ mod tests {
         let mut handler = Handler::new(Box::pin(rx));
 
         let message = p::IncomingMessage::Register(p::RegisterMessage::Producer {
-            meta: Some(json!( {"display-name": "foobar".to_string() }))
+            meta: Some(json!( {"display-name": "foobar".to_string() })),
         });
 
         tx.send(("producer".to_string(), Some(message)))