fix(varlink_parser): clippy

Signed-off-by: Harald Hoyer <harald@hoyer.xyz>
varlink · Dec 6, 2021 · d726750 · d726750
1 parent b95c624
commit d726750
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 21 deletions.
diff --git a/examples/example/src/main.rs b/examples/example/src/main.rs
@@ -39,7 +39,7 @@ fn main() {
     let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => {
-            eprintln!("{}", f.to_string());
+            eprintln!("{}", f);
             print_usage(&program, &opts);
             return;
         }

diff --git a/examples/more/src/main.rs b/examples/more/src/main.rs
@@ -37,7 +37,7 @@ fn main() {
     let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => {
-            eprintln!("{}", f.to_string());
+            eprintln!("{}", f);
             print_usage(&program, &opts);
             return;
         }

diff --git a/examples/more/src/org_example_more.rs b/examples/more/src/org_example_more.rs
@@ -7,6 +7,7 @@ use std::sync::{Arc, RwLock};
 use varlink::{self, CallTrait};
 #[allow(dead_code)]
 #[derive(Clone, PartialEq, Debug)]
+#[allow(clippy::enum_variant_names)]
 pub enum ErrorKind {
     Varlink_Error,
     VarlinkReply_Error,

diff --git a/examples/ping/src/main.rs b/examples/ping/src/main.rs
@@ -36,7 +36,7 @@ fn main() {
     let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => {
-            eprintln!("{}", f.to_string());
+            eprintln!("{}", f);
             print_usage(&program, &opts);
             return;
         }
@@ -344,7 +344,7 @@ mod multiplex {
                                 tracker.chain_buffer(&mut readbuf[0..len].to_vec());
                                 eprintln!(
                                     "Handling: {}",
-                                    String::from_utf8_lossy(&tracker.buf_as_slice())
+                                    String::from_utf8_lossy(tracker.buf_as_slice())
                                 );
 
                                 match handler.handle(&mut tracker.buf_as_slice(), &mut out, None) {
@@ -442,7 +442,7 @@ mod multiplex {
                                                     if !buf.is_empty() {
                                                         eprintln!(
                                                             "fill_buf(): {}",
-                                                            String::from_utf8_lossy(&buf)
+                                                            String::from_utf8_lossy(buf)
                                                         );
                                                     }
                                                 }

diff --git a/examples/ping/src/org_example_ping.rs b/examples/ping/src/org_example_ping.rs
@@ -7,6 +7,7 @@ use std::sync::{Arc, RwLock};
 use varlink::{self, CallTrait};
 #[allow(dead_code)]
 #[derive(Clone, PartialEq, Debug)]
+#[allow(clippy::enum_variant_names)]
 pub enum ErrorKind {
     Varlink_Error,
     VarlinkReply_Error,

diff --git a/varlink-certification/src/main.rs b/varlink-certification/src/main.rs
@@ -51,7 +51,7 @@ fn main() -> Result<()> {
         Ok(m) => m,
         Err(f) => {
             print_usage(&program, &opts);
-            eprintln!("{}", f.to_string());
+            eprintln!("{}", f);
             exit(1);
         }
     };

diff --git a/varlink-cli/src/main.rs b/varlink-cli/src/main.rs
@@ -244,8 +244,9 @@ fn varlink_call(
     };
 
     let args = match args {
-        Some(args) => serde_json::from_str(args)
-            .context(format!("Failed to parse JSON for '{}'", args.to_string()))?,
+        Some(args) => {
+            serde_json::from_str(args).context(format!("Failed to parse JSON for '{}'", args))?
+        }
         None => serde_json::Value::Null,
     };
 
@@ -336,7 +337,7 @@ fn print_call_ret(
             }) => format!(
                 "Call failed with error: {}\n{}",
                 red(error),
-                cf.to_colored_json(&parameters, color_mode).unwrap()
+                cf.to_colored_json(parameters, color_mode).unwrap()
             ),
             _ => format!("Failed to call method '{}({})'", &method, &args),
         }

diff --git a/varlink/src/lib.rs b/varlink/src/lib.rs
@@ -1363,8 +1363,7 @@ impl VarlinkService {
         for i in interfaces {
             ifhashmap.insert(i.get_name().into(), i);
         }
-        let mut ifnames: Vec<Cow<'static, str>> = Vec::new();
-        ifnames.push("org.varlink.service".into());
+        let mut ifnames: Vec<Cow<'static, str>> = vec!["org.varlink.service".into()];
         ifnames.extend(ifhashmap.keys().cloned());
         VarlinkService {
             info: ServiceInfo {

diff --git a/varlink_generator/src/bin/varlink-rust-generator.rs b/varlink_generator/src/bin/varlink-rust-generator.rs
@@ -38,7 +38,7 @@ fn main() -> std::result::Result<(), Box<dyn std::error::Error>> {
     let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => {
-            eprintln!("{}", f.to_string());
+            eprintln!("{}", f);
             print_usage(&program, &opts);
             return Err("Invalid Arguments".into());
         }

diff --git a/varlink_generator/src/lib.rs b/varlink_generator/src/lib.rs
@@ -277,8 +277,6 @@ impl<'short, 'long: 'short> ToTokenStream<'short, 'long> for VError<'long> {
     }
 }
 
-#[allow(clippy::unknown_clippy_lints)]
-#[allow(clippy::unnecessary_wraps)]
 fn varlink_to_rust(idl: &IDL, options: &GeneratorOptions, tosource: bool) -> Result<TokenStream> {
     let mut ts = TokenStream::new();
 
@@ -301,7 +299,7 @@ fn varlink_to_rust(idl: &IDL, options: &GeneratorOptions, tosource: bool) -> Res
         ts.extend(v.clone());
     }
 
-    generate_error_code(options, &idl, &mut ts);
+    generate_error_code(options, idl, &mut ts);
 
     for t in idl.typedefs.values() {
         t.to_tokenstream("", &mut ts, options);
@@ -540,7 +538,7 @@ fn generate_anon_struct(
     name: &str,
     vstruct: &VStruct,
     options: &GeneratorOptions,
-    mut ts: &mut TokenStream,
+    ts: &mut TokenStream,
     field_types: &mut Vec<TokenStream>,
     field_names: &mut Vec<Ident>,
     anot: &mut Vec<TokenStream>,
@@ -556,7 +554,7 @@ fn generate_anon_struct(
         field_types.push(
             TokenStream::from_str(
                 e.vtype
-                    .to_rust_string(format!("{}_{}", name, e.name).as_ref(), &mut ts, options)
+                    .to_rust_string(format!("{}_{}", name, e.name).as_ref(), ts, options)
                     .as_ref(),
             )
             .unwrap(),
@@ -597,6 +595,7 @@ fn generate_error_code(
             ts.extend(quote!(
                 #[allow(dead_code)]
                 #[derive(Clone, PartialEq, Debug)]
+                #[allow(clippy::enum_variant_names)]
                 pub enum ErrorKind {
                     Varlink_Error,
                     VarlinkReply_Error,

diff --git a/varlink_generator/tests/org.example.complex.rs_out b/varlink_generator/tests/org.example.complex.rs_out
@@ -4,6 +4,7 @@ use std::sync::{Arc, RwLock};
 use varlink::{self, CallTrait};
 #[allow(dead_code)]
 #[derive(Clone, PartialEq, Debug)]
+#[allow(clippy::enum_variant_names)]
 pub enum ErrorKind {
     Varlink_Error,
     VarlinkReply_Error,

diff --git a/varlink_parser/src/format.rs b/varlink_parser/src/format.rs
@@ -354,15 +354,15 @@ impl<'a> Format for IDL<'a> {
         let mut f = String::new();
 
         if !self.doc.is_empty() {
-            f += &self.doc;
+            f += self.doc;
             f += "\n";
         }
         f += &format!("{} {}\n", "interface", self.name);
 
         for t in self.typedef_keys.iter().map(|k| &self.typedefs[k]) {
             f += "\n";
             if !t.doc.is_empty() {
-                f += &t.doc;
+                f += t.doc;
                 f += "\n";
             }
 
@@ -372,7 +372,7 @@ impl<'a> Format for IDL<'a> {
         for m in self.method_keys.iter().map(|k| &self.methods[k]) {
             f += "\n";
             if !m.doc.is_empty() {
-                f += &m.doc;
+                f += m.doc;
                 f += "\n";
             }
 
@@ -389,7 +389,7 @@ impl<'a> Format for IDL<'a> {
         for t in self.error_keys.iter().map(|k| &self.errors[k]) {
             f += "\n";
             if !t.doc.is_empty() {
-                f += &t.doc;
+                f += t.doc;
                 f += "\n";
             }