cleanup

specta-rs · Jul 17, 2023 · bd89813 · bd89813
1 parent 84923cc
commit bd89813
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/internal/procedure/procedure.rs b/src/internal/procedure/procedure.rs
@@ -1,5 +1,3 @@
-use std::marker::PhantomData;
-
 use std::borrow::Cow;
 
 use serde::de::DeserializeOwned;
@@ -13,17 +11,17 @@ use crate::{
         },
         procedure::{BuildProceduresCtx, DynProcedure},
         FutureMarkerType, Marker, ProcedureDataType, RequestLayer, ResolverFunction,
-        SealedRequestLayer, StreamMarkerType,
+        StreamMarkerType,
     },
     ExecError,
 };
 
 /// TODO: Explain
-pub struct MissingResolver<TLCtx>(PhantomData<TLCtx>);
+pub struct MissingResolver;
 
-impl<TLCtx> Default for MissingResolver<TLCtx> {
+impl Default for MissingResolver {
     fn default() -> Self {
-        Self(PhantomData)
+        Self
     }
 }
 
@@ -51,7 +49,7 @@ where
 
 // Can only set the resolver or add middleware until a resolver has been set.
 // Eg. `.query().subscription()` makes no sense.
-impl<TMiddleware> Procedure<MissingResolver<TMiddleware::LayerCtx>, TMiddleware>
+impl<TMiddleware> Procedure<MissingResolver, TMiddleware>
 where
     TMiddleware: MiddlewareBuilder,
 {
@@ -100,7 +98,7 @@ where
     pub fn with<Mw: ConstrainedMiddleware<TMiddleware::LayerCtx>>(
         self,
         mw: Mw,
-    ) -> Procedure<MissingResolver<Mw::NewCtx>, MiddlewareLayerBuilder<TMiddleware, Mw>> {
+    ) -> Procedure<MissingResolver, MiddlewareLayerBuilder<TMiddleware, Mw>> {
         Procedure::new(
             MissingResolver::default(),
             MiddlewareLayerBuilder {

diff --git a/src/internal/resolver_result.rs b/src/internal/resolver_result.rs
@@ -364,4 +364,4 @@ mod private {
     }
 }
 
-pub(crate) use private::{FutureMarkerType, SealedRequestLayer, StreamMarkerType};
+pub(crate) use private::{FutureMarkerType, StreamMarkerType};
diff --git a/src/rspc.rs b/src/rspc.rs
@@ -6,7 +6,7 @@ use crate::{
             BaseMiddleware, ConstrainedMiddleware, MiddlewareLayerBuilder, ProcedureKind,
         },
         procedure::{MissingResolver, Procedure},
-        FutureMarkerType, RequestLayer, ResolverFunction, SealedRequestLayer, StreamMarkerType,
+        FutureMarkerType, RequestLayer, ResolverFunction, StreamMarkerType,
     },
     Router,
 };
@@ -51,8 +51,7 @@ where
     pub fn with<Mw: ConstrainedMiddleware<TCtx>>(
         self,
         mw: Mw,
-    ) -> Procedure<MissingResolver<Mw::NewCtx>, MiddlewareLayerBuilder<BaseMiddleware<TCtx>, Mw>>
-    {
+    ) -> Procedure<MissingResolver, MiddlewareLayerBuilder<BaseMiddleware<TCtx>, Mw>> {
         Procedure::new(
             MissingResolver::default(),
             MiddlewareLayerBuilder {