add todo comments and change more bails to unreachables

dicej · dicej · commit 1968e9205bc5 · 2025-09-16T14:08:26.000-06:00
Signed-off-by: Joel Dice &lt;joel.dice@fermyon.com&gt;
diff --git a/crates/factor-outbound-http/src/wasi.rs b/crates/factor-outbound-http/src/wasi.rs
@@ -718,6 +718,8 @@ fn dns_error(rcode: String, info_code: u16) -> ErrorCode {
     })
 }
 
+// TODO: Remove this (and uses of it) once
+// https://github.com/spinframework/spin/issues/3274 has been addressed.
 pub fn p2_to_p3_error_code(code: p2_types::ErrorCode) -> p3_types::ErrorCode {
     match code {
         p2_types::ErrorCode::DnsTimeout => p3_types::ErrorCode::DnsTimeout,
@@ -818,6 +820,8 @@ pub fn p2_to_p3_error_code(code: p2_types::ErrorCode) -> p3_types::ErrorCode {
     }
 }
 
+// TODO: Remove this (and uses of it) once
+// https://github.com/spinframework/spin/issues/3274 has been addressed.
 pub fn p3_to_p2_error_code(code: p3_types::ErrorCode) -> p2_types::ErrorCode {
     match code {
         p3_types::ErrorCode::DnsTimeout => p2_types::ErrorCode::DnsTimeout,
diff --git a/crates/trigger-http/src/spin.rs b/crates/trigger-http/src/spin.rs
@@ -30,7 +30,7 @@ impl HttpExecutor for SpinHttpExecutor {
     ) -> Result<Response<Body>> {
         let spin_http::routes::TriggerLookupKey::Component(component_id) = route_match.lookup_key()
         else {
-            anyhow::bail!("INCONCEIVABLE");
+            unreachable!()
         };
 
         tracing::trace!("Executing request using the Spin executor for component {component_id}");
diff --git a/crates/trigger-http/src/wagi.rs b/crates/trigger-http/src/wagi.rs
@@ -29,7 +29,7 @@ impl HttpExecutor for WagiHttpExecutor<'_> {
     ) -> Result<Response<Body>> {
         let spin_http::routes::TriggerLookupKey::Component(component) = route_match.lookup_key()
         else {
-            anyhow::bail!("INCONCEIVABLE");
+            unreachable!()
         };
 
         tracing::trace!(

Original file line number	Diff line number	Diff line change
`@@ -718,6 +718,8 @@ fn dns_error(rcode: String, info_code: u16) -> ErrorCode {`
`718`	`718`	`})`
`719`	`719`	`}`
`720`	`720`
	`721`	`+// TODO: Remove this (and uses of it) once`
	`722`	`+// https://github.com/spinframework/spin/issues/3274 has been addressed.`
`721`	`723`	`pub fn p2_to_p3_error_code(code: p2_types::ErrorCode) -> p3_types::ErrorCode {`
`722`	`724`	`match code {`
`723`	`725`	`p2_types::ErrorCode::DnsTimeout => p3_types::ErrorCode::DnsTimeout,`
`@@ -818,6 +820,8 @@ pub fn p2_to_p3_error_code(code: p2_types::ErrorCode) -> p3_types::ErrorCode {`
`818`	`820`	`}`
`819`	`821`	`}`
`820`	`822`
	`823`	`+// TODO: Remove this (and uses of it) once`
	`824`	`+// https://github.com/spinframework/spin/issues/3274 has been addressed.`
`821`	`825`	`pub fn p3_to_p2_error_code(code: p3_types::ErrorCode) -> p2_types::ErrorCode {`
`822`	`826`	`match code {`
`823`	`827`	`p3_types::ErrorCode::DnsTimeout => p2_types::ErrorCode::DnsTimeout,`