From 35a9d4e3c97361c638ce8358890bdf2ab25c0db9 Mon Sep 17 00:00:00 2001
From: Pat Hickey <pat@moreproductive.org>
Date: Thu, 6 May 2021 16:21:43 -0700
Subject: [PATCH] less general mechanism for examples cargo feature

---
 crates/misc/run-examples/src/main.rs | 18 +++++-------------
 examples/tokio/CARGO_FEATURES        |  1 -
 2 files changed, 5 insertions(+), 14 deletions(-)
 delete mode 100644 examples/tokio/CARGO_FEATURES

diff --git a/crates/misc/run-examples/src/main.rs b/crates/misc/run-examples/src/main.rs
index 0bff7d5c22..362f9e1774 100644
--- a/crates/misc/run-examples/src/main.rs
+++ b/crates/misc/run-examples/src/main.rs
@@ -13,11 +13,7 @@ fn main() -> anyhow::Result<()> {
             continue;
         }
 
-        examples.insert((
-            path.clone(),
-            path.file_stem().unwrap().to_str().unwrap().to_owned(),
-            dir,
-        ));
+        examples.insert((path.file_stem().unwrap().to_str().unwrap().to_owned(), dir));
     }
 
     println!("======== Building libwasmtime.a ===========");
@@ -25,7 +21,7 @@ fn main() -> anyhow::Result<()> {
         .args(&["build"])
         .current_dir("crates/c-api"))?;
 
-    for (example_path, example, is_dir) in examples {
+    for (example, is_dir) in examples {
         if example == "README" {
             continue;
         }
@@ -51,13 +47,9 @@ fn main() -> anyhow::Result<()> {
         println!("======== Rust example `{}` ============", example);
         let mut cargo_cmd = Command::new("cargo");
         cargo_cmd.arg("run").arg("--example").arg(&example);
-        if is_dir {
-            let mut features_path = std::path::PathBuf::from(example_path);
-            features_path.push("CARGO_FEATURES");
-            if features_path.exists() {
-                let features = std::fs::read_to_string(features_path)?;
-                cargo_cmd.arg("--features").arg(features);
-            }
+
+        if example.contains("tokio") {
+            cargo_cmd.arg("--features").arg("wasmtime-wasi/tokio");
         }
         run(&mut cargo_cmd)?;
 
diff --git a/examples/tokio/CARGO_FEATURES b/examples/tokio/CARGO_FEATURES
deleted file mode 100644
index c1c1ff5101..0000000000
--- a/examples/tokio/CARGO_FEATURES
+++ /dev/null
@@ -1 +0,0 @@
-wasmtime-wasi/tokio