Cleanup

Author: Kixiron

Cargo.toml

@@ -68,7 +68,7 @@ arc-swap = "0.4.6"
 notify = "4.0.15"
 
 # Date and Time utilities
-chrono = { version = "0.4.11", features = ["serde"] } 
+chrono = { version = "0.4.11", features = ["serde"] }
 time = "0.1" # TODO: Remove once `iron` is removed
 
 [dependencies.postgres]

src/web/mod.rs

@@ -6,7 +6,6 @@ use log::{debug, info};
 
 /// ctry! (cratesfyitry) is extremely similar to try! and itry!
 /// except it returns an error page response instead of plain Err.
-#[macro_export]
 macro_rules! ctry {
     ($req:expr, $result:expr $(,)?) => {
         match $result {
@@ -32,7 +31,6 @@ macro_rules! ctry {
 
 /// cexpect will check an option and if it's not Some
 /// it will return an error page response
-#[macro_export]
 macro_rules! cexpect {
     ($req:expr, $option:expr $(,)?) => {
         match $option {
@@ -58,7 +56,6 @@ macro_rules! cexpect {
 }
 
 /// Gets an extension from Request
-#[macro_export]
 macro_rules! extension {
     ($req:expr, $ext:ty) => {{
         // Bind $req so we can have good type errors and avoid re-evaluation
@@ -129,7 +126,6 @@ impl CratesfyiHandler {
         pool: Pool,
         config: Arc<Config>,
         template_data: Arc<TemplateData>,
-
         build_queue: Arc<BuildQueue>,
         storage: Arc<Storage>,
     ) -> CratesfyiHandler {
@@ -403,7 +399,7 @@ impl Server {
         build_queue: Arc<BuildQueue>,
         storage: Arc<Storage>,
     ) -> Result<Self, Error> {
-        // Initialize templates & sass
+        // Initialize templates
         let template_data = Arc::new(TemplateData::new(&mut *db.get()?)?);
 
         if reload_templates {

src/web/page/templates.rs

@@ -52,7 +52,6 @@ impl TemplateData {
         thread::spawn(move || {
             fn reload(template_data: &TemplateData, pool: &Pool) -> Result<()> {
                 let mut conn = pool.get()?;
-                log::debug!("reloading templates...");
                 template_data
                     .templates
                     .swap(Arc::new(load_templates(&mut conn)?));
@@ -68,7 +67,7 @@ impl TemplateData {
                 if let Err(err) = reload(&template_data, &pool) {
                     log::error!("failed to reload templates: {}", err);
                 } else {
-                    log::info!("done reloading templates");
+                    log::info!("reloaded templates");
                 }
             }
         });