style: Make clippy happy

Author: epage

Cargo.toml

@@ -76,16 +76,17 @@ rest_pat_in_fully_bound_structs = "warn"
 same_functions_in_if_condition = "warn"
 self_named_module_files = "warn"
 semicolon_if_nothing_returned = "warn"
-str_to_string = "warn"
-string_add = "warn"
+# str_to_string = "warn"
+# string_add = "warn"
 string_add_assign = "warn"
 string_lit_as_bytes = "warn"
-string_to_string = "warn"
+# string_to_string = "warn"
 todo = "warn"
 trait_duplication_in_bounds = "warn"
 verbose_file_reads = "warn"
-wildcard_imports = "warn"
+# wildcard_imports = "warn"
 zero_sized_map_values = "warn"
+assigning_clones = "allow"  # TODO
 
 [package]
 name = "cobalt-bin"

crates/config/src/collection.rs

@@ -8,11 +8,11 @@ use super::*;
 pub struct Collection {
     pub title: Option<liquid_core::model::KString>,
     pub description: Option<liquid_core::model::KString>,
-    pub dir: Option<crate::RelPath>,
-    pub drafts_dir: Option<crate::RelPath>,
+    pub dir: Option<RelPath>,
+    pub drafts_dir: Option<RelPath>,
     pub order: SortOrder,
-    pub rss: Option<crate::RelPath>,
-    pub jsonfeed: Option<crate::RelPath>,
+    pub rss: Option<RelPath>,
+    pub jsonfeed: Option<RelPath>,
     pub publish_date_in_filename: bool,
     pub default: Frontmatter,
 }
@@ -54,7 +54,7 @@ impl From<PageCollection> for Collection {
         });
         Self {
             default,
-            dir: Some(crate::RelPath::new()),
+            dir: Some(RelPath::new()),
             order: SortOrder::None,
             ..Default::default()
         }
