From ac8bc7d8b5bef261cf2e3af7de81de48c2bcf36a Mon Sep 17 00:00:00 2001 From: "ay9thqi3tbqiwbegqsg a[soiaosshasdg" <30902201+alx365@users.noreply.github.com> Date: Sat, 14 Nov 2020 16:57:50 +0000 Subject: [PATCH] Fix a few clippy warnings (#59) --- src/app.rs | 1 - src/config/xml_ext.rs | 4 ++-- src/main.rs | 18 ++++++++---------- src/opts.rs | 4 +--- src/script_var_handler.rs | 4 ++-- src/server.rs | 8 +++----- src/util.rs | 1 - src/value/attr_value.rs | 28 +++++++++++++--------------- src/value/primitive.rs | 3 +-- src/widgets/mod.rs | 10 ++++++---- src/widgets/widget_definitions.rs | 1 - 11 files changed, 36 insertions(+), 46 deletions(-) diff --git a/src/app.rs b/src/app.rs index d3eeedb..b680f38 100644 --- a/src/app.rs +++ b/src/app.rs @@ -7,7 +7,6 @@ use crate::{ widgets, }; use anyhow::*; -use crossbeam_channel; use debug_stub_derive::*; use gdk::WindowExt; use gtk::{ContainerExt, CssProviderExt, GtkWindowExt, StyleContextExt, WidgetExt}; diff --git a/src/config/xml_ext.rs b/src/config/xml_ext.rs index 3635f4f..0d14413 100644 --- a/src/config/xml_ext.rs +++ b/src/config/xml_ext.rs @@ -86,7 +86,7 @@ impl<'a, 'b> XmlNode<'a, 'b> { match self { XmlNode::Text(x) => x.0, XmlNode::Element(x) => x.0, - XmlNode::Ignored(x) => x.clone(), + XmlNode::Ignored(x) => *x, } } } @@ -123,7 +123,7 @@ impl<'a, 'b> fmt::Display for XmlElement<'a, 'b> { .map(|x| x.lines().map(|line| format!(" {}", line)).join("\n")) .join("\n"); - if children.len() == 0 { + if children.is_empty() { write!(f, "{}", self.as_tag_string(), self.tag_name()) } else { write!(f, "{}\n{}\n", self.as_tag_string(), children, self.tag_name()) diff --git a/src/main.rs b/src/main.rs index fd1dc14..e4d58f5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -10,8 +10,6 @@ extern crate gtk; use anyhow::*; -use log; -use pretty_env_logger; use std::{os::unix::net, path::PathBuf}; use structopt::StructOpt; @@ -33,12 +31,12 @@ lazy_static::lazy_static! { .join("eww-server"); pub static ref CONFIG_DIR: std::path::PathBuf = std::env::var("XDG_CONFIG_HOME") - .map(|v| PathBuf::from(v)) + .map(PathBuf::from) .unwrap_or_else(|_| PathBuf::from(std::env::var("HOME").unwrap()).join(".config")) .join("eww"); pub static ref LOG_FILE: std::path::PathBuf = std::env::var("XDG_CACHE_HOME") - .map(|v| PathBuf::from(v)) + .map(PathBuf::from) .unwrap_or_else(|_| PathBuf::from(std::env::var("HOME").unwrap()).join(".cache")) .join("eww.log"); } @@ -56,14 +54,14 @@ fn main() { opts::Action::WithServer(action) => { log::info!("Trying to find server process"); if let Ok(stream) = net::UnixStream::connect(&*IPC_SOCKET_PATH) { + client::forward_command_to_server(stream, action).context("Error while forwarding command to server")?; + } else if action.needs_server_running() { + println!("No eww server running"); + } else { - if action.needs_server_running() { - println!("No eww server running"); - } else { - log::info!("No server running, initializing server..."); - server::initialize_server(opts.should_detach, action)?; - } + log::info!("No server running, initializing server..."); + server::initialize_server(opts.should_detach, action)?; } } } diff --git a/src/opts.rs b/src/opts.rs index 5de2963..841c418 100644 --- a/src/opts.rs +++ b/src/opts.rs @@ -93,9 +93,7 @@ fn parse_var_update_arg(s: &str) -> Result<(VarName, PrimitiveValue)> { impl ActionWithServer { pub fn into_eww_command(self) -> (app::EwwCommand, Option>) { let command = match self { - ActionWithServer::Update { mappings } => { - app::EwwCommand::UpdateVars(mappings.into_iter().map(|x| x.into()).collect()) - } + ActionWithServer::Update { mappings } => app::EwwCommand::UpdateVars(mappings.into_iter().collect()), ActionWithServer::OpenWindow { window_name, pos, diff --git a/src/script_var_handler.rs b/src/script_var_handler.rs index 509fc74..f2da059 100644 --- a/src/script_var_handler.rs +++ b/src/script_var_handler.rs @@ -10,9 +10,9 @@ use crate::{ }; use anyhow::*; use app::EwwCommand; + +use itertools::Itertools; use dashmap::DashMap; -use glib; -use scheduled_executor; use std::io::BufRead; use self::script_var_process::ScriptVarProcess; diff --git a/src/server.rs b/src/server.rs index 4984e8c..8b67fb7 100644 --- a/src/server.rs +++ b/src/server.rs @@ -1,6 +1,5 @@ use crate::{app, config, eww_state::*, opts, script_var_handler, try_logging_errors, util}; use anyhow::*; -use log; use std::{ collections::HashMap, io::Write, @@ -25,8 +24,7 @@ pub fn initialize_server(should_detach: bool, action: opts::ActionWithServer) -> let config_dir = config_file_path .parent() .context("config file did not have a parent?!")? - .to_owned() - .to_path_buf(); + .to_owned(); let scss_file_path = config_dir.join("eww.scss"); log::info!("reading configuration from {:?}", &config_file_path); @@ -39,7 +37,7 @@ pub fn initialize_server(should_detach: bool, action: opts::ActionWithServer) -> let script_var_handler = script_var_handler::ScriptVarHandler::new(evt_send.clone())?; let mut app = app::App { - eww_state: EwwState::from_default_vars(eww_config.generate_initial_state()?.clone()), + eww_state: EwwState::from_default_vars(eww_config.generate_initial_state()?), eww_config, windows: HashMap::new(), css_provider: gtk::CssProvider::new(), @@ -68,7 +66,7 @@ pub fn initialize_server(should_detach: bool, action: opts::ActionWithServer) -> } run_server_thread(evt_send.clone())?; - let _hotwatch = run_filewatch_thread(&config_file_path, &scss_file_path, evt_send.clone())?; + let _hotwatch = run_filewatch_thread(&config_file_path, &scss_file_path, evt_send)?; evt_recv.attach(None, move |msg| { app.handle_command(msg); diff --git a/src/util.rs b/src/util.rs index a6afd1f..19e69e0 100644 --- a/src/util.rs +++ b/src/util.rs @@ -1,6 +1,5 @@ use anyhow::*; use extend::ext; -use grass; use itertools::Itertools; use std::path::Path; diff --git a/src/value/attr_value.rs b/src/value/attr_value.rs index 6838bf4..d87c314 100644 --- a/src/value/attr_value.rs +++ b/src/value/attr_value.rs @@ -86,28 +86,26 @@ impl AttrValue { curly_count = 2; varref.push(c); } - } else { - if c == '{' { - curly_count += 1; - if curly_count == 2 { - if !cur_word.is_empty() { - elements.push(AttrValueElement::primitive(std::mem::take(&mut cur_word))); - } - cur_varref = Some(String::new()) + } else if c == '{' { + curly_count += 1; + if curly_count == 2 { + if !cur_word.is_empty() { + elements.push(AttrValueElement::primitive(std::mem::take(&mut cur_word))); } - } else { - if curly_count == 1 { - cur_word.push('{'); - } - curly_count = 0; - cur_word.push(c); + cur_varref = Some(String::new()) } + } else { + if curly_count == 1 { + cur_word.push('{'); + } + curly_count = 0; + cur_word.push(c); } } if let Some(unfinished_varref) = cur_varref.take() { elements.push(AttrValueElement::primitive(unfinished_varref)); } else if !cur_word.is_empty() { - elements.push(AttrValueElement::primitive(cur_word.to_owned())); + elements.push(AttrValueElement::primitive(cur_word)); } AttrValue(elements) } diff --git a/src/value/primitive.rs b/src/value/primitive.rs index 9961cf0..9dd6ba2 100644 --- a/src/value/primitive.rs +++ b/src/value/primitive.rs @@ -1,5 +1,4 @@ use anyhow::*; -use derive_more; use itertools::Itertools; use serde::{Deserialize, Serialize}; use std::{convert::TryFrom, fmt, iter::FromIterator}; @@ -63,7 +62,7 @@ impl From<&str> for PrimitiveValue { impl PrimitiveValue { pub fn from_string(s: String) -> Self { - PrimitiveValue(s.to_string()) + PrimitiveValue(s) } pub fn into_inner(self) -> String { diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs index daaf13b..2f984a0 100644 --- a/src/widgets/mod.rs +++ b/src/widgets/mod.rs @@ -146,10 +146,12 @@ fn build_builtin_gtk_widget( } } - gtk_widget.dynamic_cast_ref().map(|w| resolve_range_attrs(&mut bargs, &w)); - gtk_widget - .dynamic_cast_ref() - .map(|w| resolve_orientable_attrs(&mut bargs, &w)); + if let Some(w) = gtk_widget.dynamic_cast_ref() { + resolve_range_attrs(&mut bargs, &w) + } + if let Some(w) = gtk_widget.dynamic_cast_ref() { + resolve_orientable_attrs(&mut bargs, &w) + }; resolve_widget_attrs(&mut bargs, >k_widget); if !bargs.unhandled_attrs.is_empty() { diff --git a/src/widgets/widget_definitions.rs b/src/widgets/widget_definitions.rs index a9d26b2..056add6 100644 --- a/src/widgets/widget_definitions.rs +++ b/src/widgets/widget_definitions.rs @@ -1,7 +1,6 @@ use super::{run_command, BuilderArgs}; use crate::{config, eww_state, resolve_block, value::AttrValue}; use anyhow::*; -use gdk_pixbuf; use gtk::{prelude::*, ImageExt}; use std::{cell::RefCell, rc::Rc};