berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

rename RequestFilter to Filter

This commit is contained in:
axon-q 2018-06-14 09:56:12 +00:00
parent 97b149f321
commit 024666509e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/middleware/etaghasher.rs
View File

@ -90,7 +90,7 @@ pub trait Hasher {
fn hash(&mut self, input: &[u8]) -> String; fn hash(&mut self, input: &[u8]) -> String;
} }
/// Can test a (request, response) pair and return `true` or `false` /// Can test a (request, response) pair and return `true` or `false`
pub trait RequestFilter<S> { pub trait Filter<S> {
/// Return `true` if ETag processing should be applied to this /// Return `true` if ETag processing should be applied to this
/// `(request, response)` pair and `false` otherwise. A `false` return /// `(request, response)` pair and `false` otherwise. A `false` return
/// value will immediately return the original response unchanged. /// value will immediately return the original response unchanged.
@ -103,7 +103,7 @@ impl<F: FnMut(&[u8]) -> String> Hasher for F {
self(input) self(input)
} }
} }
impl<S, F: Fn(&HttpRequest<S>, &HttpResponse) -> bool> RequestFilter<S> for F { impl<S, F: Fn(&HttpRequest<S>, &HttpResponse) -> bool> Filter<S> for F {
fn filter(&self, req: &HttpRequest<S>, res: &HttpResponse) -> bool { fn filter(&self, req: &HttpRequest<S>, res: &HttpResponse) -> bool {
self(req, res) self(req, res)
} }
@ -134,7 +134,7 @@ impl Hasher for DefaultHasher {
/// Returns `true` when the request method is `GET` or `HEAD` and the /// Returns `true` when the request method is `GET` or `HEAD` and the
/// original response status is `200 OK`, and `false` otherwise. /// original response status is `200 OK`, and `false` otherwise.
pub struct DefaultFilter; pub struct DefaultFilter;
impl<S> RequestFilter<S> for DefaultFilter { impl<S> Filter<S> for DefaultFilter {
fn filter(&self, req: &HttpRequest<S>, res: &HttpResponse) -> bool { fn filter(&self, req: &HttpRequest<S>, res: &HttpResponse) -> bool {
use http::{Method, StatusCode}; use http::{Method, StatusCode};
(*req.method() == Method::GET || *req.method() == Method::HEAD) (*req.method() == Method::GET || *req.method() == Method::HEAD)
@ -154,7 +154,7 @@ pub struct EtagHasher<S, H, F>
where where
S: 'static, S: 'static,
H: Hasher + 'static, H: Hasher + 'static,
F: RequestFilter<S> + 'static, F: Filter<S> + 'static,
{ {
hasher: H, hasher: H,
filter: F, filter: F,
@ -165,9 +165,9 @@ impl<S, H, F> EtagHasher<S, H, F>
where where
S: 'static, S: 'static,
H: Hasher + 'static, H: Hasher + 'static,
F: RequestFilter<S> + 'static, F: Filter<S> + 'static,
{ {
/// Create a new middleware struct with the given Hasher and RequestFilter. /// Create a new middleware struct with the given Hasher and Filter.
pub fn new(hasher: H, filter: F) -> Self { pub fn new(hasher: H, filter: F) -> Self {
EtagHasher { EtagHasher {
hasher, hasher,
@ -181,7 +181,7 @@ impl<S, H, F> middleware::Middleware<S> for EtagHasher<S, H, F>
where where
S: 'static, S: 'static,
H: Hasher + 'static, H: Hasher + 'static,
F: RequestFilter<S> + 'static, F: Filter<S> + 'static,
{ {
fn response( fn response(
&mut self, req: &mut HttpRequest<S>, mut res: HttpResponse, &mut self, req: &mut HttpRequest<S>, mut res: HttpResponse,