move in shim.rs

Author: lucic71

libcc2rs/src/rules.rs

@@ -1,80 +1,4 @@
 // Copyright (c) 2022-present INESC-ID.
 // Distributed under the MIT license that can be found in the LICENSE file.
 
-use crate::rc::Value;
-
 pub struct IgnoreRule;
-
-pub trait TupleElement<const N: usize> {
-    type Type;
-
-    fn element(&self) -> &Self::Type;
-
-    fn element_mut(&mut self) -> &mut Self::Type;
-}
-
-pub trait TupleGet {
-    fn get<const N: usize>(&self) -> &<Self as TupleElement<N>>::Type
-    where
-        Self: TupleElement<N>,
-    {
-        TupleElement::<N>::element(self)
-    }
-
-    fn get_mut<const N: usize>(&mut self) -> &mut <Self as TupleElement<N>>::Type
-    where
-        Self: TupleElement<N>,
-    {
-        TupleElement::<N>::element_mut(self)
-    }
-}
-
-pub trait TupleElementValue<const N: usize>: TupleElement<N> {
-    type Values;
-
-    fn value(values: &Self::Values) -> &Value<Self::Type>;
-}
-
-pub trait ValueTupleGet {
-    type Plain;
-
-    fn get_value<const N: usize>(&self) -> &Value<<Self::Plain as TupleElement<N>>::Type>
-    where
-        Self::Plain: TupleElementValue<N, Values = Self>,
-    {
-        <Self::Plain as TupleElementValue<N>>::value(self)
-    }
-}
-
-macro_rules! impl_tuple_get {
-    (@element ($($t:ident),+) $n:tt $element:ident) => {
-        impl<$($t),+> TupleElement<$n> for ($($t,)+) {
-            type Type = $element;
-
-            fn element(&self) -> &$element {
-                &self.$n
-            }
-
-            fn element_mut(&mut self) -> &mut $element {
-                &mut self.$n
-            }
-        }
-
-        impl<$($t),+> TupleElementValue<$n> for ($($t,)+) {
-            type Values = ($(Value<$t>,)+);
-
-            fn value(values: &Self::Values) -> &Value<$element> {
-                &values.$n
-            }
-        }
-    };
-    ($tuple:tt; $($n:tt $element:ident),+) => {
-        impl<$($element),+> TupleGet for ($($element,)+) {}
-        impl<$($element),+> ValueTupleGet for ($(Value<$element>,)+) {
-            type Plain = ($($element,)+);
-        }
-        $(impl_tuple_get!(@element $tuple $n $element);)+
-    };
-}
-
-impl_tuple_get!((T0, T1); 0 T0, 1 T1);

rules/pair/shim.rs

@@ -0,0 +1,78 @@
+// Copyright (c) 2022-present INESC-ID.
+// Distributed under the MIT license that can be found in the LICENSE file.
+
+use crate::Value;
+
+pub trait TupleElement<const N: usize> {
+    type Type;
+
+    fn element(&self) -> &Self::Type;
+
+    fn element_mut(&mut self) -> &mut Self::Type;
+}
+
+pub trait TupleGet {
+    fn get<const N: usize>(&self) -> &<Self as TupleElement<N>>::Type
+    where
+        Self: TupleElement<N>,
+    {
+        TupleElement::<N>::element(self)
+    }
+
+    fn get_mut<const N: usize>(&mut self) -> &mut <Self as TupleElement<N>>::Type
+    where
+        Self: TupleElement<N>,
+    {
+        TupleElement::<N>::element_mut(self)
+    }
+}
+
+pub trait TupleElementValue<const N: usize>: TupleElement<N> {
+    type Values;
+
+    fn value(values: &Self::Values) -> &Value<Self::Type>;
+}
+
+pub trait ValueTupleGet {
+    type Plain;
+
+    fn get_value<const N: usize>(&self) -> &Value<<Self::Plain as TupleElement<N>>::Type>
+    where
+        Self::Plain: TupleElementValue<N, Values = Self>,
+    {
+        <Self::Plain as TupleElementValue<N>>::value(self)
+    }
+}
+
+macro_rules! impl_tuple_get {
+    (@element ($($t:ident),+) $n:tt $element:ident) => {
+        impl<$($t),+> TupleElement<$n> for ($($t,)+) {
+            type Type = $element;
+
+            fn element(&self) -> &$element {
+                &self.$n
+            }
+
+            fn element_mut(&mut self) -> &mut $element {
+                &mut self.$n
+            }
+        }
+
+        impl<$($t),+> TupleElementValue<$n> for ($($t,)+) {
+            type Values = ($(Value<$t>,)+);
+
+            fn value(values: &Self::Values) -> &Value<$element> {
+                &values.$n
+            }
+        }
+    };
+    ($tuple:tt; $($n:tt $element:ident),+) => {
+        impl<$($element),+> TupleGet for ($($element,)+) {}
+        impl<$($element),+> ValueTupleGet for ($(Value<$element>,)+) {
+            type Plain = ($($element,)+);
+        }
+        $(impl_tuple_get!(@element $tuple $n $element);)+
+    };
+}
+
+impl_tuple_get!((T0, T1); 0 T0, 1 T1);