@@ -78,11 +78,11 @@ pub struct PageCollection {
 pub struct PostCollection {
     pub title: Option<liquid_core::model::KString>,
     pub description: Option<liquid_core::model::KString>,
-    pub dir: crate::RelPath,
-    pub drafts_dir: Option<crate::RelPath>,
+    pub dir: RelPath,
+    pub drafts_dir: Option<RelPath>,
     pub order: SortOrder,
-    pub rss: Option<crate::RelPath>,
-    pub jsonfeed: Option<crate::RelPath>,
+    pub rss: Option<RelPath>,
+    pub jsonfeed: Option<RelPath>,
     pub publish_date_in_filename: bool,
     pub default: Frontmatter,
 }
@@ -92,7 +92,7 @@ impl Default for PostCollection {
         Self {
             title: Default::default(),
             description: Default::default(),
-            dir: crate::RelPath::from_unchecked("posts"),
+            dir: RelPath::from_unchecked("posts"),
             drafts_dir: Default::default(),
             order: Default::default(),
             rss: Default::default(),

crates/config/src/config.rs

@@ -12,12 +12,12 @@ use super::*;
 pub struct Config {
     #[serde(skip)]
     pub root: path::PathBuf,
-    pub source: crate::RelPath,
-    pub destination: crate::RelPath,
+    pub source: RelPath,
+    pub destination: RelPath,
     #[serde(skip)]
     pub abs_dest: Option<path::PathBuf>,
     pub include_drafts: bool,
-    pub default: frontmatter::Frontmatter,
+    pub default: Frontmatter,
     pub pages: PageCollection,
     pub posts: PostCollection,
     pub site: Site,
@@ -79,8 +79,8 @@ impl Config {
 
         let mut root = path;
         root.pop(); // Remove filename
-        if root == std::path::Path::new("") {
-            root = std::path::Path::new(".").to_owned();
+        if root == path::Path::new("") {
+            root = path::Path::new(".").to_owned();
         }
         config.root = root;
 
@@ -111,7 +111,7 @@ impl Config {
 }
 
 impl fmt::Display for Config {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let mut converted = serde_yaml::to_string(self).map_err(|_| fmt::Error)?;
         converted.drain(..4);
         write!(f, "{}", converted)

crates/config/src/document.rs

@@ -6,7 +6,7 @@ use crate::Status;
 
 #[derive(Debug, Eq, PartialEq, Default, Clone)]
 pub struct Document {
-    front: crate::Frontmatter,
+    front: Frontmatter,
     content: liquid_core::model::KString,
 }
 
@@ -33,7 +33,7 @@ impl Document {
 }
 
 impl fmt::Display for Document {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let front = self.front.to_string();
         if front.is_empty() {
             write!(f, "{}", self.content)

crates/config/src/frontmatter.rs

@@ -53,12 +53,12 @@ impl Frontmatter {
 
     pub fn merge_path(mut self, relpath: &relative_path::RelativePath) -> Self {
         if let Some(name) = relpath.file_name() {
-            let mut split_name = crate::path::split_ext(name);
+            let mut split_name = path::split_ext(name);
 
             #[cfg(feature = "preview_unstable")]
             if split_name.1 == Some("liquid") {
                 self.templated.get_or_insert(true);
-                split_name = crate::path::split_ext(split_name.0);
+                split_name = path::split_ext(split_name.0);
             } else {
                 self.templated.get_or_insert(false);
             }
@@ -70,19 +70,19 @@ impl Frontmatter {
             self.format.get_or_insert(format);
 
             while split_name.1.is_some() {
-                split_name = crate::path::split_ext(split_name.0);
+                split_name = path::split_ext(split_name.0);
             }
 
             if self.published_date.is_none() || self.slug.is_none() {
                 let file_stem = split_name.0;
-                let (file_date, file_stem) = crate::path::parse_file_stem(file_stem);
+                let (file_date, file_stem) = path::parse_file_stem(file_stem);
                 if self.published_date.is_none() {
                     self.published_date = file_date;
                 }
                 if self.slug.is_none() {
-                    let slug = crate::path::slugify(file_stem);
+                    let slug = path::slugify(file_stem);
                     if self.title.is_none() {
-                        self.title = Some(crate::path::titleize_slug(&slug));
+                        self.title = Some(path::titleize_slug(&slug));
                     }
                     self.slug = Some(slug);
                 }
@@ -135,7 +135,7 @@ impl Frontmatter {
 }
 
 impl fmt::Display for Frontmatter {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let converted = serde_yaml::to_string(self).expect("should always be valid");
         let subset = converted
             .strip_prefix("---")
@@ -199,7 +199,7 @@ impl Default for Permalink {
 }
 
 impl fmt::Display for Permalink {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.as_str())
     }
 }
@@ -230,13 +230,13 @@ impl ExplicitPermalink {
     }
 }
 
-impl std::fmt::Display for ExplicitPermalink {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
+impl fmt::Display for ExplicitPermalink {
+    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.0.fmt(fmt)
     }
 }
 
-impl<'s> std::convert::TryFrom<&'s str> for ExplicitPermalink {
+impl<'s> TryFrom<&'s str> for ExplicitPermalink {
     type Error = &'static str;
 
     fn try_from(value: &str) -> Result<Self, Self::Error> {
@@ -249,7 +249,7 @@ impl<'s> std::convert::TryFrom<&'s str> for ExplicitPermalink {
     }
 }
 
-impl std::convert::TryFrom<String> for ExplicitPermalink {
+impl TryFrom<String> for ExplicitPermalink {
     type Error = &'static str;
 
     fn try_from(value: String) -> Result<Self, Self::Error> {

crates/config/src/lib.rs

@@ -1,6 +1,7 @@
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![warn(clippy::print_stderr)]
 #![warn(clippy::print_stdout)]
+#![allow(clippy::self_named_module_files)] // false positive
 
 mod assets;
 mod collection;

crates/config/src/path.rs

@@ -100,12 +100,12 @@ impl<'s> PartialEq<&'s str> for RelPath {
 }
 
 impl std::fmt::Display for RelPath {
-    fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
+    fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         self.0.fmt(fmt)
     }
 }
 
-impl<'s> std::convert::TryFrom<&'s str> for RelPath {
+impl<'s> TryFrom<&'s str> for RelPath {
     type Error = &'static str;
 
     fn try_from(value: &str) -> Result<Self, Self::Error> {
@@ -118,7 +118,7 @@ impl<'s> std::convert::TryFrom<&'s str> for RelPath {
     }
 }
 
-impl std::convert::TryFrom<String> for RelPath {
+impl TryFrom<String> for RelPath {
     type Error = &'static str;
 
     fn try_from(value: String) -> Result<Self, Self::Error> {

crates/core/src/source.rs

@@ -13,7 +13,7 @@ impl Source {
         ignores: impl IntoIterator<Item = &'i str>,
     ) -> Result<Self> {
         let mut ignore = ignore::gitignore::GitignoreBuilder::new(root);
-        for line in ignores.into_iter() {
+        for line in ignores {
             ignore
                 .add_line(None, line)
                 .map_err(|e| Status::new("Invalid ignore entry").with_source(e))?;

src/bin/cobalt/args.rs

@@ -3,10 +3,10 @@ use std::path;
 
 use anyhow::Context as _;
 
-use crate::error::*;
+use crate::error::Result;
 
 #[derive(Clone, Debug, PartialEq, Eq, clap::Args)]
-pub struct ConfigArgs {
+pub(crate) struct ConfigArgs {
     /// Config file to use [default: _cobalt.yml]
     #[arg(short, long, value_name = "FILE")]
     config: Option<path::PathBuf>,
@@ -25,7 +25,7 @@ pub struct ConfigArgs {
 }
 
 impl ConfigArgs {
-    pub fn load_config(&self) -> Result<cobalt_config::Config> {
+    pub(crate) fn load_config(&self) -> Result<cobalt_config::Config> {
         let config_path = self.config.as_deref();
 
         // Fetch config information if available
@@ -53,7 +53,7 @@ impl ConfigArgs {
         Ok(config)
     }
 
-    pub fn drafts(&self) -> Option<bool> {
+    pub(crate) fn drafts(&self) -> Option<bool> {
         resolve_bool_arg(self.drafts, self.no_drafts)
     }
 }
@@ -67,7 +67,7 @@ fn resolve_bool_arg(yes: bool, no: bool) -> Option<bool> {
     }
 }
 
-pub fn init_logging(
+pub(crate) fn init_logging(
     level: clap_verbosity_flag::Verbosity<clap_verbosity_flag::InfoLevel>,
     colored: bool,
 ) {
@@ -132,7 +132,7 @@ struct Palette {
 }
 
 impl Palette {
-    pub fn colored() -> Self {
+    pub(crate) fn colored() -> Self {
         Self {
             error: yansi::Style::new(yansi::Color::Red).bold(),
             warn: yansi::Style::new(yansi::Color::Yellow),
@@ -141,7 +141,7 @@ impl Palette {
         }
     }
 
-    pub fn plain() -> Self {
+    pub(crate) fn plain() -> Self {
         Self {
             error: yansi::Style::default(),
             warn: yansi::Style::default(),

src/bin/cobalt/build.rs

@@ -2,17 +2,17 @@ use std::env;
 use std::fs;
 
 use crate::args;
-use crate::error::*;
+use crate::error::Result;
 
 /// Build the cobalt project at the source dir
 #[derive(Clone, Debug, PartialEq, Eq, clap::Args)]
-pub struct BuildArgs {
+pub(crate) struct BuildArgs {
     #[command(flatten, next_help_heading = "Config")]
-    pub config: args::ConfigArgs,
+    pub(crate) config: args::ConfigArgs,
 }
 
 impl BuildArgs {
-    pub fn run(&self) -> Result<()> {
+    pub(crate) fn run(&self) -> Result<()> {
         let config = self.config.load_config()?;
         let config = cobalt::cobalt_model::Config::from_config(config)?;
 
@@ -23,7 +23,7 @@ impl BuildArgs {
     }
 }
 
-pub fn build(config: cobalt::Config) -> Result<()> {
+pub(crate) fn build(config: cobalt::Config) -> Result<()> {
     info!(
         "Building from `{}` into `{}`",
         config.source.display(),
@@ -36,21 +36,21 @@ pub fn build(config: cobalt::Config) -> Result<()> {
 
 /// Cleans `destination` directory
 #[derive(Clone, Debug, PartialEq, Eq, clap::Args)]
-pub struct CleanArgs {
+pub(crate) struct CleanArgs {
     #[command(flatten, next_help_heading = "Config")]
-    pub config: args::ConfigArgs,
+    pub(crate) config: args::ConfigArgs,
 }
 
 impl CleanArgs {
-    pub fn run(&self) -> Result<()> {
+    pub(crate) fn run(&self) -> Result<()> {
         let config = self.config.load_config()?;
         let config = cobalt::cobalt_model::Config::from_config(config)?;
 
         clean(&config)
     }
 }
 
-pub fn clean(config: &cobalt::Config) -> Result<()> {
+pub(crate) fn clean(config: &cobalt::Config) -> Result<()> {
     let cwd = env::current_dir().unwrap_or_default();
     let destdir = dunce::canonicalize(&config.destination);
     let destdir = match destdir {

src/bin/cobalt/debug.rs

@@ -1,9 +1,9 @@
 use crate::args;
-use crate::error::*;
+use crate::error::Result;
 
 /// Print site debug information
 #[derive(Clone, Debug, PartialEq, Eq, clap::Subcommand)]
-pub enum DebugCommands {
+pub(crate) enum DebugCommands {
     /// Prints post-processed config
     Config {
         #[command(flatten, next_help_heading = "Confg")]
@@ -25,7 +25,7 @@ pub enum DebugCommands {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, clap::Subcommand)]
-pub enum HighlightCommands {
+pub(crate) enum HighlightCommands {
     Themes {
         #[command(flatten, next_help_heading = "Config")]
         config: args::ConfigArgs,
@@ -37,7 +37,7 @@ pub enum HighlightCommands {
 }
 
 impl DebugCommands {
-    pub fn run(&self) -> Result<()> {
+    pub(crate) fn run(&self) -> Result<()> {
         match self {
             Self::Config { config } => {
                 let config = config.load_config()?;

src/bin/cobalt/error.rs

@@ -1,2 +1,2 @@
-pub use anyhow::Error;
-pub type Result<T> = std::result::Result<T, Error>;
+pub(crate) use anyhow::Error;
+pub(crate) type Result<T> = std::result::Result<T, Error>;