rename web::State to web::Data

actix_todo/src/api.rs

@@ -9,8 +9,8 @@ use crate::db;
 use crate::session::{self, FlashMessage};
 
 pub fn index(
-    pool: web::State<db::PgPool>,
+    pool: web::Data<db::PgPool>,
-    tmpl: web::State<Tera>,
+    tmpl: web::Data<Tera>,
     session: Session,
 ) -> impl Future<Item = HttpResponse, Error = Error> {
     web::block(move || db::get_all_tasks(&pool))
@@ -45,7 +45,7 @@ pub struct CreateForm {
 
 pub fn create(
     params: web::Form<CreateForm>,
-    pool: web::State<db::PgPool>,
+    pool: web::Data<db::PgPool>,
     session: Session,
 ) -> impl Future<Item = HttpResponse, Error = Error> {
     if params.description.is_empty() {
@@ -86,7 +86,7 @@ pub struct UpdateForm {
 }
 
 pub fn update(
-    db: web::State<db::PgPool>,
+    db: web::Data<db::PgPool>,
     params: web::Path<UpdateParams>,
     form: web::Form<UpdateForm>,
     session: Session,
@@ -102,7 +102,7 @@ pub fn update(
 }
 
 fn toggle(
-    pool: web::State<db::PgPool>,
+    pool: web::Data<db::PgPool>,
     params: web::Path<UpdateParams>,
 ) -> impl Future<Item = HttpResponse, Error = Error> {
     web::block(move || db::toggle_task(params.id, &pool))
@@ -114,7 +114,7 @@ fn toggle(
 }
 
 fn delete(
-    pool: web::State<db::PgPool>,
+    pool: web::Data<db::PgPool>,
     params: web::Path<UpdateParams>,
     session: Session,
 ) -> impl Future<Item = HttpResponse, Error = Error> {

async_db/src/main.rs

@@ -21,7 +21,7 @@ use db::{Pool, Queries, WeatherAgg};
 
 /// Version 1: Calls 4 queries in sequential order, as an asynchronous handler
 fn asyncio_weather(
-    db: web::State<Pool>,
+    db: web::Data<Pool>,
 ) -> impl Future<Item = HttpResponse, Error = AWError> {
     let mut result: Vec<Vec<WeatherAgg>> = vec![];
 
@@ -52,7 +52,7 @@ fn asyncio_weather(
 /// Version 2: Calls 4 queries in parallel, as an asynchronous handler
 /// Returning Error types turn into None values in the response
 fn parallel_weather(
-    db: web::State<Pool>,
+    db: web::Data<Pool>,
 ) -> impl Future<Item = HttpResponse, Error = AWError> {
     let fut_result = vec![
         Box::new(db::execute(&db, Queries::GetTopTenHottestYears)),

diesel/src/main.rs

@@ -24,7 +24,7 @@ type Pool = r2d2::Pool<ConnectionManager<SqliteConnection>>;
 /// Diesel query
 fn query(
     nm: String,
-    pool: web::State<Pool>,
+    pool: web::Data<Pool>,
 ) -> Result<models::User, diesel::result::Error> {
     use self::schema::users::dsl::*;
 
@@ -44,7 +44,7 @@ fn query(
 /// Async request handler
 fn add(
     name: web::Path<String>,
-    pool: web::State<Pool>,
+    pool: web::Data<Pool>,
 ) -> impl Future<Item = HttpResponse, Error = Error> {
     // run diesel blocking code
     web::block(move || query(name.into_inner(), pool)).then(|res| match res {
@@ -63,7 +63,7 @@ const MAX_SIZE: usize = 262_144; // max payload size is 256k
 /// This handler manually load request payload and parse json object
 fn index_add<P>(
     pl: web::Payload<P>,
-    pool: web::State<Pool>,
+    pool: web::Data<Pool>,
 ) -> impl Future<Item = HttpResponse, Error = Error>
 where
     P: Stream<Item = Bytes, Error = error::PayloadError>,
@@ -110,7 +110,7 @@ where
 
 fn add2(
     item: web::Json<MyUser>,
-    pool: web::State<Pool>,
+    pool: web::Data<Pool>,
 ) -> impl Future<Item = HttpResponse, Error = Error> {
     // run diesel blocking code
     web::block(move || query(item.into_inner().name, pool)).then(|res| match res {

form/src/main.rs

@@ -45,7 +45,7 @@ fn handle_post_1(params: web::Form<MyParams>) -> Result<HttpResponse> {
 
 /// State and POST Params
 fn handle_post_2(
-    state: web::State<AppState>,
+    state: web::Data<AppState>,
     params: web::Form<MyParams>,
 ) -> HttpResponse {
     HttpResponse::Ok().content_type("text/plain").body(format!(

juniper/src/main.rs

@@ -24,7 +24,7 @@ fn graphiql() -> HttpResponse {
 }
 
 fn graphql(
-    st: web::State<Arc<Schema>>,
+    st: web::Data<Arc<Schema>>,
     data: web::Json<GraphQLRequest>,
 ) -> impl Future<Item = HttpResponse, Error = Error> {
     web::block(move || {

r2d2/src/main.rs

@@ -10,7 +10,7 @@ use uuid;
 /// Async request handler. Ddb pool is stored in application state.
 fn index(
     path: web::Path<String>,
-    db: web::State<Pool<SqliteConnectionManager>>,
+    db: web::Data<Pool<SqliteConnectionManager>>,
 ) -> impl Future<Item = HttpResponse, Error = Error> {
     // execute sync code in threadpool
     web::block(move || {

state/src/main.rs

@@ -1,12 +1,12 @@
 #![cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
-//! Application may have multiple states that are shared across
+//! Application may have multiple data objects that are shared across
-//! all handlers within same Application. State could be added
+//! all handlers within same Application. Data could be added
-//! with `App::state()` method, multiple different states could be added.
+//! with `App::data()` method, multiple different data objects could be added.
 //!
 //! > **Note**: http server accepts an application factory rather than an
 //! application > instance. Http server constructs an application instance for
-//! each thread, > thus application state
+//! each thread, > thus application data
-//! > must be constructed multiple times. If you want to share state between
+//! > must be constructed multiple times. If you want to share data between
 //! different > threads, a shared object should be used, e.g. `Arc`.
 //!
 //! Check [user guide](https://actix.rs/book/actix-web/sec-2-application.html) for more info.
@@ -17,7 +17,7 @@ use std::sync::{Arc, Mutex};
 use actix_web::{middleware, web, App, HttpRequest, HttpResponse, HttpServer};
 
 /// simple handle
-fn index(state: web::State<Arc<Mutex<usize>>>, req: HttpRequest) -> HttpResponse {
+fn index(state: web::Data<Arc<Mutex<usize>>>, req: HttpRequest) -> HttpResponse {
     println!("{:?}", req);
     *(state.lock().unwrap()) += 1;
 
@@ -33,7 +33,7 @@ fn main() -> io::Result<()> {
     //move is necessary to give closure below ownership of counter
     HttpServer::new(move || {
         App::new()
-            .state(counter.clone()) // <- create app with shared state
+            .data(counter.clone()) // <- create app with shared state
             // enable logger
             .middleware(middleware::Logger::default())
             // register simple handler, handle all methods

template_tera/src/main.rs

@@ -7,7 +7,7 @@ use actix_web::{error, middleware, web, App, Error, HttpResponse, HttpServer};
 
 // store tera template in application state
 fn index(
-    tmpl: web::State<tera::Tera>,
+    tmpl: web::Data<tera::Tera>,
     query: web::Query<HashMap<String, String>>,
 ) -> Result<HttpResponse, Error> {
     let s = if let Some(name) = query.get("name") {