msrd0/deprecated-gotham-restful
1
0
Fork 0
mirror of https://gitlab.com/msrd0/gotham-restful.git synced 2025-02-23 04:52:28 +00:00
Code Issues Releases Activity Actions

remove the annoying ToString type when what we really need is a &str

Browse source
This commit is contained in:
Dominic 2020-03-30 22:42:22 +02:00
parent c508ac878d
commit 1d1682a03d
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
example/src/main.rs
View file

@ -136,8 +136,8 @@ fn main()
gotham::start(ADDR, build_router(chain, pipelines, |route| { gotham::start(ADDR, build_router(chain, pipelines, |route| {
route.with_openapi("Users Example".to_owned(), "0.0.1".to_owned(), format!("http://{}", ADDR), |mut route| { route.with_openapi("Users Example".to_owned(), "0.0.1".to_owned(), format!("http://{}", ADDR), |mut route| {
route.resource::<Users, _>("users"); route.resource::<Users>("users");
route.resource::<Auth, _>("auth"); route.resource::<Auth>("auth");
route.get_openapi("openapi"); route.get_openapi("openapi");
}); });
})); }));

22
gotham_restful/src/openapi/router.rs
View file

@ -370,13 +370,13 @@ macro_rules! implOpenapiRouter {
C : PipelineHandleChain<P> + Copy + Send + Sync + 'static, C : PipelineHandleChain<P> + Copy + Send + Sync + 'static,
P : RefUnwindSafe + Send + Sync + 'static P : RefUnwindSafe + Send + Sync + 'static
{ {
fn resource<R : Resource, T : ToString>(&mut self, path : T) fn resource<R : Resource>(&mut self, path : &str)
{ {
R::setup((self, path.to_string())); R::setup((self, path));
} }
} }
impl<'a, C, P> DrawResourceRoutes for (&mut (&mut $implType<'a, C, P>, &mut OpenapiRouter), String) impl<'a, C, P> DrawResourceRoutes for (&mut (&mut $implType<'a, C, P>, &mut OpenapiRouter), &str)
where where
C : PipelineHandleChain<P> + Copy + Send + Sync + 'static, C : PipelineHandleChain<P> + Copy + Send + Sync + 'static,
P : RefUnwindSafe + Send + Sync + 'static P : RefUnwindSafe + Send + Sync + 'static
@ -393,7 +393,7 @@ macro_rules! implOpenapiRouter {
item.get = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::default(), None, None, Res::requires_auth())); item.get = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::default(), None, None, Res::requires_auth()));
(self.0).1.add_path(path, item); (self.0).1.add_path(path, item);
(&mut *(self.0).0, self.1.to_string()).read_all::<Handler, Res>() (&mut *(self.0).0, self.1).read_all::<Handler, Res>()
} }
fn read<Handler, ID, Res>(&mut self) fn read<Handler, ID, Res>(&mut self)
@ -409,7 +409,7 @@ macro_rules! implOpenapiRouter {
item.get = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::from_path_params(vec!["id"]), None, None, Res::requires_auth())); item.get = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::from_path_params(vec!["id"]), None, None, Res::requires_auth()));
(self.0).1.add_path(path, item); (self.0).1.add_path(path, item);
(&mut *(self.0).0, self.1.to_string()).read::<Handler, ID, Res>() (&mut *(self.0).0, self.1).read::<Handler, ID, Res>()
} }
fn search<Handler, Query, Res>(&mut self) fn search<Handler, Query, Res>(&mut self)
@ -425,7 +425,7 @@ macro_rules! implOpenapiRouter {
item.get = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::from_query_params(Query::schema()), None, None, Res::requires_auth())); item.get = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::from_query_params(Query::schema()), None, None, Res::requires_auth()));
(self.0).1.add_path(path, item); (self.0).1.add_path(path, item);
(&mut *(self.0).0, self.1.to_string()).search::<Handler, Query, Res>() (&mut *(self.0).0, self.1).search::<Handler, Query, Res>()
} }
fn create<Handler, Body, Res>(&mut self) fn create<Handler, Body, Res>(&mut self)
@ -442,7 +442,7 @@ macro_rules! implOpenapiRouter {
item.post = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::default(), Some(body_schema), Body::supported_types(), Res::requires_auth())); item.post = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::default(), Some(body_schema), Body::supported_types(), Res::requires_auth()));
(self.0).1.add_path(path, item); (self.0).1.add_path(path, item);
(&mut *(self.0).0, self.1.to_string()).create::<Handler, Body, Res>() (&mut *(self.0).0, self.1).create::<Handler, Body, Res>()
} }
fn update_all<Handler, Body, Res>(&mut self) fn update_all<Handler, Body, Res>(&mut self)
@ -459,7 +459,7 @@ macro_rules! implOpenapiRouter {
item.put = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::default(), Some(body_schema), Body::supported_types(), Res::requires_auth())); item.put = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::default(), Some(body_schema), Body::supported_types(), Res::requires_auth()));
(self.0).1.add_path(path, item); (self.0).1.add_path(path, item);
(&mut *(self.0).0, self.1.to_string()).update_all::<Handler, Body, Res>() (&mut *(self.0).0, self.1).update_all::<Handler, Body, Res>()
} }
fn update<Handler, ID, Body, Res>(&mut self) fn update<Handler, ID, Body, Res>(&mut self)
@ -477,7 +477,7 @@ macro_rules! implOpenapiRouter {
item.put = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::from_path_params(vec!["id"]), Some(body_schema), Body::supported_types(), Res::requires_auth())); item.put = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::from_path_params(vec!["id"]), Some(body_schema), Body::supported_types(), Res::requires_auth()));
(self.0).1.add_path(path, item); (self.0).1.add_path(path, item);
(&mut *(self.0).0, self.1.to_string()).update::<Handler, ID, Body, Res>() (&mut *(self.0).0, self.1).update::<Handler, ID, Body, Res>()
} }
fn delete_all<Handler, Res>(&mut self) fn delete_all<Handler, Res>(&mut self)
@ -492,7 +492,7 @@ macro_rules! implOpenapiRouter {
item.delete = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::default(), None, None, Res::requires_auth())); item.delete = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::default(), None, None, Res::requires_auth()));
(self.0).1.add_path(path, item); (self.0).1.add_path(path, item);
(&mut *(self.0).0, self.1.to_string()).delete_all::<Handler, Res>() (&mut *(self.0).0, self.1).delete_all::<Handler, Res>()
} }
fn delete<Handler, ID, Res>(&mut self) fn delete<Handler, ID, Res>(&mut self)
@ -508,7 +508,7 @@ macro_rules! implOpenapiRouter {
item.delete = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::from_path_params(vec!["id"]), None, None, Res::requires_auth())); item.delete = Some(new_operation(Res::default_status(), Res::accepted_types(), schema, OperationParams::from_path_params(vec!["id"]), None, None, Res::requires_auth()));
(self.0).1.add_path(path, item); (self.0).1.add_path(path, item);
(&mut *(self.0).0, self.1.to_string()).delete::<Handler, ID, Res>() (&mut *(self.0).0, self.1).delete::<Handler, ID, Res>()
} }
} }

