chore(pc): Move no_context to its own module

Author: ngeor

rusty_pc/src/ctx.rs

@@ -44,35 +44,6 @@ where
         self.0 = Some(ctx.clone());
     }
 }
-
-pub struct NoContextParser<P, C1, C2> {
-    parser: P,
-    _marker: PhantomData<(C1, C2)>,
-}
-
-impl<P, C1, C2> NoContextParser<P, C1, C2> {
-    pub(crate) fn new(parser: P) -> Self {
-        Self {
-            parser,
-            _marker: PhantomData,
-        }
-    }
-}
-
-impl<I, C1, C2, P> Parser<I, C2> for NoContextParser<P, C1, C2>
-where
-    P: Parser<I, C1>,
-    I: InputTrait,
-{
-    type Output = P::Output;
-    type Error = P::Error;
-    fn parse(&mut self, input: &mut I) -> Result<Self::Output, Self::Error> {
-        self.parser.parse(input)
-    }
-
-    fn set_context(&mut self, _ctx: &C2) {}
-}
-
 /// Based on the boolean context, parses using the left or the right parser.
 pub struct IifParser<L, R> {
     left: L,

rusty_pc/src/lib.rs

@@ -15,6 +15,7 @@ pub mod many_ctx;
 pub mod map;
 pub mod map_ctx;
 pub mod map_err;
+pub mod no_context;
 mod or;
 pub mod or_default;
 mod parser;

rusty_pc/src/no_context.rs

@@ -0,0 +1,36 @@
+use std::marker::PhantomData;
+
+use crate::{InputTrait, Parser};
+
+/// Stops propagating the context to the underlying parser.
+/// The underlying parser might also have a different context type,
+/// so this can be used to resolve context type mismatches,
+/// as long as the underlying parser does not use the parent context.
+pub struct NoContextParser<P, COut, CIn> {
+    parser: P,
+    _marker: PhantomData<(COut, CIn)>,
+}
+
+impl<P, COut, CIn> NoContextParser<P, COut, CIn> {
+    pub(crate) fn new(parser: P) -> Self {
+        Self {
+            parser,
+            _marker: PhantomData,
+        }
+    }
+}
+
+impl<I, COut, CIn, P> Parser<I, COut> for NoContextParser<P, COut, CIn>
+where
+    P: Parser<I, CIn>,
+    I: InputTrait,
+{
+    type Output = P::Output;
+    type Error = P::Error;
+
+    fn parse(&mut self, input: &mut I) -> Result<Self::Output, Self::Error> {
+        self.parser.parse(input)
+    }
+
+    fn set_context(&mut self, _ctx: &COut) {}
+}

rusty_pc/src/parser.rs

@@ -1,3 +1,4 @@
+use crate::ThenWithContextParser;
 use crate::and::{AndParser, Combiner, KeepLeftCombiner, KeepRightCombiner, TupleCombiner};
 use crate::and_then::AndThenParser;
 use crate::and_then_err::AndThenErrParser;
@@ -12,10 +13,10 @@ use crate::map_ctx::MapCtxParser;
 use crate::map_err::{
     ErrorMapper, FatalErrorOverrider, MapErrParser, SoftErrorOverrider, ToFatalErrorMapper
 };
+use crate::no_context::NoContextParser;
 use crate::or_default::OrDefaultParser;
 use crate::peek::PeekParser;
 use crate::to_option::ToOptionParser;
-use crate::{NoContextParser, ThenWithContextParser};
 
 /// A parser uses the given input in order to produce a result.
 pub trait Parser<I, C = ()>
@@ -348,7 +349,11 @@ where
     // NoContext
     // =======================================================================
 
-    fn no_context<C2>(self) -> NoContextParser<Self, C, C2>
+    /// Stops propagating the context to the underlying parser.
+    /// The underlying parser might also have a different context type,
+    /// so this can be used to resolve context type mismatches,
+    /// as long as the underlying parser does not use the parent context.
+    fn no_context<COut>(self) -> NoContextParser<Self, COut, C>
     where
         Self: Sized,
     {