ref?

Author: syphar

src/web/file.rs

@@ -41,7 +41,7 @@ impl File {
 
 #[cfg(test)]
 impl File {
-    pub fn into_response(self, if_none_match: Option<IfNoneMatch>) -> AxumResponse {
+    pub fn into_response(self, if_none_match: Option<&IfNoneMatch>) -> AxumResponse {
         let streaming_blob: StreamingBlob = self.0.into();
         StreamingFile(streaming_blob).into_response(if_none_match)
     }
@@ -56,11 +56,11 @@ impl StreamingFile {
         Ok(StreamingFile(storage.get_stream(path).await?))
     }
 
-    pub fn into_response(self, if_none_match: Option<IfNoneMatch>) -> AxumResponse {
+    pub fn into_response(self, if_none_match: Option<&IfNoneMatch>) -> AxumResponse {
         const CACHE_POLICY: CachePolicy = CachePolicy::ForeverInCdnAndBrowser;
         let last_modified = LastModified::from(SystemTime::from(self.0.date_updated));
 
-        if let Some(ref if_none_match) = if_none_match
+        if let Some(if_none_match) = if_none_match
             && let Some(ref etag) = self.0.etag
             && !if_none_match.precondition_passes(etag)
         {
@@ -138,7 +138,7 @@ mod tests {
         {
             // cached request
             let stream = StreamingFile(streaming_blob(CONTENT, None));
-            let resp = stream.into_response(Some(if_none_match));
+            let resp = stream.into_response(Some(&if_none_match));
             assert_eq!(resp.status(), StatusCode::NOT_MODIFIED);
 
             // cache related headers are repeated on the not-modified response

src/web/rustdoc.rs

@@ -195,7 +195,7 @@ pub(crate) static DOC_RUST_LANG_ORG_REDIRECTS: LazyLock<HashMap<&str, OfficialCr
 async fn try_serve_legacy_toolchain_asset(
     storage: Arc<AsyncStorage>,
     path: impl AsRef<str>,
-    if_none_match: Option<IfNoneMatch>,
+    if_none_match: Option<&IfNoneMatch>,
 ) -> AxumResult<AxumResponse> {
     let path = path.as_ref().to_owned();
     // FIXME: this could be optimized: when a path doesn't exist
@@ -222,7 +222,6 @@ pub(crate) async fn rustdoc_redirector_handler(
     RawQuery(original_query): RawQuery,
 ) -> AxumResult<impl IntoResponse> {
     let params = params.with_page_kind(PageKind::Rustdoc);
-    let if_none_match = if_none_match.map(|th| th.0);
 
     fn redirect_to_doc(
         original_uri: Option<&EscapedURI>,
@@ -260,7 +259,7 @@ pub(crate) async fn rustdoc_redirector_handler(
             .binary_search(&extension)
             .is_ok()
     {
-        return try_serve_legacy_toolchain_asset(storage, params.name(), if_none_match)
+        return try_serve_legacy_toolchain_asset(storage, params.name(), if_none_match.as_deref())
             .instrument(info_span!("serve static asset"))
             .await;
     }
@@ -324,7 +323,7 @@ pub(crate) async fn rustdoc_redirector_handler(
                 )
                 .await
             {
-                Ok(blob) => Ok(StreamingFile(blob).into_response(if_none_match)),
+                Ok(blob) => Ok(StreamingFile(blob).into_response(if_none_match.as_deref())),
                 Err(err) => {
                     if !matches!(err.downcast_ref(), Some(AxumNope::ResourceNotFound))
                         && !matches!(err.downcast_ref(), Some(crate::storage::PathNotFoundError))
@@ -337,7 +336,12 @@ pub(crate) async fn rustdoc_redirector_handler(
                     // docs that were affected by this bug.
                     // https://github.com/rust-lang/docs.rs/issues/1979
                     if inner_path.starts_with("search-") || inner_path.starts_with("settings-") {
-                        try_serve_legacy_toolchain_asset(storage, inner_path, if_none_match).await
+                        try_serve_legacy_toolchain_asset(
+                            storage,
+                            inner_path,
+                            if_none_match.as_deref(),
+                        )
+                        .await
                     } else {
                         Err(err.into())
                     }
@@ -442,7 +446,6 @@ pub(crate) async fn rustdoc_html_server_handler(
     mut conn: DbConnection,
 ) -> AxumResult<AxumResponse> {
     let params = params.with_page_kind(PageKind::Rustdoc);
-    let if_none_match = if_none_match.map(|th| th.0);
 
     trace!(?params, ?original_query, "original params");
     // Pages generated by Rustdoc are not ready to be served with a CSP yet.
@@ -602,7 +605,7 @@ pub(crate) async fn rustdoc_html_server_handler(
         // default asset caching behaviour is `Cache::ForeverInCdnAndBrowser`.
         // This is an edge-case when we serve invocation specific static assets under `/latest/`:
         // https://github.com/rust-lang/docs.rs/issues/1593
-        return Ok(StreamingFile(blob).into_response(if_none_match));
+        return Ok(StreamingFile(blob).into_response(if_none_match.as_deref()));
     }
 
     let latest_release = krate.latest_release()?;
@@ -916,12 +919,11 @@ pub(crate) async fn static_asset_handler(
     Extension(storage): Extension<Arc<AsyncStorage>>,
     if_none_match: Option<TypedHeader<IfNoneMatch>>,
 ) -> AxumResult<impl IntoResponse> {
-    let if_none_match = if_none_match.map(|th| th.0);
     let storage_path = format!("{RUSTDOC_STATIC_STORAGE_PREFIX}{path}");
 
     Ok(StreamingFile::from_path(&storage, &storage_path)
         .await?
-        .into_response(if_none_match))
+        .into_response(if_none_match.as_deref()))
 }
 
 #[cfg(test)]

src/web/source.rs

@@ -193,7 +193,6 @@ pub(crate) async fn source_browser_handler(
     mut conn: DbConnection,
     if_none_match: Option<TypedHeader<IfNoneMatch>>,
 ) -> AxumResult<impl IntoResponse> {
-    let if_none_match = if_none_match.map(|th| th.0);
     let params = params.with_page_kind(PageKind::Source);
     let matched_release = match_version(&mut conn, params.name(), params.req_version())
         .await?
@@ -278,7 +277,7 @@ pub(crate) async fn source_browser_handler(
         let is_text = stream.mime.type_() == mime::TEXT || stream.mime == mime::APPLICATION_JSON;
         if !is_text {
             // if the file isn't text, serve it directly to the client
-            let mut response = StreamingFile(stream).into_response(if_none_match);
+            let mut response = StreamingFile(stream).into_response(if_none_match.as_deref());
             response.headers_mut().typed_insert(canonical_url);
             response
                 .extensions_mut()