clean

Author: syphar

build.rs

@@ -1,4 +1,4 @@
-use anyhow::{Context as _, Error, Result, bail};
+use anyhow::{Context as _, Error, Result};
 use std::{env, fs::File, io::Write as _, path::Path};
 
 mod tracked {
@@ -163,7 +163,7 @@ fn compile_sass(out_dir: &Path, etag_map: &mut ETagMap) -> Result<()> {
     for entry in walkdir::WalkDir::new(STYLE_DIR) {
         let entry = entry?;
         if entry.metadata()?.is_dir() {
-            bail!("directories are not supported in {}", STYLE_DIR);
+            tracked::track(entry.path())?;
         } else {
             let file_name = entry
                 .file_name()

src/storage/mod.rs

@@ -153,13 +153,13 @@ impl StreamingBlob {
 impl From<Blob> for StreamingBlob {
     fn from(value: Blob) -> Self {
         Self {
-            path: self.path,
-            mime: self.mime,
-            date_updated: self.date_updated,
-            etag: self.etag,
-            compression: self.compression,
-            content_length: self.content.len(),
-            content: Box::new(io::Cursor::new(self.content)),
+            path: value.path,
+            mime: value.mime,
+            date_updated: value.date_updated,
+            etag: value.etag,
+            compression: value.compression,
+            content_length: value.content.len(),
+            content: Box::new(io::Cursor::new(value.content)),
         }
     }
 }
@@ -1291,10 +1291,7 @@ pub(crate) fn source_archive_path(name: &str, version: &Version) -> String {
 #[cfg(test)]
 mod test {
     use super::*;
-    use crate::{
-        test::{TestEnvironment, V0_1},
-        web::headers::compute_etag,
-    };
+    use crate::{test::TestEnvironment, web::headers::compute_etag};
     use std::env;
     use test_case::test_case;
 

src/web/file.rs

@@ -9,17 +9,14 @@ use crate::{
 use axum::{
     body::Body,
     extract::Extension,
-    http::{
-        StatusCode,
-        header::{CONTENT_TYPE, LAST_MODIFIED},
-    },
+    http::StatusCode,
     response::{IntoResponse, Response as AxumResponse},
 };
 use axum_extra::{
     TypedHeader,
-    headers::{ContentType, HeaderMapExt, IfNoneMatch, LastModified},
+    headers::{ContentType, IfNoneMatch, LastModified},
 };
-use std::{io, time::SystemTime};
+use std::time::SystemTime;
 use tokio_util::io::ReaderStream;
 
 #[derive(Debug)]
@@ -44,7 +41,8 @@ impl File {
 
 impl File {
     pub fn into_response(self, if_none_match: Option<IfNoneMatch>) -> AxumResponse {
-        StreamingFile(self.0.into().into_response(if_none_match))
+        let streaming_blob: StreamingBlob = self.0.into();
+        StreamingFile(streaming_blob).into_response(if_none_match)
     }
 }
 
@@ -91,7 +89,7 @@ mod tests {
     use super::*;
     use crate::test::TestEnvironment;
     use chrono::Utc;
-    use http::header::CACHE_CONTROL;
+    use http::header::{CACHE_CONTROL, LAST_MODIFIED};
     use std::rc::Rc;
 
     #[tokio::test(flavor = "multi_thread")]

src/web/rustdoc.rs

@@ -36,10 +36,10 @@ use axum::{
     response::{IntoResponse, Response as AxumResponse},
 };
 use axum_extra::{
-    TypedHeader,
     headers::{ContentType, IfNoneMatch},
+    typed_header::TypedHeader,
 };
-use http::{HeaderValue, Uri, header, uri::Authority};
+use http::{Uri, uri::Authority};
 use serde::Deserialize;
 use std::{
     collections::HashMap,
@@ -440,7 +440,6 @@ pub(crate) async fn rustdoc_html_server_handler(
     Extension(config): Extension<Arc<Config>>,
     Extension(csp): Extension<Arc<Csp>>,
     RawQuery(original_query): RawQuery,
-    // FIXME: perhaps our own extractor so we get a real Option<TH<INM>>?
     if_none_match: Option<TypedHeader<IfNoneMatch>>,
     mut conn: DbConnection,
 ) -> AxumResult<AxumResponse> {

src/web/statics.rs

@@ -8,8 +8,8 @@ use axum::{
     routing::get_service,
 };
 use axum_extra::{
-    TypedHeader,
     headers::{ETag, HeaderMapExt as _, HeaderValue, IfNoneMatch},
+    typed_header::TypedHeader,
 };
 use http::{Method, StatusCode, Uri};
 use tower_http::services::ServeDir;
@@ -60,10 +60,11 @@ async fn set_needed_static_headers(req: Request, next: Next) -> Response {
 async fn conditional_get(
     partial_uri: Uri,
     method: Method,
-    TypedHeader(if_none_match): TypedHeader<IfNoneMatch>,
+    if_none_match: Option<TypedHeader<IfNoneMatch>>,
     req: Request,
     next: Next,
 ) -> Response {
+    let if_none_match = if_none_match.map(|th| th.0);
     let resource_path = partial_uri.path().trim_start_matches('/');
     let Some(etag) = STATIC_ETAG_MAP.get(resource_path).map(|etag| {
         etag.parse::<ETag>()