diff --git a/actix-service/src/and_then.rs b/actix-service/src/and_then.rs
index 20ea1612..01840c18 100644
--- a/actix-service/src/and_then.rs
+++ b/actix-service/src/and_then.rs
@@ -4,13 +4,13 @@ use std::rc::Rc;
use std::task::{Context, Poll};
use super::{Service, ServiceFactory};
-use crate::axcell::AXCell;
+use crate::rcrefcell::RcRefCell;
/// Service for the `and_then` combinator, chaining a computation onto the end
/// of another service which completes successfully.
///
/// This is created by the `ServiceExt::and_then` method.
-pub(crate) struct AndThenService(AXCell<(A, B)>);
+pub(crate) struct AndThenService(RcRefCell<(A, B)>);
impl AndThenService {
/// Create new `AndThen` combinator
@@ -19,7 +19,7 @@ impl AndThenService {
A: Service,
B: Service,
{
- Self(AXCell::new((a, b)))
+ Self(RcRefCell::new((a, b)))
}
}
@@ -73,7 +73,7 @@ where
A: Service,
B: Service,
{
- A(#[pin] A::Future, Option>),
+ A(#[pin] A::Future, Option>),
B(#[pin] B::Future),
Empty,
}
diff --git a/actix-service/src/lib.rs b/actix-service/src/lib.rs
index 04a72814..b64a7a5e 100644
--- a/actix-service/src/lib.rs
+++ b/actix-service/src/lib.rs
@@ -13,7 +13,7 @@ mod apply;
mod apply_cfg;
pub mod boxed;
mod cell;
-mod axcell;
+mod rcrefcell;
mod fn_service;
mod map;
mod map_config;
diff --git a/actix-service/src/axcell.rs b/actix-service/src/rcrefcell.rs
similarity index 82%
rename from actix-service/src/axcell.rs
rename to actix-service/src/rcrefcell.rs
index 0e2f286f..a4ba746c 100644
--- a/actix-service/src/axcell.rs
+++ b/actix-service/src/rcrefcell.rs
@@ -2,11 +2,11 @@
use std::task::{Context, Poll};
use std::{cell::{RefCell, RefMut}, fmt, rc::Rc};
-pub(crate) struct AXCell {
+pub(crate) struct RcRefCell {
inner: Rc>,
}
-impl Clone for AXCell {
+impl Clone for RcRefCell {
fn clone(&self) -> Self {
Self {
inner: self.inner.clone(),
@@ -14,13 +14,13 @@ impl Clone for AXCell {
}
}
-impl fmt::Debug for AXCell {
+impl fmt::Debug for RcRefCell {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
self.inner.fmt(f)
}
}
-impl AXCell {
+impl RcRefCell {
pub(crate) fn new(inner: T) -> Self {
Self {
inner: Rc::new(RefCell::new(inner)),
@@ -32,7 +32,7 @@ impl AXCell {
}
}
-impl crate::Service for AXCell {
+impl crate::Service for RcRefCell {
type Request = T::Request;
type Response = T::Response;
type Error = T::Error;