From 1d9aa7aca6aab414bcb132778b8b511e4450851b Mon Sep 17 00:00:00 2001 From: Sofia Talarmo Date: Thu, 21 Nov 2024 21:00:26 +0200 Subject: [PATCH] Run cargo fix --edition --- src/builder.rs | 14 +++++++------- src/config.rs | 6 +++--- src/config_toml.rs | 4 ++-- src/error.rs | 2 +- src/file_writer.rs | 4 ++-- src/main.rs | 6 +++--- src/new_page.rs | 10 +++++----- src/renderer.rs | 10 +++++----- src/template.rs | 4 ++-- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/builder.rs b/src/builder.rs index 27c732f..d7ac35a 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -6,13 +6,13 @@ use std::error::Error as STDError; use pathdiff; -use config::Config; -use template::Template; -use renderer; -use logger::{LogLevel, Logger}; -use error::Error; -use options::{BuildOpt, Opt}; -use file_writer; +use crate::config::Config; +use crate::template::Template; +use crate::renderer; +use crate::logger::{LogLevel, Logger}; +use crate::error::Error; +use crate::options::{BuildOpt, Opt}; +use crate::file_writer; const DEFAULT_CSS: &'static str = include_str!("templates/default-css.css"); const DEFAULT_JS: &'static str = include_str!("templates/default-js.js"); diff --git a/src/config.rs b/src/config.rs index 66b4627..9bc761a 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,7 +1,7 @@ -use config_toml::{GlobalConfigToml, PageConfigToml}; +use crate::config_toml::{GlobalConfigToml, PageConfigToml}; use std::path::PathBuf; -use error::Error; -use logger::LogLevel; +use crate::error::Error; +use crate::logger::LogLevel; #[derive(Clone)] pub struct SinglePageConfigs { diff --git a/src/config_toml.rs b/src/config_toml.rs index 34efab4..07c0e3c 100644 --- a/src/config_toml.rs +++ b/src/config_toml.rs @@ -1,8 +1,8 @@ use std::path::PathBuf; use std::collections::HashMap; -use error::Error; -use file_writer; +use crate::error::Error; +use crate::file_writer; #[derive(Deserialize, Serialize, Clone, Debug)] pub struct GlobalConfigToml { diff --git a/src/error.rs b/src/error.rs index 4dbfb23..6527e04 100644 --- a/src/error.rs +++ b/src/error.rs @@ -2,7 +2,7 @@ use std::convert::From; use std::io::Error as IOError; use std::error::Error as STDError; -use logger::LogLevel; +use crate::logger::LogLevel; #[derive(Debug)] pub struct Error { diff --git a/src/file_writer.rs b/src/file_writer.rs index 2b897db..ef46142 100644 --- a/src/file_writer.rs +++ b/src/file_writer.rs @@ -7,8 +7,8 @@ use serde::Serialize; use serde::de::DeserializeOwned; use toml; -use error::Error; -use logger::LogLevel; +use crate::error::Error; +use crate::logger::LogLevel; pub fn add_to_beginning>(path: PathBuf, to_add: T) -> PathBuf { Path::new(&to_add.into()).join(path) diff --git a/src/main.rs b/src/main.rs index a3fc8b5..cb49a51 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,9 +26,9 @@ use std::process::exit; use structopt::StructOpt; -use logger::{LogLevel, Logger}; -use options::{Opt, Subcommands}; -use config_toml::{GlobalConfigToml, NavbarConfig, NavbarItem, WebsiteConfig}; +use crate::logger::{LogLevel, Logger}; +use crate::options::{Opt, Subcommands}; +use crate::config_toml::{GlobalConfigToml, NavbarConfig, NavbarItem, WebsiteConfig}; //TODO: Custom markdown fn main() { diff --git a/src/new_page.rs b/src/new_page.rs index 926e460..43c5706 100644 --- a/src/new_page.rs +++ b/src/new_page.rs @@ -1,10 +1,10 @@ use std::path::PathBuf; -use options::{NewOpt, Opt}; -use logger::{LogLevel, Logger}; -use file_writer; -use error::Error; -use config_toml::{GlobalConfigToml, PageConfig, PageConfigToml}; +use crate::options::{NewOpt, Opt}; +use crate::logger::{LogLevel, Logger}; +use crate::file_writer; +use crate::error::Error; +use crate::config_toml::{GlobalConfigToml, PageConfig, PageConfigToml}; use pathdiff; diff --git a/src/renderer.rs b/src/renderer.rs index 9fce141..ad2dd64 100644 --- a/src/renderer.rs +++ b/src/renderer.rs @@ -6,11 +6,11 @@ use std::error::Error as STDError; use pulldown_cmark::{html, Parser}; use regex::{Captures, Regex}; -use config::{Config, SinglePageConfigs}; -use template::Template; -use error::Error; -use logger::{LogLevel, Logger}; -use config_toml::InjectionToml; +use crate::config::{Config, SinglePageConfigs}; +use crate::template::Template; +use crate::error::Error; +use crate::logger::{LogLevel, Logger}; +use crate::config_toml::InjectionToml; fn get_file_contents(path: Option) -> Result { match path { diff --git a/src/template.rs b/src/template.rs index 72679a6..93e8811 100644 --- a/src/template.rs +++ b/src/template.rs @@ -2,8 +2,8 @@ use regex::{Captures, Regex}; use std::collections::HashMap; -use config::SinglePageConfigs; -use config_toml::NavbarItem; +use crate::config::SinglePageConfigs; +use crate::config_toml::NavbarItem; type Data = HashMap;