Simplify code

Author: yescallop

src/parse.rs

@@ -1,6 +1,6 @@
 use crate::{
     imp::{AuthMeta, Constraints, HostMeta, Meta},
-    pct_enc::{self, encoder::*, Encoder, Table},
+    pct_enc::{self, encoder::*, Encoder},
     utf8,
 };
 use core::{
@@ -166,31 +166,37 @@ impl<'a> Reader<'a> {
 
     // FIXME: This makes things faster but causes significant bloat.
     #[inline(always)]
-    fn read_generic<const ALLOW_PCT_ENCODED: bool, const ALLOW_NON_ASCII: bool>(
-        &mut self,
-        table: Table,
-    ) -> Result<bool> {
+    fn read<E: Encoder>(&mut self) -> Result<bool> {
+        struct Helper<E: Encoder> {
+            _marker: PhantomData<E>,
+        }
+
+        impl<E: Encoder> Helper<E> {
+            const ALLOWS_PCT_ENCODED: bool = E::TABLE.allows_pct_encoded();
+            const ALLOWS_NON_ASCII: bool = E::TABLE.allows_non_ascii();
+        }
+
         let start = self.pos;
         let mut i = self.pos;
 
         while i < self.len() {
             let x = self.bytes[i];
-            if ALLOW_PCT_ENCODED && x == b'%' {
+            if Helper::<E>::ALLOWS_PCT_ENCODED && x == b'%' {
                 let [hi, lo, ..] = self.bytes[i + 1..] else {
                     return self.invalid_pct();
                 };
                 if !pct_enc::is_hexdig_pair(hi, lo) {
                     return self.invalid_pct();
                 }
                 i += 3;
-            } else if ALLOW_NON_ASCII {
+            } else if Helper::<E>::ALLOWS_NON_ASCII {
                 let (x, len) = utf8::next_code_point(self.bytes, i);
-                if !table.allows_code_point(x) {
+                if !E::TABLE.allows_code_point(x) {
                     break;
                 }
                 i += len;
             } else {
-                if !table.allows_ascii(x) {
+                if !E::TABLE.allows_ascii(x) {
                     break;
                 }
                 i += 1;
@@ -202,29 +208,6 @@ impl<'a> Reader<'a> {
         Ok(self.pos > start)
     }
 
-    #[inline(always)]
-    fn read<E: Encoder>(&mut self) -> Result<bool> {
-        struct Helper<E: Encoder> {
-            _marker: PhantomData<E>,
-        }
-
-        impl<E: Encoder> Helper<E> {
-            const ALLOWS_PCT_ENCODED: bool = E::TABLE.allows_pct_encoded();
-            const ALLOWS_NON_ASCII: bool = E::TABLE.allows_non_ascii();
-        }
-
-        if Helper::<E>::ALLOWS_PCT_ENCODED {
-            if Helper::<E>::ALLOWS_NON_ASCII {
-                self.read_generic::<true, true>(E::TABLE)
-            } else {
-                self.read_generic::<true, false>(E::TABLE)
-            }
-        } else {
-            assert!(!Helper::<E>::ALLOWS_NON_ASCII);
-            self.read_generic::<false, false>(E::TABLE)
-        }
-    }
-
     fn read_str(&mut self, s: &str) -> bool {
         if self.bytes[self.pos..].starts_with(s.as_bytes()) {
             // INVARIANT: The remaining bytes start with `s` so it's fine to skip `s.len()`.