Start9/rpc-toolkit
2
0
Fork 0
mirror of https://github.com/Start9Labs/rpc-toolkit.git synced 2026-03-26 02:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

'mo lifetimes 'mo problems

Browse Source
This commit is contained in:
Aiden McClelland
2021-07-27 11:49:37 -06:00
parent 9f60054625
commit 1b9be6b1c0
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rpc-toolkit/src/rpc_server_helpers.rs
View File

@@ -100,25 +100,29 @@ pub fn to_response<F: Fn(i32) -> StatusCode>(
}
// &mut Request<Body> -> Result<Result<Future<&mut RpcRequest<...> -> Future<Result<Result<&mut Response<Body> -> Future<Result<(), HttpError>>, Response<Body>>, HttpError>>>, Response<Body>>, HttpError>
pub type DynMiddleware<'a, 'b, 'c, Params> = Box<
dyn FnOnce(
pub type DynMiddleware<Params> = Box<
dyn for<'a> FnOnce(
&'a mut Request<Body>,
) -> BoxFuture<
'a,
Result<Result<DynMiddlewareStage2<'b, 'c, Params>, Response<Body>>, HttpError>,
Result<Result<DynMiddlewareStage2<Params>, Response<Body>>, HttpError>,
> + Send
+ Sync,
>;
pub type DynMiddlewareStage2<'a, 'b, Params> = Box<
dyn FnOnce(
pub type DynMiddlewareStage2<Params> = Box<
dyn for<'a> FnOnce(
&'a mut RpcRequest<GenericRpcMethod<String, Params>>,
)
-> BoxFuture<'a, Result<Result<DynMiddlewareStage3<'b>, Response<Body>>, HttpError>>
) -> BoxFuture<
'a,
Result<Result<DynMiddlewareStage3, Response<Body>>, HttpError>,
> + Send
+ Sync,
>;
pub type DynMiddlewareStage3 = Box<
dyn for<'a> FnOnce(&'a mut Response<Body>) -> BoxFuture<'a, Result<(), HttpError>>
+ Send
+ Sync,
>;
pub type DynMiddlewareStage3<'a> =
Box<dyn FnOnce(&'a mut Response<Body>) -> BoxFuture<'a, Result<(), HttpError>> + Send + Sync>;
pub fn constrain_middleware<
'a,

4
rpc-toolkit/tests/test.rs
View File

@@ -89,9 +89,9 @@ fn dothething2<U: Serialize + for<'a> Deserialize<'a> + FromStr<Err = E>, E: Dis
))
}
async fn cors<'a, 'b, Params: for<'de> Deserialize<'de> + 'static>(
async fn cors<Params: for<'de> Deserialize<'de> + 'static>(
req: &mut Request<Body>,
) -> Result<Result<DynMiddlewareStage2<'a, 'b, Params>, Response<Body>>, HttpError> {
) -> Result<Result<DynMiddlewareStage2<Params>, Response<Body>>, HttpError> {
if req.method() == hyper::Method::OPTIONS {
Ok(Err(Response::builder()
.header("Access-Control-Allow-Origin", "*")