chore: Additional clippy lints and formatting

Cargo.toml

@@ -82,11 +82,20 @@ tempfile = { version = "3.12.0", default-features = false }
 [lints.rust]
 rust-2018-idioms = "warn"
 unreachable_pub = "warn"
+unused_qualifications = "warn"
 
 [lints.clippy]
+assigning_clones = "warn"
 doc_markdown = "warn"
+format_push_string = "warn"
 needless_pass_by_value = "warn"
+ptr_as_ptr = "warn"
+redundant_clone = "warn"
 redundant_closure_for_method_calls = "warn"
 semicolon_if_nothing_returned = "warn"
+undocumented_unsafe_blocks = "warn"
+uninlined_format_args = "warn"
+unnecessary_box_returns = "warn"
+unnecessary_safety_doc = "warn"
 unwrap_used = "warn"
 wildcard_imports = "warn"

src/add.rs

@@ -3,27 +3,24 @@
 // Doc comments are used to generate --help, not to for rustdoc.
 #![allow(clippy::doc_markdown)]
 
-use std::fs::File;
-use std::io::Write;
-
+use crate::config;
+use crate::utils::Chezmoi;
+use crate::utils::ChezmoiVersion;
+use crate::utils::CHEZMOI_AUTO_SOURCE_VERSION;
 use anyhow::anyhow;
 use anyhow::Context;
 use camino::Utf8Path;
 use camino::Utf8PathBuf;
 use indoc::formatdoc;
+use ini_merge::filter::filter_ini;
+use std::fs::File;
+use std::io::Write;
 use strum::Display;
 use strum::EnumIter;
 use strum::EnumMessage;
 use strum::EnumString;
 use strum::IntoStaticStr;
 
-use ini_merge::filter::filter_ini;
-
-use crate::config;
-use crate::utils::Chezmoi;
-use crate::utils::ChezmoiVersion;
-use crate::utils::CHEZMOI_AUTO_SOURCE_VERSION;
-
 #[cfg(test)]
 mod tests;
 

src/add/tests.rs

@@ -16,6 +16,11 @@
 //! | Existing (modify_)    | Normal  | Update data file               |
 //! | Existing (modify_)    | Smart   | Update data file               |
 
+use super::internal_filter;
+use crate::utils::Chezmoi;
+use crate::utils::ChezmoiVersion;
+use crate::utils::CHEZMOI_AUTO_SOURCE_VERSION;
+use crate::Style;
 use camino::Utf8Path;
 use camino::Utf8PathBuf;
 use indoc::indoc;
@@ -24,13 +29,6 @@ use pretty_assertions::assert_eq;
 use tempfile::tempdir;
 use tempfile::TempDir;
 
