Merge pull request #2782 from fibonacci1729/fixes

A few fixes after yesterday's mergepalooza

crates/compose/src/lib.rs

@@ -26,7 +26,7 @@ use wac_graph::{CompositionGraph, NodeId};
 /// dependent component. Finally, the composer will export all exports from the
 /// dependent component to its dependents. The composer will then encode the
 /// composition graph into a byte array and return it.
-pub async fn compose<'a, L: LockedComponentSourceLoader>(
+pub async fn compose<'a, L: ComponentSourceLoader>(
     loader: &'a L,
     component: &LockedComponent,
 ) -> Result<Vec<u8>, ComposeError> {
@@ -35,7 +35,7 @@ pub async fn compose<'a, L: LockedComponentSourceLoader>(
 
 /// This trait is used to load component source code from a locked component source across various embdeddings.
 #[async_trait::async_trait]
-pub trait LockedComponentSourceLoader {
+pub trait ComponentSourceLoader {
     async fn load_component_source(
         &self,
         source: &locked::LockedComponentSource,
@@ -97,7 +97,7 @@ struct Composer<'a, L> {
     loader: &'a L,
 }
 
-impl<'a, L: LockedComponentSourceLoader> Composer<'a, L> {
+impl<'a, L: ComponentSourceLoader> Composer<'a, L> {
     async fn compose(mut self, component: &LockedComponent) -> Result<Vec<u8>, ComposeError> {
         let source = self
             .loader

crates/trigger/src/cli.rs

@@ -355,7 +355,7 @@ impl<T: Trigger> TriggerAppBuilder<T> {
         struct SimpleComponentLoader;
 
         #[async_trait]
-        impl spin_compose::LockedComponentSourceLoader for SimpleComponentLoader {
+        impl spin_compose::ComponentSourceLoader for SimpleComponentLoader {
             async fn load_component_source(
                 &self,
                 source: &spin_app::locked::LockedComponentSource,
@@ -399,7 +399,10 @@ impl<T: Trigger> TriggerAppBuilder<T> {
                 let composed = spin_compose::compose(self, component.locked)
                     .await
                     .with_context(|| {
-                        format!("failed to compose component {:?}", component.locked.id)
+                        format!(
+                            "failed to resolve dependencies for component {:?}",
+                            component.locked.id
+                        )
                     })?;
 
                 spin_core::Component::new(engine, composed)

docs/content/sips/0xx-spin-factors.md → docs/content/sips/021-spin-factors.md

@@ -1,4 +1,4 @@
-title = "SIP 0XX - Spin Factors"
+title = "SIP 021 - Spin Factors"
 template = "main"
 date = "2024-05-20T12:00:00Z"