From 2902cef041d49ca72ca230feaa841b4f04736c39 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Wed, 8 May 2024 16:48:05 +0200 Subject: [PATCH] chore: address clippy warnings Signed-off-by: Roman Volosatovs --- src/bin/wit-bindgen-wrpc.rs | 12 ++-- src/bin/wrpc-keyvalue-nats.rs | 8 +-- tests/common/mod.rs | 2 +- tests/rust.rs | 118 +++++++++++++++++----------------- 4 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/bin/wit-bindgen-wrpc.rs b/src/bin/wit-bindgen-wrpc.rs index e652112b..2a0491f3 100644 --- a/src/bin/wit-bindgen-wrpc.rs +++ b/src/bin/wit-bindgen-wrpc.rs @@ -6,7 +6,7 @@ use wit_bindgen_core::{wit_parser, Files, WorldGenerator}; use wit_parser::Resolve; /// Helper for passing VERSION to opt. -/// If CARGO_VERSION_INFO is set, use it, otherwise use CARGO_PKG_VERSION. +/// If `CARGO_VERSION_INFO` is set, use it, otherwise use `CARGO_PKG_VERSION`. fn version() -> &'static str { option_env!("CARGO_VERSION_INFO").unwrap_or(env!("CARGO_PKG_VERSION")) } @@ -68,10 +68,10 @@ fn main() -> Result<()> { Some(path) => path.join(name), None => name.into(), }; - println!("Generating {:?}", dst); + println!("Generating {dst:?}"); if opt.check { - let prev = std::fs::read(&dst).with_context(|| format!("failed to read {:?}", dst))?; + let prev = std::fs::read(&dst).with_context(|| format!("failed to read {dst:?}"))?; if prev != contents { // The contents differ. If it looks like textual contents, do a // line-by-line comparison so that we can tell users what the @@ -96,9 +96,9 @@ fn main() -> Result<()> { if let Some(parent) = dst.parent() { std::fs::create_dir_all(parent) - .with_context(|| format!("failed to create {:?}", parent))?; + .with_context(|| format!("failed to create {parent:?}"))?; } - std::fs::write(&dst, contents).with_context(|| format!("failed to write {:?}", dst))?; + std::fs::write(&dst, contents).with_context(|| format!("failed to write {dst:?}"))?; } Ok(()) @@ -120,5 +120,5 @@ fn gen_world( #[test] fn verify_cli() { use clap::CommandFactory; - Opt::command().debug_assert() + Opt::command().debug_assert(); } diff --git a/src/bin/wrpc-keyvalue-nats.rs b/src/bin/wrpc-keyvalue-nats.rs index bacbce9f..6ac43e21 100644 --- a/src/bin/wrpc-keyvalue-nats.rs +++ b/src/bin/wrpc-keyvalue-nats.rs @@ -76,13 +76,13 @@ async fn main() -> anyhow::Result<()> { bindings::wrpc::keyvalue::store::set(&wrpc, &bucket, &key, &buf) .await .context("failed to invoke `wrpc:keyvalue/store.set`")? - .context("`wrpc:keyvalue/store.set` failed")? + .context("`wrpc:keyvalue/store.set` failed")?; } Operation::StoreDelete { bucket, key } => { bindings::wrpc::keyvalue::store::delete(&wrpc, &bucket, &key) .await .context("failed to invoke `wrpc:keyvalue/store.delete`")? - .context("`wrpc:keyvalue/store.delete` failed")? + .context("`wrpc:keyvalue/store.delete` failed")?; } Operation::StoreExists { bucket, key } => { let ok = bindings::wrpc::keyvalue::store::exists(&wrpc, &bucket, &key) @@ -90,9 +90,9 @@ async fn main() -> anyhow::Result<()> { .context("failed to invoke `wrpc:keyvalue/store.exists`")? .context("`wrpc:keyvalue/store.exists` failed")?; if !ok { - println!("false") + println!("false"); } else { - println!("true") + println!("true"); } } Operation::StoreListKeys { bucket, cursor } => { diff --git a/tests/common/mod.rs b/tests/common/mod.rs index a0dc3545..b3c2c10e 100644 --- a/tests/common/mod.rs +++ b/tests/common/mod.rs @@ -15,7 +15,7 @@ use tokio::{select, spawn}; static INIT: OnceCell<()> = OnceCell::const_new(); async fn init_log() { - wrpc_cli::tracing::init() + wrpc_cli::tracing::init(); } pub async fn init() { diff --git a/tests/rust.rs b/tests/rust.rs index 7dd0040f..e7635b83 100644 --- a/tests/rust.rs +++ b/tests/rust.rs @@ -162,12 +162,12 @@ async fn rust_bindgen() -> anyhow::Result<()> { Ok(( 0xfe, 0xfeff, - 0xfeffffff, - 0xfeffffffffffffff, + 0xfeff_ffff, + 0xfeff_ffff_ffff_ffff, 0x7e, 0x7eff, - 0x7effffff, - 0x7effffffffffffff, + 0x7eff_ffff, + 0x7eff_ffff_ffff_ffff, 0.42, 0.4242, )) @@ -258,12 +258,12 @@ async fn rust_bindgen() -> anyhow::Result<()> { assert_eq!(v, ( 0xfe, 0xfeff, - 0xfeffffff, - 0xfeffffffffffffff, + 0xfeff_ffff, + 0xfeff_ffff_ffff_ffff, 0x7e, 0x7eff, - 0x7effffff, - 0x7effffffffffffff, + 0x7eff_ffff, + 0x7eff_ffff_ffff_ffff, 0.42, 0.4242, )); @@ -395,12 +395,12 @@ async fn rust_dynamic() -> anyhow::Result<()> { Value::Bool(true), Value::U8(0xfe), Value::U16(0xfeff), - Value::U32(0xfeffffff), - Value::U64(0xfeffffffffffffff), + Value::U32(0xfeff_ffff), + Value::U64(0xfeff_ffff_ffff_ffff), Value::S8(0x7e), Value::S16(0x7eff), - Value::S32(0x7effffff), - Value::S64(0x7effffffffffffff), + Value::S32(0x7eff_ffff), + Value::S64(0x7eff_ffff_ffff_ffff), Value::F32(0.42), Value::F64(0.4242), Value::Char('a'), @@ -415,35 +415,35 @@ async fn rust_dynamic() -> anyhow::Result<()> { Value::Bool(true), Value::U8(0xfe), Value::U16(0xfeff), - Value::U32(0xfeffffff), - Value::U64(0xfeffffffffffffff), + Value::U32(0xfeff_ffff), + Value::U64(0xfeff_ffff_ffff_ffff), Value::S8(0x7e), Value::S16(0x7eff), - Value::S32(0x7effffff), - Value::S64(0x7effffffffffffff), + Value::S32(0x7eff_ffff), + Value::S64(0x7eff_ffff_ffff_ffff), Value::F32(0.42), Value::F64(0.4242), Value::Char('a'), Value::String("test".into()), Value::Enum(0xfeff), - Value::Flags(0xdeadbeef), + Value::Flags(0xdead_beef), ]), Value::Tuple(vec![ Value::Bool(true), Value::U8(0xfe), Value::U16(0xfeff), - Value::U32(0xfeffffff), - Value::U64(0xfeffffffffffffff), + Value::U32(0xfeff_ffff), + Value::U64(0xfeff_ffff_ffff_ffff), Value::S8(0x7e), Value::S16(0x7eff), - Value::S32(0x7effffff), - Value::S64(0x7effffffffffffff), + Value::S32(0x7eff_ffff), + Value::S64(0x7eff_ffff_ffff_ffff), Value::F32(0.42), Value::F64(0.4242), Value::Char('a'), Value::String("test".into()), Value::Enum(0xfeff), - Value::Flags(0xdeadbeef), + Value::Flags(0xdead_beef), ]), Value::Variant { discriminant: 0, @@ -456,18 +456,18 @@ async fn rust_dynamic() -> anyhow::Result<()> { Value::Enum(0xfeff), Value::Option(Some(Box::new(Value::Bool(true)))), Value::Result(Ok(Some(Box::new(Value::Bool(true))))), - Value::Flags(0xdeadbeef), + Value::Flags(0xdead_beef), ], vec![ Value::Bool(true), Value::U8(0xfe), Value::U16(0xfeff), - Value::U32(0xfeffffff), - Value::U64(0xfeffffffffffffff), + Value::U32(0xfeff_ffff), + Value::U64(0xfeff_ffff_ffff_ffff), Value::S8(0x7e), Value::S16(0x7eff), - Value::S32(0x7effffff), - Value::S64(0x7effffffffffffff), + Value::S32(0x7eff_ffff), + Value::S64(0x7eff_ffff_ffff_ffff), Value::F32(0.42), Value::F64(0.4242), Value::Char('a'), @@ -482,35 +482,35 @@ async fn rust_dynamic() -> anyhow::Result<()> { Value::Bool(true), Value::U8(0xfe), Value::U16(0xfeff), - Value::U32(0xfeffffff), - Value::U64(0xfeffffffffffffff), + Value::U32(0xfeff_ffff), + Value::U64(0xfeff_ffff_ffff_ffff), Value::S8(0x7e), Value::S16(0x7eff), - Value::S32(0x7effffff), - Value::S64(0x7effffffffffffff), + Value::S32(0x7eff_ffff), + Value::S64(0x7eff_ffff_ffff_ffff), Value::F32(0.42), Value::F64(0.4242), Value::Char('a'), Value::String("test".into()), Value::Enum(0xfeff), - Value::Flags(0xdeadbeef), + Value::Flags(0xdead_beef), ]), Value::Tuple(vec![ Value::Bool(true), Value::U8(0xfe), Value::U16(0xfeff), - Value::U32(0xfeffffff), - Value::U64(0xfeffffffffffffff), + Value::U32(0xfeff_ffff), + Value::U64(0xfeff_ffff_ffff_ffff), Value::S8(0x7e), Value::S16(0x7eff), - Value::S32(0x7effffff), - Value::S64(0x7effffffffffffff), + Value::S32(0x7eff_ffff), + Value::S64(0x7eff_ffff_ffff_ffff), Value::F32(0.42), Value::F64(0.4242), Value::Char('a'), Value::String("test".into()), Value::Enum(0xfeff), - Value::Flags(0xdeadbeef), + Value::Flags(0xdead_beef), ]), Value::Variant { discriminant: 0, @@ -523,7 +523,7 @@ async fn rust_dynamic() -> anyhow::Result<()> { Value::Enum(0xfeff), Value::Option(Some(Box::new(Value::Bool(true)))), Value::Result(Ok(Some(Box::new(Value::Bool(true))))), - Value::Flags(0xdeadbeef), + Value::Flags(0xdead_beef), ], ) .await @@ -543,13 +543,13 @@ async fn rust_dynamic() -> anyhow::Result<()> { )); assert!(matches!( values.next().unwrap(), - (Value::U32(0xfeffffff), Value::U32(0xfeffffff)) + (Value::U32(0xfeff_ffff), Value::U32(0xfeff_ffff)) )); assert!(matches!( values.next().unwrap(), ( - Value::U64(0xfeffffffffffffff), - Value::U64(0xfeffffffffffffff) + Value::U64(0xfeff_ffff_ffff_ffff), + Value::U64(0xfeff_ffff_ffff_ffff) ) )); assert!(matches!( @@ -562,13 +562,13 @@ async fn rust_dynamic() -> anyhow::Result<()> { )); assert!(matches!( values.next().unwrap(), - (Value::S32(0x7effffff), Value::S32(0x7effffff)) + (Value::S32(0x7eff_ffff), Value::S32(0x7eff_ffff)) )); assert!(matches!( values.next().unwrap(), ( - Value::S64(0x7effffffffffffff), - Value::S64(0x7effffffffffffff) + Value::S64(0x7eff_ffff_ffff_ffff), + Value::S64(0x7eff_ffff_ffff_ffff) ) )); assert!(matches!( @@ -628,13 +628,13 @@ async fn rust_dynamic() -> anyhow::Result<()> { )); assert!(matches!( values.next().unwrap(), - (Value::U32(0xfeffffff), Value::U32(0xfeffffff)) + (Value::U32(0xfeff_ffff), Value::U32(0xfeff_ffff)) )); assert!(matches!( values.next().unwrap(), ( - Value::U64(0xfeffffffffffffff), - Value::U64(0xfeffffffffffffff) + Value::U64(0xfeff_ffff_ffff_ffff), + Value::U64(0xfeff_ffff_ffff_ffff) ) )); assert!(matches!( @@ -647,13 +647,13 @@ async fn rust_dynamic() -> anyhow::Result<()> { )); assert!(matches!( values.next().unwrap(), - (Value::S32(0x7effffff), Value::S32(0x7effffff)) + (Value::S32(0x7eff_ffff), Value::S32(0x7eff_ffff)) )); assert!(matches!( values.next().unwrap(), ( - Value::S64(0x7effffffffffffff), - Value::S64(0x7effffffffffffff) + Value::S64(0x7eff_ffff_ffff_ffff), + Value::S64(0x7eff_ffff_ffff_ffff) ) )); assert!(matches!( @@ -678,7 +678,7 @@ async fn rust_dynamic() -> anyhow::Result<()> { )); assert!(matches!( values.next().unwrap(), - (Value::Flags(0xdeadbeef), Value::Flags(0xdeadbeef)) + (Value::Flags(0xdead_beef), Value::Flags(0xdead_beef)) )); } let (Value::Tuple(p), Value::Tuple(r)) = values.next().unwrap() else { @@ -700,13 +700,13 @@ async fn rust_dynamic() -> anyhow::Result<()> { )); assert!(matches!( values.next().unwrap(), - (Value::U32(0xfeffffff), Value::U32(0xfeffffff)) + (Value::U32(0xfeff_ffff), Value::U32(0xfeff_ffff)) )); assert!(matches!( values.next().unwrap(), ( - Value::U64(0xfeffffffffffffff), - Value::U64(0xfeffffffffffffff) + Value::U64(0xfeff_ffff_ffff_ffff), + Value::U64(0xfeff_ffff_ffff_ffff) ) )); assert!(matches!( @@ -719,13 +719,13 @@ async fn rust_dynamic() -> anyhow::Result<()> { )); assert!(matches!( values.next().unwrap(), - (Value::S32(0x7effffff), Value::S32(0x7effffff)) + (Value::S32(0x7eff_ffff), Value::S32(0x7eff_ffff)) )); assert!(matches!( values.next().unwrap(), ( - Value::S64(0x7effffffffffffff), - Value::S64(0x7effffffffffffff) + Value::S64(0x7eff_ffff_ffff_ffff), + Value::S64(0x7eff_ffff_ffff_ffff) ) )); assert!(matches!( @@ -750,7 +750,7 @@ async fn rust_dynamic() -> anyhow::Result<()> { )); assert!(matches!( values.next().unwrap(), - (Value::Flags(0xdeadbeef), Value::Flags(0xdeadbeef)) + (Value::Flags(0xdead_beef), Value::Flags(0xdead_beef)) )); } assert!(matches!( @@ -793,7 +793,7 @@ async fn rust_dynamic() -> anyhow::Result<()> { )); assert!(matches!( values.next().unwrap(), - (Value::Flags(0xdeadbeef), Value::Flags(0xdeadbeef)) + (Value::Flags(0xdead_beef), Value::Flags(0xdead_beef)) )); let async_tuple_type = vec![