mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-05 13:57:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Make Ctx copy

Browse source
This commit is contained in:
Nikolay Kim 2023-06-15 16:29:32 +06:00
parent 4650a41648
commit e450ac80b8
2 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ntex-service/src/and_then.rs
View file

@ -63,7 +63,7 @@ where
AndThenServiceResponse { AndThenServiceResponse {
slf: self, slf: self,
state: State::A { state: State::A {
fut: ctx.clone().call(&self.svc1, req), fut: ctx.call(&self.svc1, req),
ctx: Some(ctx), ctx: Some(ctx),
}, },
} }

22
ntex-service/src/ctx.rs
View file

@ -114,16 +114,16 @@ impl<S> Drop for Container<S> {
} }
} }
pub struct Ctx<'b, S: ?Sized> { pub struct Ctx<'a, S: ?Sized> {
index: usize, index: usize,
waiters: &'b Rc<RefCell<slab::Slab<Option<task::Waker>>>>, waiters: &'a Rc<RefCell<slab::Slab<Option<task::Waker>>>>,
_t: marker::PhantomData<Rc<S>>, _t: marker::PhantomData<Rc<S>>,
} }
impl<'b, S: ?Sized> Ctx<'b, S> { impl<'a, S: ?Sized> Ctx<'a, S> {
pub(crate) fn new( pub(crate) fn new(
index: usize, index: usize,
waiters: &'b Rc<RefCell<slab::Slab<Option<task::Waker>>>>, waiters: &'a Rc<RefCell<slab::Slab<Option<task::Waker>>>>,
) -> Self { ) -> Self {
Self { Self {
index, index,
@ -134,15 +134,15 @@ impl<'b, S: ?Sized> Ctx<'b, S> {
pub(crate) fn into_inner( pub(crate) fn into_inner(
self, self,
) -> (usize, &'b Rc<RefCell<slab::Slab<Option<task::Waker>>>>) { ) -> (usize, &'a Rc<RefCell<slab::Slab<Option<task::Waker>>>>) {
(self.index, self.waiters) (self.index, self.waiters)
} }
/// Call service, do not check service readiness /// Call service, do not check service readiness
pub(crate) fn call_nowait<T, R>(&self, svc: &'b T, req: R) -> T::Future<'b> pub(crate) fn call_nowait<T, R>(&self, svc: &'a T, req: R) -> T::Future<'a>
where where
T: Service<R> + ?Sized, T: Service<R> + ?Sized,
R: 'b, R: 'a,
{ {
svc.call( svc.call(
req, req,
@ -156,10 +156,10 @@ impl<'b, S: ?Sized> Ctx<'b, S> {
#[inline] #[inline]
/// Wait for service readiness and then call service /// Wait for service readiness and then call service
pub fn call<T, R>(&self, svc: &'b T, req: R) -> ServiceCall<'b, T, R> pub fn call<T, R>(&self, svc: &'a T, req: R) -> ServiceCall<'a, T, R>
where where
T: Service<R> + ?Sized, T: Service<R> + ?Sized,
R: 'b, R: 'a,
{ {
ServiceCall { ServiceCall {
state: ServiceCallState::Ready { state: ServiceCallState::Ready {
@ -172,7 +172,9 @@ impl<'b, S: ?Sized> Ctx<'b, S> {
} }
} }
impl<'b, S: ?Sized> Clone for Ctx<'b, S> { impl<'a, S: ?Sized> Copy for Ctx<'a, S> {}
impl<'a, S: ?Sized> Clone for Ctx<'a, S> {
fn clone(&self) -> Self { fn clone(&self) -> Self {
Self { Self {
index: self.index, index: self.index,