From 38a44f1745cc635ff4d9e68be90ef0337d4b6cba Mon Sep 17 00:00:00 2001 From: steven-omaha <35634100+steven-omaha@users.noreply.github.com> Date: Tue, 14 Feb 2023 14:02:37 +0100 Subject: [PATCH] fix some pedantic lints --- README.md | 2 +- crates/pacdef_core/src/backend/actual/pacman.rs | 2 +- crates/pacdef_core/src/backend/actual/rust.rs | 2 +- crates/pacdef_core/src/config.rs | 5 ++--- crates/pacdef_macros/src/action.rs | 4 +--- crates/pacdef_macros/src/register.rs | 4 +--- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index f5821db..0bf02d3 100644 --- a/README.md +++ b/README.md @@ -208,4 +208,4 @@ topgrade ## TODO -none at this time +* docs diff --git a/crates/pacdef_core/src/backend/actual/pacman.rs b/crates/pacdef_core/src/backend/actual/pacman.rs index 98d88c9..1e0193c 100644 --- a/crates/pacdef_core/src/backend/actual/pacman.rs +++ b/crates/pacdef_core/src/backend/actual/pacman.rs @@ -5,7 +5,7 @@ use alpm::Alpm; use alpm::PackageReason::Explicit; use anyhow::{Context, Result}; -use crate::backend::backend_trait::*; +use crate::backend::backend_trait::{Backend, Switches, Text}; use crate::{impl_backend_constants, Group, Package}; #[derive(Debug)] diff --git a/crates/pacdef_core/src/backend/actual/rust.rs b/crates/pacdef_core/src/backend/actual/rust.rs index c825c71..b07f30c 100644 --- a/crates/pacdef_core/src/backend/actual/rust.rs +++ b/crates/pacdef_core/src/backend/actual/rust.rs @@ -6,7 +6,7 @@ use std::process::ExitStatus; use anyhow::{Context, Result}; use serde_json::Value; -use crate::backend::backend_trait::*; +use crate::backend::backend_trait::{Backend, Switches, Text}; use crate::{impl_backend_constants, Group, Package}; #[derive(Debug)] diff --git a/crates/pacdef_core/src/config.rs b/crates/pacdef_core/src/config.rs index 8991fc2..38ab5a2 100644 --- a/crates/pacdef_core/src/config.rs +++ b/crates/pacdef_core/src/config.rs @@ -25,9 +25,8 @@ impl Config { if e.kind() == ErrorKind::NotFound { println!("creating default config under {}", file.to_string_lossy()); return Self::use_default_and_save_to(file); - } else { - bail!("unexpected error occured: {e:?}"); - }; + } + bail!("unexpected error occured: {e:?}"); } let content = from_file.expect("we already handled that error"); diff --git a/crates/pacdef_macros/src/action.rs b/crates/pacdef_macros/src/action.rs index 9a76912..72082ea 100644 --- a/crates/pacdef_macros/src/action.rs +++ b/crates/pacdef_macros/src/action.rs @@ -8,9 +8,7 @@ pub fn action(input: TokenStream) -> TokenStream { let name = &input.ident; - let enum_data = if let syn::Data::Enum(enum_data) = &input.data { - enum_data - } else { + let syn::Data::Enum(enum_data) = &input.data else { panic!("`Register` can only be used on enums"); }; diff --git a/crates/pacdef_macros/src/register.rs b/crates/pacdef_macros/src/register.rs index 1b88dab..a8824e6 100644 --- a/crates/pacdef_macros/src/register.rs +++ b/crates/pacdef_macros/src/register.rs @@ -8,9 +8,7 @@ pub fn register(input: TokenStream) -> TokenStream { let name = &input.ident; - let enum_data = if let syn::Data::Enum(enum_data) = &input.data { - enum_data - } else { + let syn::Data::Enum(enum_data) = &input.data else { panic!("`Register` can only be used on enums"); };