From 7cf3e9de18c47963b64e4530a30b37a261fb6dc5 Mon Sep 17 00:00:00 2001 From: Adrian Wozniak Date: Fri, 20 Dec 2019 20:49:40 +0100 Subject: [PATCH] Fix formatting and clippy warnings --- rider-config/src/config.rs | 3 +-- rider-config/src/directories.rs | 2 +- rider-editor/src/main.rs | 2 +- rider-editor/src/ui/modal/settings.rs | 25 +++++++++++-------------- rider-generator/src/themes.rs | 2 +- 5 files changed, 15 insertions(+), 19 deletions(-) diff --git a/rider-config/src/config.rs b/rider-config/src/config.rs index 4586361..0a8b1ef 100644 --- a/rider-config/src/config.rs +++ b/rider-config/src/config.rs @@ -101,7 +101,7 @@ impl Config { impl Config { pub fn load_theme(&self, theme_name: String) -> Theme { let home_dir = dirs::config_dir().unwrap(); - let mut config_dir = home_dir.clone(); + let mut config_dir = home_dir; config_dir.push("rider"); fs::create_dir_all(&config_dir) .unwrap_or_else(|_| panic!("Cannot create config directory")); @@ -238,5 +238,4 @@ mod test_getters { expected.sort(); assert_eq!(result, expected); } - } diff --git a/rider-config/src/directories.rs b/rider-config/src/directories.rs index 7091c2a..1b2abe0 100644 --- a/rider-config/src/directories.rs +++ b/rider-config/src/directories.rs @@ -74,7 +74,7 @@ pub fn project_dir() -> PathBuf { #[cfg_attr(tarpaulin, skip)] pub fn binaries_directory() -> Result { let mut exec_dir = PathBuf::new(); - exec_dir.push(dirs::executable_dir().unwrap().clone()); + exec_dir.push(dirs::executable_dir().unwrap()); let mut rider_editor = exec_dir.clone(); rider_editor.push("rider-editor"); if rider_editor.exists() { diff --git a/rider-editor/src/main.rs b/rider-editor/src/main.rs index b4f2cd0..0f877fd 100644 --- a/rider-editor/src/main.rs +++ b/rider-editor/src/main.rs @@ -29,7 +29,7 @@ fn init_logger(directories: &Directories) { let mut log_file_path = directories.log_dir.clone(); log_file_path.push("rider.log"); - let mut outputs: Vec> = vec![WriteLogger::new( + let mut outputs: Vec> = vec![WriteLogger::new( LevelFilter::Info, Config::default(), File::create(log_file_path).unwrap(), diff --git a/rider-editor/src/ui/modal/settings.rs b/rider-editor/src/ui/modal/settings.rs index 0ba9f60..4841b74 100644 --- a/rider-editor/src/ui/modal/settings.rs +++ b/rider-editor/src/ui/modal/settings.rs @@ -1,7 +1,7 @@ use crate::app::UpdateResult as UR; use crate::renderer::renderer::Renderer; +use crate::ui::RenderContext as RC; use crate::ui::*; -use crate::ui::{RenderContext as RC, UpdateContext as UC}; use rider_config::ConfigAccess; use rider_config::ConfigHolder; use sdl2::pixels::Color; @@ -53,8 +53,8 @@ impl Settings { font_value: Label::new(c.editor_config().font_path().clone(), config.clone()), character_size_label: Label::new("Character size".into(), config.clone()), character_size_value: Label::new( - format!("{}", c.editor_config().character_size()).to_owned(), - config.clone() + format!("{}", c.editor_config().character_size()).to_owned(), + config.clone(), ), config: config.clone(), } @@ -127,10 +127,7 @@ impl Settings { renderer, &RC::ParentPosition( self.render_start_point() - + Point::new( - CONTENT_MARGIN_LEFT + LABEL_WIDTH, - CONTENT_MARGIN_TOP, - ) + + Point::new(CONTENT_MARGIN_LEFT + LABEL_WIDTH, CONTENT_MARGIN_TOP) + self.scroll(), ), ); @@ -142,9 +139,9 @@ impl Settings { &RC::ParentPosition( self.render_start_point() + Point::new( - CONTENT_MARGIN_LEFT, - CONTENT_MARGIN_TOP + self.font_label.dest().height() as i32 - ) + CONTENT_MARGIN_LEFT, + CONTENT_MARGIN_TOP + self.font_label.dest().height() as i32, + ) + self.scroll(), ), ); @@ -154,8 +151,8 @@ impl Settings { &RC::ParentPosition( self.render_start_point() + Point::new( - CONTENT_MARGIN_LEFT + LABEL_WIDTH, - CONTENT_MARGIN_TOP + self.font_label.dest().height() as i32, + CONTENT_MARGIN_LEFT + LABEL_WIDTH, + CONTENT_MARGIN_TOP + self.font_label.dest().height() as i32, ) + self.scroll(), ), @@ -181,12 +178,12 @@ impl Settings { impl ClickHandler for Settings { #[inline] - fn on_left_click(&mut self, _point: &Point, context: &UpdateContext) -> UR { + fn on_left_click(&mut self, _point: &Point, _context: &UpdateContext) -> UR { UR::NoOp } #[inline] - fn is_left_click_target(&self, _point: &Point, context: &UpdateContext) -> bool { + fn is_left_click_target(&self, _point: &Point, _context: &UpdateContext) -> bool { false } } diff --git a/rider-generator/src/themes.rs b/rider-generator/src/themes.rs index 92b2e03..dd67122 100644 --- a/rider-generator/src/themes.rs +++ b/rider-generator/src/themes.rs @@ -17,7 +17,7 @@ fn write_theme(theme: &Theme, directories: &Directories) -> std::io::Result<()> theme_path.push(directories.themes_dir.clone()); theme_path.push(format!("{}.json", theme.name())); let contents = serde_json::to_string_pretty(&theme).unwrap(); - fs::write(&theme_path, contents.clone())?; + fs::write(&theme_path, contents)?; Ok(()) }