8
gotham_restful/src/routing.rs
View file

@ -60,7 +60,7 @@ pub trait WithOpenapi<D>
/// any RESTful `Resource` with a path. /// any RESTful `Resource` with a path.
pub trait DrawResources pub trait DrawResources
{ {
fn resource<R : Resource, T : ToString>(&mut self, path : T); fn resource<R : Resource>(&mut self, path : &str);
} }
/// This trait allows to draw routes within an resource. Use this only inside the /// This trait allows to draw routes within an resource. Use this only inside the
@ -356,14 +356,14 @@ macro_rules! implDrawResourceRoutes {
C : PipelineHandleChain<P> + Copy + Send + Sync + 'static, C : PipelineHandleChain<P> + Copy + Send + Sync + 'static,
P : RefUnwindSafe + Send + Sync + 'static P : RefUnwindSafe + Send + Sync + 'static
{ {
fn resource<R : Resource, T : ToString>(&mut self, path : T) fn resource<R : Resource>(&mut self, path : &str)
{ {
R::setup((self, path.to_string())); R::setup((self, path));
} }
} }
#[allow(clippy::redundant_closure)] // doesn't work because of type parameters #[allow(clippy::redundant_closure)] // doesn't work because of type parameters
impl<'a, C, P> DrawResourceRoutes for (&mut $implType<'a, C, P>, String) impl<'a, C, P> DrawResourceRoutes for (&mut $implType<'a, C, P>, &str)
where where
C : PipelineHandleChain<P> + Copy + Send + Sync + 'static, C : PipelineHandleChain<P> + Copy + Send + Sync + 'static,
P : RefUnwindSafe + Send + Sync + 'static P : RefUnwindSafe + Send + Sync + 'static