Relax %parse-param bounds from Copy to Clone

softdevteam · Sep 30, 2024 · 9f62a1a · 9f62a1a
1 parent 2140334
commit 9f62a1a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/lrpar/src/lib/cpctplus.rs b/lrpar/src/lib/cpctplus.rs
@@ -106,7 +106,7 @@ struct CPCTPlus<
     StorageT: 'static + Eq + Hash + PrimInt + Unsigned,
     LexerTypesT: LexerTypes<StorageT = StorageT>,
     ActionT: 'a,
-    ParamT: Copy,
+    ParamT: Clone,
 > where
     usize: AsPrimitive<StorageT>,
 {
@@ -118,7 +118,7 @@ pub(super) fn recoverer<
     StorageT: 'static + Debug + Eq + Hash + PrimInt + Unsigned,
     LexerTypesT: LexerTypes<StorageT = StorageT>,
     ActionT: 'a,
-    ParamT: Copy,
+    ParamT: Clone,
 >(
     parser: &'a Parser<StorageT, LexerTypesT, ActionT, ParamT>,
 ) -> Box<dyn Recoverer<StorageT, LexerTypesT, ActionT, ParamT> + 'a>
@@ -135,7 +135,7 @@ impl<
         StorageT: 'static + Debug + Eq + Hash + PrimInt + Unsigned,
         LexerTypesT: LexerTypes<StorageT = StorageT>,
         ActionT: 'a,
-        ParamT: Copy,
+        ParamT: Clone,
     > Recoverer<StorageT, LexerTypesT, ActionT, ParamT>
     for CPCTPlus<'a, 'b, 'input, StorageT, LexerTypesT, ActionT, ParamT>
 where
@@ -270,7 +270,7 @@ impl<
         StorageT: 'static + Debug + Eq + Hash + PrimInt + Unsigned,
         LexerTypesT: LexerTypes<StorageT = StorageT>,
         ActionT: 'a,
-        ParamT: Copy,
+        ParamT: Clone,
     > CPCTPlus<'a, 'b, 'input, StorageT, LexerTypesT, ActionT, ParamT>
 where
     usize: AsPrimitive<StorageT>,
@@ -457,7 +457,7 @@ fn apply_repairs<
     StorageT: 'static + Debug + Eq + Hash + PrimInt + Unsigned,
     LexerTypesT: LexerTypes<StorageT = StorageT>,
     ActionT: 'a,
-    ParamT: Copy,
+    ParamT: Clone,
 >(
     parser: &Parser<StorageT, LexerTypesT, ActionT, ParamT>,
     mut laidx: usize,
@@ -496,7 +496,7 @@ fn simplify_repairs<
     StorageT: 'static + Eq + Hash + PrimInt + Unsigned,
     LexerTypesT: LexerTypes<StorageT = StorageT>,
     ActionT,
-    ParamT: Copy,
+    ParamT: Clone,
 >(
     parser: &Parser<StorageT, LexerTypesT, ActionT, ParamT>,
     all_rprs: &mut Vec<Vec<ParseRepair<LexerTypesT::LexemeT, StorageT>>>,
@@ -557,7 +557,7 @@ fn rank_cnds<
     StorageT: 'static + Debug + Eq + Hash + PrimInt + Unsigned,
     LexerTypesT: LexerTypes<StorageT = StorageT>,
     ActionT: 'a,
-    ParamT: Copy,
+    ParamT: Clone,
 >(
     parser: &Parser<StorageT, LexerTypesT, ActionT, ParamT>,
     finish_by: Instant,

diff --git a/lrpar/src/lib/parser.rs b/lrpar/src/lib/parser.rs
@@ -88,7 +88,7 @@ pub(super) struct Parser<
     StorageT: 'static + Eq + Hash + PrimInt + Unsigned,
     LexerTypesT: LexerTypes<StorageT = StorageT>,
     ActionT: 'a,
-    ParamT: Copy,
+    ParamT: Clone,
 > where
     usize: AsPrimitive<StorageT>,
 {
@@ -241,7 +241,7 @@ impl<
         StorageT: 'static + Debug + Eq + Hash + PrimInt + Unsigned,
         LexerTypesT: LexerTypes<StorageT = StorageT>,
         ActionT: 'a,
-        ParamT: Copy,
+        ParamT: Clone,
     > Parser<'a, 'b, 'input, StorageT, LexerTypesT, ActionT, ParamT>
 where
     usize: AsPrimitive<StorageT>,
@@ -329,7 +329,7 @@ where
                         self.lexer,
                         span,
                         astack.drain(pop_idx - 1..),
-                        self.param,
+                        self.param.clone(),
                     ));
                     astack.push(v);
                 }
@@ -447,7 +447,7 @@ where
                                 self.lexer,
                                 span,
                                 astack_uw.drain(pop_idx - 1..),
-                                self.param,
+                                self.param.clone(),
                             ));
                             astack_uw.push(v);
                         } else {
@@ -595,7 +595,7 @@ pub(super) trait Recoverer<
     StorageT: 'static + Debug + Hash + PrimInt + Unsigned,
     LexerTypesT: LexerTypes<StorageT = StorageT>,
     ActionT,
-    ParamT: Copy,
+    ParamT: Clone,
 > where
     usize: AsPrimitive<StorageT>,
 {