-use crate::utils::Chezmoi;
-use crate::utils::ChezmoiVersion;
-use crate::utils::CHEZMOI_AUTO_SOURCE_VERSION;
-use crate::Style;
-
-use super::internal_filter;
-
 #[derive(Debug)]
 struct FilterTest {
     cfg: &'static str,
@@ -258,13 +256,12 @@ fn assert_nothing_added(chezmoi: &DummyChezmoi) {
 }
 
 mod versions {
+    use super::assert_nothing_added;
+    use super::DummyChezmoi;
     use crate::add::add;
     use crate::add::Mode;
     use crate::Style;
 
-    use super::assert_nothing_added;
-    use super::DummyChezmoi;
-
     #[test]
     fn check_error_on_old_chezmoi() {
         // Check that --style path errors on old chezmoi
@@ -288,14 +285,13 @@ mod versions {
 }
 
 mod path_tmpl {
-    use crate::add::add;
-    use crate::add::Mode;
-    use crate::Style;
-
     use super::assert_default_basic;
     use super::assert_default_script;
     use super::assert_unchanged_script;
     use super::DummyChezmoi;
+    use crate::add::add;
+    use crate::add::Mode;
+    use crate::Style;
 
     #[test]
     fn check_add_normal_missing() {
@@ -419,14 +415,13 @@ mod path_tmpl {
 }
 
 mod path {
-    use crate::add::add;
-    use crate::add::Mode;
-    use crate::Style;
-
     use super::assert_default_basic;
     use super::assert_default_script;
     use super::assert_unchanged_script;
     use super::DummyChezmoi;
+    use crate::add::add;
+    use crate::add::Mode;
+    use crate::Style;
 
     #[test]
     fn check_add_normal_missing() {

src/arguments.rs

@@ -3,6 +3,7 @@
 // Doc comments are used to generate --help, not to for rustdoc.
 #![allow(clippy::doc_markdown)]
 
+use crate::add::Style;
 use bpaf::short;
 use bpaf::Bpaf;
 use bpaf::Parser;
@@ -12,8 +13,6 @@ use itertools::Itertools;
 use strum::EnumMessage;
 use strum::IntoEnumIterator;
 
-use crate::add::Style;
-
 /// Parser for `--style`
 fn style() -> impl Parser<Style> {
     const DEFAULT: Style = Style::Auto;

src/config.rs

@@ -1,15 +1,11 @@
 //! Describes configuration file format
-use std::borrow::Cow;
-use std::collections::HashMap;
-use std::fmt::Debug;
-use std::str::FromStr;
-
+use self::parser::Directive;
+use self::parser::Matcher;
+use crate::transforms::Transform;
 use anyhow::anyhow;
 use anyhow::Context;
 use camino::Utf8Path;
 use camino::Utf8PathBuf;
-use winnow::Parser;
-
 use ini_merge::filter::FilterAction;
 use ini_merge::filter::FilterActions;
 use ini_merge::filter::FilterActionsBuilder;
@@ -18,11 +14,11 @@ use ini_merge::mutations::Action;
 use ini_merge::mutations::Mutations;
 use ini_merge::mutations::MutationsBuilder;
 use ini_merge::mutations::SectionAction;
-
-use crate::transforms::Transform;
-
-use self::parser::Directive;
-use self::parser::Matcher;
+use std::borrow::Cow;
+use std::collections::HashMap;
+use std::fmt::Debug;
+use std::str::FromStr;
+use winnow::Parser;
 
 mod parser;
 

src/config/parser.rs

@@ -1,6 +1,5 @@
 //! Defines the winnow parser for the config file format.
 use std::collections::HashMap;
-
 use winnow::ascii::escaped_transform;
 use winnow::ascii::space1;
 use winnow::combinator::alt;
@@ -268,11 +267,10 @@ fn quoted_string_nl(i: &mut &str) -> PResult<String> {
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use indoc::indoc;
     use pretty_assertions::assert_eq;
 
-    use super::*;
-
     #[test]
     fn check_quoted_string() {
         let (rem, out) = quoted_string.parse_peek("\"test \\\" \\\\input\"").unwrap();

src/doctor.rs

@@ -1,27 +1,24 @@
 //! Sanity checking of environment
 
-use std::env::VarError;
-use std::fs::File;
-use std::io::BufRead;
-use std::io::BufReader;
-use std::io::Write;
-use std::process::Command;
-
+use crate::utils::Chezmoi;
+use crate::utils::ChezmoiVersion;
+use crate::utils::RealChezmoi;
+use crate::utils::CHEZMOI_AUTO_SOURCE_VERSION;
 use anstream::println;
 use anstream::stdout;
 use anstyle::Effects;
 use anstyle::Reset;
 use anyhow::anyhow;
 use anyhow::Context;
 use itertools::Itertools;
-
 use medic::Check;
 use medic::CheckResult;
-
-use crate::utils::Chezmoi;
-use crate::utils::ChezmoiVersion;
-use crate::utils::RealChezmoi;
-use crate::utils::CHEZMOI_AUTO_SOURCE_VERSION;
+use std::env::VarError;
+use std::fs::File;
+use std::io::BufRead;
+use std::io::BufReader;
+use std::io::Write;
+use std::process::Command;
 
 /// Perform environment sanity check
 pub(crate) fn doctor() -> anyhow::Result<()> {

src/lib.rs

@@ -1,20 +1,17 @@
 //! This is not a stable API, and is to be used internally by the binary and
 //! the integration tests only.
 
-use std::fs::File;
-use std::io::Read;
-use std::io::Write;
-
-use anyhow::Context;
-use indoc::printdoc;
-
+use crate::utils::RealChezmoi;
+use crate::utils::CHEZMOI_AUTO_SOURCE_VERSION;
 pub use add::Style;
+use anyhow::Context;
 pub use arguments::parse_args;
 pub use arguments::ChmmArgs;
+use indoc::printdoc;
 use ini_merge::merge::merge_ini;
-
-use crate::utils::RealChezmoi;
-use crate::utils::CHEZMOI_AUTO_SOURCE_VERSION;
+use std::fs::File;
+use std::io::Read;
+use std::io::Write;
 
 mod add;
 mod arguments;

src/main.rs

@@ -5,18 +5,16 @@
 #![warn(clippy::semicolon_if_nothing_returned)]
 #![warn(clippy::wildcard_imports)]
 
-use std::io::stdin;
-use std::io::stdout;
-use std::io::BufWriter;
-use std::io::Write;
-
 use anstyle::AnsiColor;
+use chezmoi_modify_manager::inner_main;
+use chezmoi_modify_manager::parse_args;
 use env_logger::Builder;
 use env_logger::Env;
 use log::Level;
-
-use chezmoi_modify_manager::inner_main;
-use chezmoi_modify_manager::parse_args;
+use std::io::stdin;
+use std::io::stdout;
+use std::io::BufWriter;
+use std::io::Write;
 
 fn main() -> anyhow::Result<()> {
     // Set up logging

src/transforms.rs

@@ -1,14 +1,12 @@
 //! Defines supported transforms.
 
+use ini_merge::mutations::transforms as ini_transforms;
 use std::collections::HashMap;
-
 use strum::EnumIter;
 use strum::EnumMessage;
 use strum::EnumString;
 use strum::IntoStaticStr;
 
-use ini_merge::mutations::transforms as ini_transforms;
-
 #[allow(clippy::doc_markdown)]
 /// Supported transforms
 ///

src/utils.rs

@@ -1,13 +1,12 @@
 //! Some shared utility functions
 
-use std::env::VarError;
-
 use anyhow::anyhow;
 use anyhow::Context;
 use camino::Utf8Path;
 use camino::Utf8PathBuf;
 use duct::cmd;
 use regex::Regex;
+use std::env::VarError;
 
 /// Represents the version number of chezmoi
 #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]

tests/integration/data_driven.rs

@@ -1,14 +1,12 @@
 //! Data & config driven tests.
 
-use std::fs::File;
-use std::io::BufReader;
-use std::io::Read;
-
 use camino::Utf8PathBuf;
-use pretty_assertions::assert_eq;
-
 use chezmoi_modify_manager::inner_main;
 use chezmoi_modify_manager::ChmmArgs;
+use pretty_assertions::assert_eq;
+use std::fs::File;
+use std::io::BufReader;
+use std::io::Read;
 
 /// Find all the test cases
 fn find_test_cases() -> anyhow::Result<Vec<Utf8PathBuf>> {