From da969fed1f34527084fcaad294649f93f382d976 Mon Sep 17 00:00:00 2001
From: Cameron Dershem <cameron@pinkhatbeard.com>
Date: Wed, 19 Jun 2019 14:24:31 -0400
Subject: [PATCH] simplifies the front-page examples.

---
 examples/easy-form-handling/src/main.rs  |  4 ++--
 examples/main-example/src/main.rs        |  4 ++--
 examples/powerful-extractors/src/main.rs |  8 ++++----
 layouts/index.html                       | 15 +++++++--------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/examples/easy-form-handling/src/main.rs b/examples/easy-form-handling/src/main.rs
index da0a115..84f577a 100644
--- a/examples/easy-form-handling/src/main.rs
+++ b/examples/easy-form-handling/src/main.rs
@@ -14,8 +14,8 @@ fn index() -> HttpResponse {
         .body(include_str!("../static/form.html"))
 }
 
-fn register(params: web::Form<Register>) -> impl Responder {
-    format!("Hello {} from {}!", params.username, params.country)
+fn register(form: web::Form<Register>) -> impl Responder {
+    format!("Hello {} from {}!", form.username, form.country)
 }
 
 fn main() {
diff --git a/examples/main-example/src/main.rs b/examples/main-example/src/main.rs
index bc8649d..11f7025 100644
--- a/examples/main-example/src/main.rs
+++ b/examples/main-example/src/main.rs
@@ -9,8 +9,8 @@ fn greet(req: HttpRequest) -> impl Responder {
 fn main() {
     HttpServer::new(|| {
         App::new()
-            .service(web::resource("/").to(greet))
-            .service(web::resource("/{name}").to(greet))
+            .route("/", web::get().to(greet))
+            .route("/{name}", web::get().to(greet))
     })
     .bind("127.0.0.1:8088")
     .unwrap()
diff --git a/examples/powerful-extractors/src/main.rs b/examples/powerful-extractors/src/main.rs
index e6b11f8..8b8fe7e 100644
--- a/examples/powerful-extractors/src/main.rs
+++ b/examples/powerful-extractors/src/main.rs
@@ -9,19 +9,19 @@ struct Event {
     tags: Vec<String>,
 }
 
-fn store_event_in_db(timestamp: f64, kind: String, tags: Vec<String>) -> Event {
+fn store_in_db(timestamp: f64, kind: &String, tags: &Vec<String>) -> Event {
     // store item in db and get new_event
     // use id to lookup item
     Event {
         id: Some(1),
         timestamp: timestamp,
-        kind: kind,
-        tags: tags,
+        kind: kind.to_string(),
+        tags: tags.to_vec(),
     }
 }
 
 fn capture_event(evt: web::Json<Event>) -> impl Responder {
-    let new_event = store_event_in_db(evt.timestamp, evt.kind.clone(), evt.tags.clone());
+    let new_event = store_in_db(evt.timestamp, &evt.kind, &evt.tags);
     format!("got event {}", new_event.id.unwrap())
 }
 
diff --git a/layouts/index.html b/layouts/index.html
index 9cf4c3a..4b0fd05 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -39,7 +39,7 @@
     </div>
     <div class="col-md-8">
       <div class="actix-content">
-        {{ highlight `use actix_web::{web, App, HttpRequest, HttpResponse, HttpServer};
+        {{ highlight `use actix_web::{web, App, HttpRequest, HttpServer};
 
 fn greet(req: HttpRequest) -> impl Responder {
     let name = req.match_info().get("name").unwrap_or("World");
@@ -49,8 +49,8 @@ fn greet(req: HttpRequest) -> impl Responder {
 fn main() {
     HttpServer::new(|| {
         App::new()
-            .service(web::resource("/").to(greet))
-            .service(web::resource("/{name}").to(greet))
+            .route("/", web::get().to(greet))
+            .route("/{name}", web::get().to(greet))
     })
     .bind("127.0.0.1:8000")
     .expect("Can not bind to port 8000")
@@ -98,10 +98,9 @@ struct Event {
     kind: String,
     tags: Vec<String>,
 }
+
 fn capture_event(evt: web::Json<Event>) -> impl Responder {
-    let new_event = store_event_in_db(evt.timestamp,
-                                      evt.kind.clone(),
-                                      evt.tags.clone());
+    let new_event = store_in_db(evt.timestamp, &evt.kind, &evt.tags);
     format!("got event {}", new_event.id.unwrap())
 }` "rust" "" }}
         </div>
@@ -118,8 +117,8 @@ struct Register {
     country: String,
 }
 
-fn register(params: web::Form<Register>) -> impl Responder {
-    format!("Hello {} from {}!", params.username, params.country)
+fn register(form: web::Form<Register>) -> impl Responder {
+    format!("Hello {} from {}!", form.username, form.country)
 }` "rust" "" }}
         </div>
         <div class="actix-feature" id="routing">