fully qualify SpiError, task_net_api::{SendError, RecvError} type…

…s in Idol (#1689)
oxidecomputer · Mar 29, 2024 · ad28904 · ad28904
1 parent bbe852f
commit ad28904
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/drv/spi-api/src/lib.rs b/drv/spi-api/src/lib.rs
@@ -6,6 +6,8 @@
 
 #![no_std]
 
+// For Idol-generated code that fully qualifies error type names.
+use crate as drv_spi_api;
 use derive_idol_err::IdolError;
 use gateway_messages::SpiError as GwSpiError;
 use hubpack::SerializedSize;

diff --git a/idl/net.idol b/idl/net.idol
@@ -15,7 +15,7 @@ Interface(
             },
             reply: Result(
                 ok: "UdpMetadata",
-                err: CLike("RecvError"),
+                err: CLike("task_net_api::RecvError"),
             ),
         ),
         "send_packet": (
@@ -30,7 +30,7 @@ Interface(
             },
             reply: Result(
                 ok: "()",
-                err: CLike("SendError"),
+                err: CLike("task_net_api::SendError"),
             ),
         ),
         "smi_read": (

diff --git a/idl/spi.idol b/idl/spi.idol
@@ -14,7 +14,7 @@ Interface(
             },
             reply: Result(
                 ok: "()",
-                err: CLike("SpiError"),
+                err: CLike("drv_spi_api::SpiError"),
             ),
         ),
         "write": (
@@ -27,7 +27,7 @@ Interface(
             },
             reply: Result(
                 ok: "()",
-                err: CLike("SpiError"),
+                err: CLike("drv_spi_api::SpiError"),
             ),
         ),
         "exchange": (
@@ -41,7 +41,7 @@ Interface(
             },
             reply: Result(
                 ok: "()",
-                err: CLike("SpiError"),
+                err: CLike("drv_spi_api::SpiError"),
             ),
         ),
         "lock": (

diff --git a/task/net-api/src/lib.rs b/task/net-api/src/lib.rs
@@ -6,6 +6,8 @@
 
 #![no_std]
 
+// For Idol-generated code that fully qualifies error type names.
+use crate as task_net_api;
 use derive_idol_err::IdolError;
 use hubpack::SerializedSize;
 use serde::{Deserialize, Serialize};

diff --git a/task/net/src/main.rs b/task/net/src/main.rs
@@ -58,7 +58,7 @@ mod idl {
     use task_net_api::{
         KszError, KszMacTableEntry, LargePayloadBehavior, MacAddress,
         MacAddressBlock, ManagementCounters, ManagementLinkStatus, MgmtError,
-        PhyError, RecvError, SendError, SocketName, UdpMetadata,
+        PhyError, SocketName, UdpMetadata,
     };
     include!(concat!(env!("OUT_DIR"), "/server_stub.rs"));
 }