extractors: done-ish.

examples/request-handlers/Cargo.toml

@@ -1,8 +1,7 @@
 [package]
 name = "request-handlers"
-version = "0.7.0"
+version = "1.0.0"
 edition = "2018"
 
 [dependencies]
-actix-web = "0.7"
-actix = "0.7"
+actix-web = "1.0"

examples/request-handlers/src/handlers_arc.rs

@@ -1,34 +1,37 @@
 // <arc>
-use actix_web::{dev::Handler, server, App, HttpRequest, HttpResponse};
+use actix_web::{web, App, HttpServer, Responder};
 use std::sync::atomic::{AtomicUsize, Ordering};
 use std::sync::Arc;
 
-struct MyHandler(Arc<AtomicUsize>);
+#[derive(Clone)]
+struct AppState {
+    count: Arc<AtomicUsize>,
+}
 
-impl<S> Handler<S> for MyHandler {
-    type Result = HttpResponse;
+fn show_count(data: web::Data<AppState>) -> impl Responder {
+    format!("count: {}", data.count.load(Ordering::Relaxed))
+}
 
-    /// Handle request
-    fn handle(&self, _req: &HttpRequest<S>) -> Self::Result {
-        self.0.fetch_add(1, Ordering::Relaxed);
-        HttpResponse::Ok().into()
-    }
+fn add_one(data: web::Data<AppState>) -> impl Responder {
+    data.count.fetch_add(1, Ordering::Relaxed);
+
+    format!("count: {}", data.count.load(Ordering::Relaxed))
 }
 
 pub fn main() {
-    let sys = actix::System::new("example");
+    let data = AppState {
+        count: Arc::new(AtomicUsize::new(0)),
+    };
 
-    let inc = Arc::new(AtomicUsize::new(0));
-
-    server::new(move || {
-        let cloned = inc.clone();
-        App::new().resource("/", move |r| r.h(MyHandler(cloned)))
+    HttpServer::new(move || {
+        App::new()
+            .data(data.clone())
+            .route("/", web::to(show_count))
+            .route("/add", web::to(add_one))
     })
     .bind("127.0.0.1:8088")
     .unwrap()
-    .start();
-
-    println!("Started http server: 127.0.0.1:8088");
-    let _ = sys.run();
+    .run()
+    .unwrap();
 }
 // </arc>

examples/request-handlers/src/main.rs

@@ -1,25 +1,38 @@
-mod handlers_arc;
-// <handler>
-use actix_web::{dev::Handler, server, App, HttpRequest, HttpResponse};
+pub mod handlers_arc;
+// <data>
+use actix_web::{web, App, HttpServer, Responder};
 use std::cell::Cell;
 
-struct MyHandler(Cell<usize>);
+#[derive(Clone)]
+struct AppState {
+    count: Cell<i32>,
+}
 
-impl<S> Handler<S> for MyHandler {
-    type Result = HttpResponse;
+fn show_count(data: web::Data<AppState>) -> impl Responder {
+    format!("count: {}", data.count.get())
+}
 
-    /// Handle request
-    fn handle(&self, _req: &HttpRequest<S>) -> Self::Result {
-        let i = self.0.get();
-        self.0.set(i + 1);
-        HttpResponse::Ok().into()
-    }
+fn add_one(data: web::Data<AppState>) -> impl Responder {
+    let count = data.count.get();
+    data.count.set(count + 1);
+
+    format!("count: {}", data.count.get())
 }
 
 fn main() {
-    server::new(|| App::new().resource("/", |r| r.h(MyHandler(Cell::new(0))))) //use r.h() to bind handler, not the r.f()
-        .bind("127.0.0.1:8088")
-        .unwrap()
-        .run();
+    let data = AppState {
+        count: Cell::new(0),
+    };
+
+    HttpServer::new(move || {
+        App::new()
+            .data(data.clone())
+            .route("/", web::to(show_count))
+            .route("/add", web::to(add_one))
+    })
+    .bind("127.0.0.1:8088")
+    .unwrap()
+    .run()
+    .unwrap();
 }
-// </handler>
+// </data>