From d726750464ab36c87df5bb1bc4047ffd35e945e2 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 6 Dec 2021 16:44:47 +0100 Subject: [PATCH] fix(varlink_parser): clippy Signed-off-by: Harald Hoyer --- examples/example/src/main.rs | 2 +- examples/more/src/main.rs | 2 +- examples/more/src/org_example_more.rs | 1 + examples/ping/src/main.rs | 6 +++--- examples/ping/src/org_example_ping.rs | 1 + varlink-certification/src/main.rs | 2 +- varlink-cli/src/main.rs | 7 ++++--- varlink/src/lib.rs | 3 +-- varlink_generator/src/bin/varlink-rust-generator.rs | 2 +- varlink_generator/src/lib.rs | 9 ++++----- varlink_generator/tests/org.example.complex.rs_out | 1 + varlink_parser/src/format.rs | 8 ++++---- 12 files changed, 23 insertions(+), 21 deletions(-) diff --git a/examples/example/src/main.rs b/examples/example/src/main.rs index 605ae4e..e7ad6a0 100644 --- 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 index a3c325a..374f818 100644 --- 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 index b775839..06ce03b 100644 --- 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 index a1681ba..474159e 100644 --- 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 index ba77bfe..7df2114 100644 --- 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 index 97424f6..0e1ab38 100644 --- 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 index 5abc9b1..bd17d81 100644 --- 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(¶meters, 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 index 5a30d4f..47eea88 100644 --- 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> = Vec::new(); - ifnames.push("org.varlink.service".into()); + let mut ifnames: Vec> = 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 index ffedfc6..1235e0b 100644 --- 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> { 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 index ead222e..02782d0 100644 --- 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 { 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, field_names: &mut Vec, anot: &mut Vec, @@ -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 index 988344b..64a608e 100644 --- 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 index a60fe3d..f3dcf4d 100644 --- a/varlink_parser/src/format.rs +++ b/varlink_parser/src/format.rs @@ -354,7 +354,7 @@ 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); @@ -362,7 +362,7 @@ impl<'a> Format for IDL<'a> { 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"; }