From 47f31fb27d857200c06579f9655be1ddccfda2bb Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Wed, 13 Oct 2021 19:14:33 +0800 Subject: [PATCH] Edit Rocket example --- examples/rocket_example/src/main.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/examples/rocket_example/src/main.rs b/examples/rocket_example/src/main.rs index 29470fbd..e0b01bea 100644 --- a/examples/rocket_example/src/main.rs +++ b/examples/rocket_example/src/main.rs @@ -17,8 +17,6 @@ use pool::Db; mod setup; -type Result> = std::result::Result; - mod post; pub use post::Entity as Post; @@ -82,8 +80,8 @@ async fn update( #[get("/?&")] async fn list( conn: Connection<'_, Db>, - posts_per_page: Option, page: Option, + posts_per_page: Option, flash: Option>, ) -> Template { let db = conn.into_inner(); @@ -112,9 +110,9 @@ async fn list( context! { page: page, posts_per_page: posts_per_page, + num_pages: num_pages, posts: posts, flash: flash.map(FlashMessage::into_inner), - num_pages: num_pages, }, ) } @@ -148,7 +146,7 @@ async fn delete(conn: Connection<'_, Db>, id: i32) -> Flash { } #[delete("/")] -async fn destroy(conn: Connection<'_, Db>) -> Result<()> { +async fn destroy(conn: Connection<'_, Db>) -> Result<(), rocket::response::Debug> { let db = conn.into_inner(); Post::delete_many().exec(db).await.unwrap();