Read rustc_verison directly from builds instead of release

Author: Nemo157

.sqlx/query-2b8b1aae3740a05cb7179be9c7d5af30e8362c3cba0b07bc18fa32ff1a2232cc.json

@@ -159,7 +159,7 @@ impl CrateDetails {
                 releases.license,
                 releases.documentation_url,
                 releases.default_target,
-                releases.doc_rustc_version,
+                builds.rustc_version as "rustc_version?",
                 doc_coverage.total_items,
                 doc_coverage.documented_items,
                 doc_coverage.total_items_needing_examples,
@@ -202,7 +202,11 @@ impl CrateDetails {
             default_target: krate.default_target,
             doc_targets: MetaData::parse_doc_targets(krate.doc_targets),
             yanked: krate.yanked,
-            rustdoc_css_file: get_correct_docsrs_style_file(&krate.doc_rustc_version)?,
+            rustdoc_css_file: krate
+                .rustc_version
+                .as_deref()
+                .map(get_correct_docsrs_style_file)
+                .transpose()?,
         };
 
         let mut crate_details = CrateDetails {

.sqlx/query-97deab9378fe8c0f7bac04def1007c23305a12c892a794e5161b47b839c3183c.json renamed to .sqlx/query-790af2d57b8d036f14a9a8874c2fc94c4cd6b3d4acd5eb2e67c1fb5729b5471a.json

@@ -620,18 +620,19 @@ pub(crate) struct MetaData {
     pub(crate) yanked: bool,
     /// CSS file to use depending on the rustdoc version used to generate this version of this
     /// crate.
-    pub(crate) rustdoc_css_file: String,
+    pub(crate) rustdoc_css_file: Option<String>,
 }
 
 impl MetaData {
+    #[fn_error_context::context("getting metadata for {name} {version}")]
     async fn from_crate(
         conn: &mut sqlx::PgConnection,
         name: &str,
         version: &Version,
         req_version: Option<ReqVersion>,
     ) -> Result<MetaData> {
-        sqlx::query!(
-            "SELECT
+        let row = sqlx::query!(
+            r#"SELECT
                 crates.name,
                 releases.version,
                 releases.description,
@@ -640,17 +641,24 @@ impl MetaData {
                 releases.default_target,
                 releases.doc_targets,
                 releases.yanked,
-                releases.doc_rustc_version
+                builds.rustc_version as "rustc_version?"
             FROM releases
             INNER JOIN crates ON crates.id = releases.crate_id
-            WHERE crates.name = $1 AND releases.version = $2",
+            LEFT JOIN LATERAL (
+                SELECT * FROM builds
+                WHERE builds.rid = releases.id
+                ORDER BY builds.build_time
+                DESC LIMIT 1
+            ) AS builds ON true
+            WHERE crates.name = $1 AND releases.version = $2"#,
             name,
             version.to_string(),
         )
-        .fetch_optional(&mut *conn)
+        .fetch_one(&mut *conn)
         .await
-        .context("error fetching crate metadata")?
-        .map(|row| MetaData {
+        .context("error fetching crate metadata")?;
+
+        Ok(MetaData {
             name: row.name,
             version: version.clone(),
             req_version: req_version.unwrap_or_else(|| ReqVersion::Exact(version.clone())),
@@ -660,9 +668,13 @@ impl MetaData {
             default_target: row.default_target,
             doc_targets: MetaData::parse_doc_targets(row.doc_targets),
             yanked: row.yanked,
-            rustdoc_css_file: get_correct_docsrs_style_file(&row.doc_rustc_version).unwrap(),
+            // rustdoc_css_file: get_correct_docsrs_style_file(&row.doc_rustc_version).unwrap(),
+            rustdoc_css_file: row
+                .rustc_version
+                .as_deref()
+                .map(get_correct_docsrs_style_file)
+                .transpose()?,
         })
-        .ok_or_else(|| anyhow!("missing metadata for {} {}", name, version))
     }
 
     fn parse_doc_targets(targets: Value) -> Vec<String> {
@@ -1068,7 +1080,7 @@ mod test {
                 "arm64-unknown-linux-gnu".to_string(),
             ],
             yanked: false,
-            rustdoc_css_file: "rustdoc.css".to_string(),
+            rustdoc_css_file: Some("rustdoc.css".to_string()),
         };
 
         let correct_json = json!({
@@ -1152,7 +1164,7 @@ mod test {
                     default_target: "x86_64-unknown-linux-gnu".to_string(),
                     doc_targets: vec![],
                     yanked: false,
-                    rustdoc_css_file: "rustdoc.css".to_string(),
+                    rustdoc_css_file: Some("rustdoc.css".to_string()),
                 },
             );
             Ok(())

.sqlx/query-9f1181d51fde9d63ffafbf397e5a5af66cdd3764872cd5a3a401ffd5ca075de8.json

@@ -3,7 +3,6 @@ use crate::{
     db::Pool,
     impl_axum_webpage,
     storage::PathNotFoundError,
-    utils::get_correct_docsrs_style_file,
     web::{
         cache::CachePolicy, error::AxumNope, extractors::Path, file::File as DbFile,
         headers::CanonicalUrl, MetaData, ReqVersion,
@@ -76,16 +75,7 @@ impl FileList {
         folder: &str,
     ) -> Result<Option<FileList>> {
         let row = match sqlx::query!(
-            "SELECT crates.name,
-                    releases.version,
-                    releases.description,
-                    releases.target_name,
-                    releases.rustdoc_status,
-                    releases.files,
-                    releases.default_target,
-                    releases.doc_targets,
-                    releases.yanked,
-                    releases.doc_rustc_version
+            "SELECT releases.files
             FROM releases
             INNER JOIN crates ON crates.id = releases.crate_id
             WHERE crates.name = $1 AND releases.version = $2",
@@ -147,18 +137,7 @@ impl FileList {
             });
 
             Ok(Some(FileList {
-                metadata: MetaData {
-                    name: row.name,
-                    version: version.clone(),
-                    req_version: req_version.unwrap_or_else(|| ReqVersion::Exact(version.clone())),
-                    description: row.description,
-                    target_name: Some(row.target_name),
-                    rustdoc_status: row.rustdoc_status,
-                    default_target: row.default_target,
-                    doc_targets: MetaData::parse_doc_targets(row.doc_targets),
-                    yanked: row.yanked,
-                    rustdoc_css_file: get_correct_docsrs_style_file(&row.doc_rustc_version)?,
-                },
+                metadata: MetaData::from_crate(conn, name, version, req_version).await?,
                 files: file_list,
             }))
         } else {

.sqlx/query-5d8e187d604de870d347be77abae3a272114732644975e9dbf396f5ffe689f6b.json renamed to .sqlx/query-d471c22a41a040f720ac678b085265f616eef21a09ffaaa243fc26f107ad6c87.json

@@ -1,5 +1,7 @@
 {%- import "macros.html" as macros -%}
+        {% if metadata.rustdoc_css_file %}
         <link rel="stylesheet" href="/-/static/{{metadata.rustdoc_css_file}}?{{ docsrs_version() | slugify }}" media="all" />
+        {% endif %}
 
         <link rel="search" href="/-/static/opensearch.xml" type="application/opensearchdescription+xml" title="Docs.rs" />