mirror of
https://github.com/actix/actix-web.git
synced 2024-12-21 23:56:35 +00:00
re-export ready boilerplate macros in dev
This commit is contained in:
parent
2449f2555c
commit
879a4cbcd8
3 changed files with 16 additions and 16 deletions
|
@ -1,11 +1,15 @@
|
|||
use std::future::Future;
|
||||
use std::task::{Context, Poll};
|
||||
|
||||
use actix_utils::future::{ok, Ready};
|
||||
use actix_web::dev::{Service, ServiceRequest, ServiceResponse, Transform};
|
||||
use actix_web::http::header::{HeaderName, HeaderValue};
|
||||
use actix_web::http::StatusCode;
|
||||
use actix_web::{http, web::Path, App, Error, HttpResponse, Responder};
|
||||
use actix_web::{
|
||||
dev::{Service, ServiceRequest, ServiceResponse, Transform},
|
||||
http::{
|
||||
self,
|
||||
header::{HeaderName, HeaderValue},
|
||||
StatusCode,
|
||||
},
|
||||
web, App, Error, HttpResponse, Responder,
|
||||
};
|
||||
use actix_web_codegen::{connect, delete, get, head, options, patch, post, put, route, trace};
|
||||
use futures_core::future::LocalBoxFuture;
|
||||
|
||||
|
@ -66,17 +70,17 @@ fn auto_sync() -> impl Future<Output = Result<HttpResponse, actix_web::Error>> {
|
|||
}
|
||||
|
||||
#[put("/test/{param}")]
|
||||
async fn put_param_test(_: Path<String>) -> impl Responder {
|
||||
async fn put_param_test(_: web::Path<String>) -> impl Responder {
|
||||
HttpResponse::Created()
|
||||
}
|
||||
|
||||
#[delete("/test/{param}")]
|
||||
async fn delete_param_test(_: Path<String>) -> impl Responder {
|
||||
async fn delete_param_test(_: web::Path<String>) -> impl Responder {
|
||||
HttpResponse::NoContent()
|
||||
}
|
||||
|
||||
#[get("/test/{param}")]
|
||||
async fn get_param_test(_: Path<String>) -> impl Responder {
|
||||
async fn get_param_test(_: web::Path<String>) -> impl Responder {
|
||||
HttpResponse::Ok()
|
||||
}
|
||||
|
||||
|
@ -125,9 +129,7 @@ where
|
|||
type Error = Error;
|
||||
type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
|
||||
|
||||
fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
|
||||
self.service.poll_ready(cx)
|
||||
}
|
||||
actix_web::dev::forward_ready!(service);
|
||||
|
||||
fn call(&self, req: ServiceRequest) -> Self::Future {
|
||||
let fut = self.service.call(req);
|
||||
|
@ -144,7 +146,7 @@ where
|
|||
}
|
||||
|
||||
#[get("/test/wrap", wrap = "ChangeStatusCode")]
|
||||
async fn get_wrap(_: Path<String>) -> impl Responder {
|
||||
async fn get_wrap(_: web::Path<String>) -> impl Responder {
|
||||
// panic!("actually never gets called because path failed to extract");
|
||||
HttpResponse::Ok()
|
||||
}
|
||||
|
|
|
@ -145,7 +145,7 @@ pub mod dev {
|
|||
pub use actix_http::{Extensions, Payload, PayloadStream, RequestHead, ResponseHead};
|
||||
pub use actix_router::{Path, ResourceDef, ResourcePath, Url};
|
||||
pub use actix_server::Server;
|
||||
pub use actix_service::{Service, Transform};
|
||||
pub use actix_service::{always_ready, forward_ready, Service, Transform};
|
||||
|
||||
pub(crate) fn insert_slash(mut patterns: Vec<String>) -> Vec<String> {
|
||||
for path in &mut patterns {
|
||||
|
|
|
@ -80,9 +80,7 @@ where
|
|||
type Error = Error;
|
||||
type Future = CompatMiddlewareFuture<S::Future>;
|
||||
|
||||
fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
|
||||
self.service.poll_ready(cx).map_err(From::from)
|
||||
}
|
||||
actix_service::forward_ready!(service);
|
||||
|
||||
fn call(&self, req: Req) -> Self::Future {
|
||||
let fut = self.service.call(req);
|
||||
|
|
Loading…
Reference in a new issue