feat(examples): bump picoserve to 0.12.x (#433)

future-proof-iot · Sep 19, 2024 · ffa1234 · ffa1234
2 parents 6230b2d + 156807a
commit ffa1234
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/embassy-http-server/Cargo.toml b/examples/embassy-http-server/Cargo.toml
@@ -17,7 +17,7 @@ embassy-time = { workspace = true, default-features = false }
 embedded-io-async = { version = "0.6.0", features = ["defmt-03"] }
 heapless = { workspace = true }
 httparse = { version = "1.8.0", default-features = false }
-picoserve = { version = "0.8.0", default-features = false, features = [
+picoserve = { version = "0.12.0", default-features = false, features = [
   "embassy",
 ] }
 riot-rs = { path = "../../src/riot-rs", features = ["override-network-config"] }

diff --git a/examples/embassy-http-server/src/main.rs b/examples/embassy-http-server/src/main.rs
@@ -39,7 +39,7 @@ impl picoserve::extract::FromRef<AppState> for ButtonInputs {
 }
 
 mod approuter {
-    use picoserve::routing::get;
+    use picoserve::routing::{get, get_service};
 
     use crate::routes;
 
@@ -51,7 +51,13 @@ mod approuter {
     pub type AppRouter = impl picoserve::routing::PathRouter<AppState>;
 
     pub fn make_app() -> picoserve::Router<AppRouter, AppState> {
-        let router = picoserve::Router::new().route("/", get(routes::index));
+        let router = picoserve::Router::new().route(
+            "/",
+            get_service(picoserve::response::File::html(include_str!(concat!(
+                env!("CARGO_MANIFEST_DIR"),
+                "/static/index.html",
+            )))),
+        );
         #[cfg(feature = "button-readings")]
         let router = router.route("/buttons", get(routes::buttons));
         router

diff --git a/examples/embassy-http-server/src/routes/index.rs b/examples/embassy-http-server/src/routes/index.rs
diff --git a/examples/embassy-http-server/src/routes/mod.rs b/examples/embassy-http-server/src/routes/mod.rs
@@ -1,9 +1,5 @@
-pub mod index;
-
 #[cfg(feature = "button-readings")]
 pub mod buttons;
 
-pub use index::index;
-
 #[cfg(feature = "button-readings")]
 pub use buttons::buttons;