Pause for upstream

Author: Kixiron

build.rs

@@ -20,7 +20,6 @@ fn main() {
     println!("cargo:rerun-if-changed=templates/style/_vars.scss");
     println!("cargo:rerun-if-changed=templates/style/_utils.scss");
     println!("cargo:rerun-if-changed=templates/style/_navbar.scss");
-    println!("cargo:rerun-if-changed=templates/style/_icons.scss");
     println!("cargo:rerun-if-changed=templates/menu.js");
     println!("cargo:rerun-if-changed=templates/index.js");
     // TODO: are these right?

src/lib.rs

@@ -31,7 +31,7 @@ pub(crate) static GLOBAL_ALERT: Option<GlobalAlert> = Some(GlobalAlert {
     url: "https://blog.rust-lang.org/2019/09/18/upcoming-docsrs-changes.html",
     text: "Upcoming docs.rs breaking changes!",
     css_class: "error",
-    fa_icon: "icon-warning",
+    fa_icon: "exclamation-triangle",
 });
 */
 

src/web/mod.rs

@@ -95,7 +95,6 @@ use iron::{
 use page::TemplateData;
 use postgres::Client;
 use router::NoRoute;
-use router::Router;
 use semver::{Version, VersionReq};
 use serde::Serialize;
 use staticfile::Static;
@@ -584,64 +583,6 @@ fn ico_handler(req: &mut Request) -> IronResult<Response> {
     }
 }
 
-macro_rules! get_font {
-    (($path:expr) => { $($font:literal = $content_type:expr),* $(,)? }) => {{
-        let (data, content_type): (&'static [u8], &'static str) = match $path {
-            $(
-                Some(font) if font == $font => (
-                    include_bytes!(concat!("../../static/fonts/", $font)),
-                    $content_type,
-                ),
-            )*
-
-            _ => {
-                return Err(IronError::new(
-                    error::Nope::ResourceNotFound,
-                    status::NotFound,
-                ));
-            }
-        };
-
-        (data, content_type)
-    }};
-}
-
-fn font_handler(req: &mut Request) -> IronResult<Response> {
-    let router = extension!(req, Router);
-    let (font, content_type) = get_font!((router.find("font")) => {
-        "fa-regular-400.woff"  = "application/font-woff",
-        "fa-regular-400.woff2" = "application/font-woff2",
-        "fa-regular-400.ttf"   = "application/x-font-truetype",
-        "fa-regular-400.eot"   = "application/x-font-opentype",
-        "fa-regular-400.svg"   = "image/svg+xml",
-
-        "fa-solid-900.woff"    = "application/font-woff",
-        "fa-solid-900.woff2"   = "application/font-woff2",
-        "fa-solid-900.ttf"     = "application/x-font-truetype",
-        "fa-solid-900.eot"     = "application/x-font-opentype",
-        "fa-solid-900.svg"     = "image/svg+xml",
-
-        "fa-brands-400.woff"   = "application/font-woff",
-        "fa-brands-400.woff2"  = "application/font-woff2",
-        "fa-brands-400.ttf"    = "application/x-font-truetype",
-        "fa-brands-400.eot"    = "application/x-font-opentype",
-        "fa-brands-400.svg"    = "image/svg+xml",
-    });
-
-    let mut response = Response::with((status::Ok, font));
-    let cache = vec![
-        CacheDirective::Public,
-        CacheDirective::MaxAge(STATIC_FILE_CACHE_DURATION as u32),
-    ];
-
-    response
-        .headers
-        .set(ContentType(content_type.parse().unwrap()));
-    response.headers.set(CacheControl(cache));
-
-    Ok(response)
-}
-
 /// MetaData used in header
 #[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 pub(crate) struct MetaData {

src/web/page/templates.rs

@@ -8,6 +8,7 @@ use postgres::Client;
 use serde_json::Value;
 use std::{
     collections::HashMap,
+    fmt,
     path::PathBuf,
     sync::{mpsc::channel, Arc},
     thread,

src/web/routes.rs

@@ -18,7 +18,6 @@ pub(super) fn build_routes() -> Routes {
     routes.static_resource("/robots.txt", super::sitemap::robots_txt_handler);
     routes.static_resource("/sitemap.xml", super::sitemap::sitemap_handler);
     routes.static_resource("/opensearch.xml", super::opensearch_xml_handler);
-    routes.static_resource("/-/static/fonts/:font", super::font_handler);
 
     routes.internal_page("/", super::releases::home_page);