consolidated phantomdata into one field

Author: nstilt1

chacha20/src/backends/avx2.rs

@@ -58,7 +58,6 @@ where
         v,
         ctr,
         _pd: PhantomData,
-        _variant: PhantomData,
     };
 
     f.call(&mut backend);
@@ -94,7 +93,6 @@ where
         v,
         ctr,
         _pd: PhantomData,
-        _variant: PhantomData
     };
 
     backend.rng_gen_par_ks_blocks(buffer);
@@ -106,8 +104,7 @@ where
 struct Backend<R: Rounds, V: Variant> {
     v: [__m256i; 3],
     ctr: [__m256i; N],
-    _pd: PhantomData<R>,
-    _variant: PhantomData<V>,
+    _pd: PhantomData<(R, V)>,
 }
 
 #[cfg(feature = "cipher")]

chacha20/src/backends/neon.rs

@@ -22,8 +22,7 @@ use cipher::{
 struct Backend<R: Rounds, V: Variant> {
     state: [uint32x4_t; 4],
     ctrs: [uint32x4_t; 4],
-    _pd: PhantomData<R>,
-    _variant: PhantomData<V>,
+    _pd: PhantomData<(R, V)>,
 }
 
 macro_rules! add_counter {
@@ -58,7 +57,6 @@ impl<R: Rounds, V: Variant> Backend<R, V> {
             state,
             ctrs,
             _pd: PhantomData,
-            _variant: PhantomData,
         }
     }
 }

chacha20/src/backends/sse2.rs

@@ -38,7 +38,6 @@ where
             _mm_loadu_si128(state_ptr.add(3)),
         ],
         _pd: PhantomData,
-        _variant: PhantomData,
     };
 
     f.call(&mut backend);
@@ -51,8 +50,7 @@ where
 
 struct Backend<R: Rounds, V: Variant> {
     v: [__m128i; 4],
-    _pd: PhantomData<R>,
-    _variant: PhantomData<V>,
+    _pd: PhantomData<(R, V)>,
 }
 
 #[cfg(feature = "cipher")]
@@ -120,7 +118,6 @@ where
             _mm_loadu_si128(state_ptr.add(3)),
         ],
         _pd: PhantomData,
-        _variant: PhantomData,
     };
 
     backend.gen_ks_blocks(buffer);