Skip to content

Commit

Permalink
Merge branch 'fix-nightly-tati' of https://github.com/aliemjay/xitca-web
Browse files Browse the repository at this point in the history
 into aliemjay-fix-nightly-tati
  • Loading branch information
fakeshadow committed Apr 28, 2022
2 parents 72345d2 + 243a931 commit 295d7a0
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion web/src/app/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ mod test {
assert_eq!(path, req.req().uri().path());
state.to_string()
}

#[derive(Clone)]
struct Middleware;

Expand Down
2 changes: 1 addition & 1 deletion web/src/handler/types/body.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use crate::{handler::FromRequest, request::RequestBody, request::WebRequest};

pub struct Body(pub RequestBody);

impl<'a, 'r, 's, S> FromRequest<'a, &'r mut WebRequest<'s, S>> for Body {
impl<'a, 'r, 's, S: 's> FromRequest<'a, &'r mut WebRequest<'s, S>> for Body {
type Type<'b> = Body;
type Error = Infallible;
type Future = impl Future<Output = Result<Self, Self::Error>> where &'r mut WebRequest<'s, S>: 'a;
Expand Down
4 changes: 2 additions & 2 deletions web/src/handler/types/extension.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ impl<T> Deref for ExtensionRef<'_, T> {
}
}

impl<'a, 'r, 's, S, T> FromRequest<'a, &'r mut WebRequest<'s, S>> for ExtensionRef<'a, T>
impl<'a, 'r, 's, S: 's, T> FromRequest<'a, &'r mut WebRequest<'s, S>> for ExtensionRef<'a, T>
where
T: Send + Sync + 'static,
{
Expand All @@ -44,7 +44,7 @@ impl Deref for ExtensionsRef<'_> {
}
}

impl<'a, 'r, 's, S> FromRequest<'a, &'r mut WebRequest<'s, S>> for ExtensionsRef<'a> {
impl<'a, 'r, 's, S: 's> FromRequest<'a, &'r mut WebRequest<'s, S>> for ExtensionsRef<'a> {
type Type<'b> = ExtensionsRef<'b>;
type Error = Infallible;
type Future = impl Future<Output = Result<Self, Self::Error>> where &'r mut WebRequest<'s, S>: 'a;
Expand Down
2 changes: 1 addition & 1 deletion web/src/handler/types/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ impl<T, const LIMIT: usize> DerefMut for Json<T, LIMIT> {
}
}

impl<'a, 'r, 's, S, T, const LIMIT: usize> FromRequest<'a, &'r mut WebRequest<'s, S>> for Json<T, LIMIT>
impl<'a, 'r, 's, S:'s, T, const LIMIT: usize> FromRequest<'a, &'r mut WebRequest<'s, S>> for Json<T, LIMIT>
where
T: DeserializeOwned,
{
Expand Down
2 changes: 1 addition & 1 deletion web/src/handler/types/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ impl Deref for PathRef<'_> {
}
}

impl<'a, 'r, 's, S> FromRequest<'a, &'r mut WebRequest<'s, S>> for PathRef<'a> {
impl<'a, 'r, 's, S: 's> FromRequest<'a, &'r mut WebRequest<'s, S>> for PathRef<'a> {
type Type<'b> = PathRef<'b>;
type Error = Infallible;
type Future = impl Future<Output = Result<Self, Self::Error>> where &'r mut WebRequest<'s, S>: 'a;
Expand Down
2 changes: 1 addition & 1 deletion web/src/handler/types/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ impl Deref for RequestRef<'_> {
}
}

impl<'a, 'r, 's, S> FromRequest<'a, &'r mut WebRequest<'s, S>> for RequestRef<'a> {
impl<'a, 'r, 's, S: 's> FromRequest<'a, &'r mut WebRequest<'s, S>> for RequestRef<'a> {
type Type<'b> = RequestRef<'b>;
type Error = Infallible;
type Future = impl Future<Output = Result<Self, Self::Error>> where &'r mut WebRequest<'s, S>: 'a;
Expand Down

0 comments on commit 295d7a0

Please sign in to comment.