Make sure that pattern matching is exhaustive in tests (#503)

google · May 31, 2024 · eeeda7f · eeeda7f
1 parent b4a798d
commit eeeda7f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 4 deletions.
diff --git a/crates/protocol/CHANGELOG.md b/crates/protocol/CHANGELOG.md
@@ -2,4 +2,4 @@
 
 ## 0.1.0-git
 
-<!-- Increment to skip CHANGELOG.md test: 7 -->
+<!-- Increment to skip CHANGELOG.md test: 8 -->
diff --git a/crates/protocol/Cargo.toml b/crates/protocol/Cargo.toml
@@ -19,6 +19,7 @@ wasefire-error = { version = "0.1.1-git", path = "../error" }
 wasefire-wire = { version = "0.1.0-git", path = "../wire" }
 
 [features]
+_exhaustive = []
 full = []
 std = ["wasefire-wire/std"]
 

diff --git a/crates/protocol/src/lib.rs b/crates/protocol/src/lib.rs
@@ -76,7 +76,7 @@ macro_rules! api {
         #[derive(Debug, Wire)]
         #[wire(static = T)]
         #[cfg_attr(feature = "full", wire(range = $next))]
-        #[non_exhaustive]
+        #[cfg_attr(not(feature = "_exhaustive"), non_exhaustive)]
         pub enum Api<'a, T: Direction> {
             $(
                 $(#[doc = $doc])* $(#[cfg($cfg)])* #[wire(tag = $tag)]

diff --git a/crates/scheduler/CHANGELOG.md b/crates/scheduler/CHANGELOG.md
@@ -135,4 +135,4 @@
 
 ## 0.1.0
 
-<!-- Increment to skip CHANGELOG.md test: 38 -->
+<!-- Increment to skip CHANGELOG.md test: 39 -->
diff --git a/crates/scheduler/Cargo.toml b/crates/scheduler/Cargo.toml
@@ -229,6 +229,7 @@ wasm = ["dep:wasefire-interpreter"]
 # safety invariant.
 unsafe-skip-validation = []
 # Internal features.
+_test = ["wasefire-protocol?/_exhaustive"]
 internal-applet-api-crypto = []
 internal-applet-api-crypto-hash = ["dep:digest", "dep:generic-array", "internal-applet-api-crypto"]
 internal-applet-api-platform = []

diff --git a/crates/scheduler/src/protocol.rs b/crates/scheduler/src/protocol.rs
@@ -117,6 +117,7 @@ pub fn process_event<B: Board>(scheduler: &mut Scheduler<B>, event: board::Event
                 State::Tunnel { .. } => unreachable!(),
             }
         }
+        #[cfg(not(feature = "_test"))]
         _ => Api::DeviceError(Error::internal(Code::NotImplemented)),
     };
     reply::<B>(&response);

diff --git a/crates/scheduler/test.sh b/crates/scheduler/test.sh
@@ -25,7 +25,7 @@ check_board_api board-api- --features=wasm,std,
 
 test_helper
 
-cargo test --lib --features=full-api,wasm,std
+cargo test --lib --features=_test,full-api,wasm,std
 cargo check --lib --features=full-api,wasm,std,log
 cargo check --lib --target=i686-unknown-linux-gnu --features=full-api,native,std
 cargo check --lib --target=i686-unknown-linux-gnu --features=full-api,native,std,log