Rename GroupInner to InnerGroup

src/collections/group_inner.rs → src/collections/inner_group.rs

@@ -8,7 +8,7 @@ use crate::utils::{PollVec, WakerVec};
 const GROUP_GROWTH_FACTOR: usize = 2;
 
 #[pin_project::pin_project]
-pub struct GroupInner<A> {
+pub struct InnerGroup<A> {
     #[pin]
     pub items: Slab<A>,
     pub wakers: WakerVec,
@@ -18,7 +18,7 @@ pub struct GroupInner<A> {
     len: usize,
 }
 
-impl<A> GroupInner<A> {
+impl<A> InnerGroup<A> {
     pub fn with_capacity(cap: usize) -> Self {
         Self {
             items: Slab::with_capacity(cap),
@@ -117,20 +117,20 @@ impl<A> GroupInner<A> {
 }
 
 /// Keyed operations
-impl<A> GroupInner<A> {
+impl<A> InnerGroup<A> {
     // move to other impl block
     pub fn contains_key(&self, key: Key) -> bool {
         self.items.contains(key.0)
     }
 }
 
-impl<A> Default for GroupInner<A> {
+impl<A> Default for InnerGroup<A> {
     fn default() -> Self {
         Self::with_capacity(0)
     }
 }
 
-impl<A> fmt::Debug for GroupInner<A> {
+impl<A> fmt::Debug for InnerGroup<A> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         f.debug_struct("GroupInner")
             .field("cap", &self.cap)

src/collections/mod.rs

@@ -1,3 +1,3 @@
-pub(crate) mod group_inner;
+pub(crate) mod inner_group;
 #[cfg(feature = "alloc")]
 pub mod vec;

src/future/future_group.rs

@@ -4,7 +4,7 @@ use core::task::{Context, Poll};
 use futures_core::stream::Stream;
 use futures_core::Future;
 
-use crate::collections::group_inner::{GroupInner, Key};
+use crate::collections::inner_group::{InnerGroup, Key};
 
 /// A growable group of futures which act as a single unit.
 ///
@@ -59,7 +59,7 @@ use crate::collections::group_inner::{GroupInner, Key};
 #[pin_project::pin_project]
 pub struct FutureGroup<F> {
     #[pin]
-    inner: GroupInner<F>,
+    inner: InnerGroup<F>,
 }
 
 impl<F> FutureGroup<F> {
@@ -89,7 +89,7 @@ impl<F> FutureGroup<F> {
     /// ```
     pub fn with_capacity(capacity: usize) -> Self {
         Self {
-            inner: GroupInner::with_capacity(capacity),
+            inner: InnerGroup::with_capacity(capacity),
         }
     }
 

src/stream/stream_group.rs

@@ -5,7 +5,7 @@ use core::task::{Context, Poll};
 use futures_core::Stream;
 use smallvec::{smallvec, SmallVec};
 
-use crate::collections::group_inner::{GroupInner, Key};
+use crate::collections::inner_group::{InnerGroup, Key};
 
 /// A growable group of streams which act as a single unit.
 ///
@@ -59,7 +59,7 @@ use crate::collections::group_inner::{GroupInner, Key};
 #[pin_project::pin_project]
 pub struct StreamGroup<S> {
     #[pin]
-    inner: GroupInner<S>,
+    inner: InnerGroup<S>,
 }
 
 impl<S> StreamGroup<S> {
@@ -89,7 +89,7 @@ impl<S> StreamGroup<S> {
     /// ```
     pub fn with_capacity(capacity: usize) -> Self {
         Self {
-            inner: GroupInner::with_capacity(capacity),
+            inner: InnerGroup::with_capacity(capacity),
         }
     }