chore: Fix CI checks

Author: LukeMathWalker

Cargo.lock

@@ -12,6 +12,7 @@ serde_derive = {version="1.0.186"}
 rustc-hash = {version="2", optional=true}
 bincode = "2"
 rkyv = { version = "0.8", default-features = false, features = ["std"] }
+px_workspace_hack = { version = "0.1", path = "../../px_workspace_hack" }
 
 [features]
 default = []

compiler/pavex_rustdoc_types/Cargo.toml

@@ -362,7 +362,6 @@ pub enum Attribute {
     rkyv::Deserialize,
 )]
 #[rkyv(derive(Debug))]
-
 /// The contents of a `#[repr(...)]` attribute.
 ///
 /// Used in [`Attribute::Repr`].
@@ -375,7 +374,7 @@ pub struct AttributeRepr {
     /// Alignment in bytes, if explicitly specified by `#[repr(packed(...)]]`.
     pub packed: Option<u64>,
 
-    /// The integer type for an enum descriminant, if explicitly specified.
+    /// The integer type for an enum discriminant, if explicitly specified.
     ///
     /// e.g. `"i32"`, for `#[repr(C, i32)]`
     pub int: Option<String>,

compiler/pavex_rustdoc_types/src/lib.rs

@@ -446,7 +446,7 @@ fn warm_up_rustdoc_cache(
         .iter()
         .filter(|p| {
             !(
-                // Avoid computing JOSN docs for:
+                // Avoid computing JSON docs for:
                 // - Generated code
                 p.name().starts_with("application_")
                 // - Integration test crates

compiler/pavex_test_runner/src/lib.rs

@@ -1,7 +1,7 @@
 use std::borrow::Cow;
 use std::cmp::Ordering;
 use std::collections::BTreeSet;
-use std::sync::Arc;
+use std::sync::{Arc, RwLock};
 
 use ahash::{HashMap, HashSet, HashSetExt};
 use anyhow::{Context, anyhow};
@@ -181,8 +181,8 @@ impl CrateCollection {
             cache: &RustdocGlobalFsCache,
             diagnostic_sink: &DiagnosticSink,
         ) -> (PackageId, Option<Crate>) {
-            let cache_key = RustdocCacheKey::new(&package_id, &package_graph);
-            match cache.get(&cache_key, &package_graph) {
+            let cache_key = RustdocCacheKey::new(&package_id, package_graph);
+            match cache.get(&cache_key, package_graph) {
                 Ok(None) => (package_id, None),
                 Ok(Some(entry)) => (
                     package_id.clone(),
@@ -212,7 +212,7 @@ impl CrateCollection {
         let sink = &self.diagnostic_sink;
         let tracing_span = Span::current();
         let map_op =
-            move |id| tracing_span.in_scope(|| get_if_cached(id, &package_graph, cache, &sink));
+            move |id| tracing_span.in_scope(|| get_if_cached(id, package_graph, cache, sink));
 
         let mut to_be_computed = vec![];
 
@@ -262,11 +262,11 @@ impl CrateCollection {
             .par_iter()
             .filter_map(|(package_id, krate, cache_indexes)| {
                 let data = if *cache_indexes {
-                    CacheEntry::new(&krate)
+                    CacheEntry::new(krate)
                 } else {
-                    CacheEntry::raw(&krate)
+                    CacheEntry::raw(krate)
                 };
-                let cache_key = RustdocCacheKey::new(&package_id, package_graph);
+                let cache_key = RustdocCacheKey::new(package_id, package_graph);
                 match data {
                     Ok(v) => Some((package_id, (cache_key, v))),
                     Err(e) => {
@@ -660,8 +660,15 @@ pub struct Crate {
     /// An internal cache to avoid traversing the package graph every time we need to
     /// translate a crate id into a package id via [`Self::compute_package_id_for_crate_id`]
     /// or [`Self::compute_package_id_for_crate_id_with_hint`].
-    pub(super) crate_id2package_id:
-        Arc<std::sync::RwLock<HashMap<(u32, Option<String>), PackageId>>>,
+    pub(super) crate_id2package_id: Arc<RwLock<HashMap<CrateIdNeedle, PackageId>>>,
+}
+
+/// The information used by [`Self::compute_package_id_for_crate_id_with_hint`] to
+/// map a `crate_id` to a `package_id`.
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct CrateIdNeedle {
+    crate_id: u32,
+    maybe_dependent_crate_name: Option<String>,
 }
 
 #[derive(Debug, Clone)]
@@ -1350,13 +1357,12 @@ impl Crate {
         collection: &CrateCollection,
         maybe_dependent_crate_name: Option<&str>,
     ) -> Result<PackageId, anyhow::Error> {
+        let needle = CrateIdNeedle {
+            crate_id,
+            maybe_dependent_crate_name: maybe_dependent_crate_name.map(|s| s.to_owned()),
+        };
         // Check the cache first.
-        if let Some(package_id) = self
-            .crate_id2package_id
-            .read()
-            .unwrap()
-            .get(&(crate_id, maybe_dependent_crate_name.map(|s| s.to_owned())))
-        {
+        if let Some(package_id) = self.crate_id2package_id.read().unwrap().get(&needle) {
             return Ok(package_id.to_owned());
         }
 
@@ -1369,10 +1375,10 @@ impl Crate {
 
         // If successful, cache the outcome.
         if let Ok(outcome) = &outcome {
-            self.crate_id2package_id.write().unwrap().insert(
-                (crate_id, maybe_dependent_crate_name.map(|s| s.to_owned())),
-                outcome.to_owned(),
-            );
+            self.crate_id2package_id
+                .write()
+                .unwrap()
+                .insert(needle, outcome.to_owned());
         }
         outcome
     }

compiler/pavexc/src/rustdoc/queries.rs

@@ -16,6 +16,8 @@ ignore = [
     # is available. The risk is acceptable for server-side usage where timing
     # attacks are difficult to execute.
     "RUSTSEC-2023-0071",
+    # `bincode` is unmaintained, but otherwise perfectly functional.
+    "RUSTSEC-2025-0141"
 ]
 
 [licenses]

deny.toml

@@ -20,6 +20,7 @@ license.workspace = true
 ahash = { version = "0.8" }
 aho-corasick = { version = "1" }
 base64 = { version = "0.22" }
+bincode = { version = "2", features = ["serde"] }
 byteorder = { version = "1" }
 clap = { version = "4", features = ["derive", "env"] }
 clap_builder = { version = "4", default-features = false, features = ["color", "env", "help", "std", "suggestions", "usage"] }
@@ -99,6 +100,7 @@ zeroize = { version = "1" }
 ahash = { version = "0.8" }
 aho-corasick = { version = "1" }
 base64 = { version = "0.22" }
+bincode = { version = "2", features = ["serde"] }
 byteorder = { version = "1" }
 clap = { version = "4", features = ["derive", "env"] }
 clap_builder = { version = "4", default-features = false, features = ["color", "env", "help", "std", "suggestions", "usage"] }

px_workspace_hack/Cargo.toml

@@ -1,5 +1,5 @@
 [default]
-extend-words = { befores = "befores" }
+extend-words = { befores = "befores", bimap = "bimap" }
 extend-ignore-words-re = ["\\b[a-zA-Z]{2}\\b"]
 
 [files]