From 3f658fde642fd558c6c39c9fe01074d3976acfe3 Mon Sep 17 00:00:00 2001 From: William G Underwood <42812654+WGUNDERWOOD@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:28:00 +0100 Subject: [PATCH] Clippy --- src/format.rs | 2 +- src/indent.rs | 2 +- src/main.rs | 4 ++-- src/read.rs | 4 +++- src/wrap.rs | 2 +- src/write.rs | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/format.rs b/src/format.rs index e797bf4..c52ed85 100644 --- a/src/format.rs +++ b/src/format.rs @@ -1,9 +1,9 @@ //! Core methodology for formatting a file +use crate::cli::*; use crate::ignore::*; use crate::indent::*; use crate::logging::*; -use crate::cli::*; use crate::regexes::{ENV_BEGIN, ENV_END, ITEM}; use crate::subs::*; use crate::verbatim::*; diff --git a/src/indent.rs b/src/indent.rs index e3b04d3..0bf63d2 100644 --- a/src/indent.rs +++ b/src/indent.rs @@ -1,10 +1,10 @@ //! Utilities for indenting source lines +use crate::cli::*; use crate::comments::*; use crate::format::*; use crate::ignore::*; use crate::logging::*; -use crate::cli::*; use crate::regexes::*; use crate::verbatim::*; use core::cmp::max; diff --git a/src/main.rs b/src/main.rs index 3620c6b..e6922e9 100644 --- a/src/main.rs +++ b/src/main.rs @@ -15,21 +15,21 @@ use clap::Parser; use std::fs; use std::process::ExitCode; +mod cli; mod comments; mod format; mod ignore; mod indent; mod logging; -mod cli; mod read; mod regexes; mod subs; mod verbatim; mod wrap; mod write; +use crate::cli::*; use crate::format::*; use crate::logging::*; -use crate::cli::*; use crate::read::*; use crate::write::*; diff --git a/src/read.rs b/src/read.rs index 79e1da2..67fd89e 100644 --- a/src/read.rs +++ b/src/read.rs @@ -1,8 +1,10 @@ +//! Utilities for reading files + use crate::logging::*; use crate::regexes::*; use log::Level::{Error, Trace}; -use std::io::Read; use std::fs; +use std::io::Read; /// Add a missing extension and read the file pub fn read(file: &str, logs: &mut Vec) -> Option<(String, String)> { diff --git a/src/wrap.rs b/src/wrap.rs index 00de13a..30ad1de 100644 --- a/src/wrap.rs +++ b/src/wrap.rs @@ -1,9 +1,9 @@ //! Utilities for wrapping long lines +use crate::cli::*; use crate::comments::*; use crate::format::*; use crate::logging::*; -use crate::cli::*; use log::Level::{Trace, Warn}; /// Check if a line needs wrapping diff --git a/src/write.rs b/src/write.rs index 4ccce81..978e0ce 100644 --- a/src/write.rs +++ b/src/write.rs @@ -1,8 +1,8 @@ //! Utilities for writing formatted files +use crate::cli::*; use crate::fs; use crate::logging::*; -use crate::cli::*; use log::Level::Error; use std::path;