msrd0/deprecated-gotham-restful
1
0
Fork 0
mirror of https://gitlab.com/msrd0/gotham-restful.git synced 2025-05-09 16:10:42 +00:00
Code Issues Releases Activity Actions

gotham finally has a release candidate

Browse source
This commit is contained in:
Dominic 2020-05-20 09:33:12 +02:00
parent 8321b63982
commit c1cb0e692a
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
6 changed files with 10 additions and 436 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/routing.rs
View file

@ -1,5 +1,4 @@
use crate::{
matcher::{AcceptHeaderMatcher, ContentTypeMatcher},
resource::*,
result::{ResourceError, ResourceResult},
RequestBody,
@ -22,7 +21,7 @@ use gotham::{
router::{
builder::*,
non_match::RouteNonMatch,
route::matcher::RouteMatcher
route::matcher::{AcceptHeaderRouteMatcher, ContentTypeHeaderRouteMatcher, RouteMatcher}
},
state::{FromState, State}
};
@ -262,7 +261,7 @@ fn remove_handler<Handler : ResourceRemove>(state : State) -> Pin<Box<HandlerFut
#[derive(Clone)]
struct MaybeMatchAcceptHeader
{
matcher : Option<AcceptHeaderMatcher>
matcher : Option<AcceptHeaderRouteMatcher>
}
impl RouteMatcher for MaybeMatchAcceptHeader
@ -285,7 +284,7 @@ impl From<Option<Vec<Mime>>> for MaybeMatchAcceptHeader
types => types
};
Self {
matcher: types.map(AcceptHeaderMatcher::new)
matcher: types.map(AcceptHeaderRouteMatcher::new)
}
}
}
@ -293,7 +292,7 @@ impl From<Option<Vec<Mime>>> for MaybeMatchAcceptHeader
#[derive(Clone)]
struct MaybeMatchContentTypeHeader
{
matcher : Option<ContentTypeMatcher>
matcher : Option<ContentTypeHeaderRouteMatcher>
}
impl RouteMatcher for MaybeMatchContentTypeHeader
@ -312,7 +311,7 @@ impl From<Option<Vec<Mime>>> for MaybeMatchContentTypeHeader
fn from(types : Option<Vec<Mime>>) -> Self
{
Self {
matcher: types.map(ContentTypeMatcher::new).map(ContentTypeMatcher::allow_no_type)
matcher: types.map(|types| ContentTypeHeaderRouteMatcher::new(types).allow_no_type())
}
}
}