Skip to content

Commit

Permalink
re-export ready boilerplate macros in dev
Browse files Browse the repository at this point in the history
  • Loading branch information
robjtede committed Apr 16, 2021
1 parent 2449f25 commit 879a4cb
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
26 changes: 14 additions & 12 deletions actix-web-codegen/tests/test_macro.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -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()
}

Expand Down Expand Up @@ -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);
Expand All @@ -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()
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 1 addition & 3 deletions src/middleware/compat.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 879a4cb

Please sign in to comment.