From 5f80fb11aa60470a204fb5aff29eb467e0c299f4 Mon Sep 17 00:00:00 2001
From: Jorge Leitao <jorgecarleitao@gmail.com>
Date: Tue, 22 Mar 2022 21:57:00 +0100
Subject: [PATCH] Removed un-used generic (#927)

---
 .../read/deserialize/primitive/basic.rs       | 22 ++++++-------------
 .../read/deserialize/primitive/nested.rs      |  8 +++----
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/src/io/parquet/read/deserialize/primitive/basic.rs b/src/io/parquet/read/deserialize/primitive/basic.rs
index 2cd8ac99e24..ed6d30419f9 100644
--- a/src/io/parquet/read/deserialize/primitive/basic.rs
+++ b/src/io/parquet/read/deserialize/primitive/basic.rs
@@ -18,24 +18,16 @@ use super::super::utils::OptionalPageValidity;
 use super::super::DataPages;
 
 #[derive(Debug)]
-pub(super) struct Values<'a, P>
-where
-    P: ParquetNativeType,
-{
+pub(super) struct Values<'a> {
     pub values: std::slice::ChunksExact<'a, u8>,
-    phantom: std::marker::PhantomData<P>,
 }
 
-impl<'a, P> Values<'a, P>
-where
-    P: ParquetNativeType,
-{
-    pub fn new(page: &'a DataPage) -> Self {
+impl<'a> Values<'a> {
+    pub fn new<P: ParquetNativeType>(page: &'a DataPage) -> Self {
         let (_, _, values) = utils::split_buffer(page);
         assert_eq!(values.len() % std::mem::size_of::<P>(), 0);
         Self {
             values: values.chunks_exact(std::mem::size_of::<P>()),
-            phantom: std::marker::PhantomData,
         }
     }
 
@@ -80,8 +72,8 @@ enum State<'a, P>
 where
     P: ParquetNativeType,
 {
-    Optional(OptionalPageValidity<'a>, Values<'a, P>),
-    Required(Values<'a, P>),
+    Optional(OptionalPageValidity<'a>, Values<'a>),
+    Required(Values<'a>),
     RequiredDictionary(ValuesDictionary<'a, P>),
     OptionalDictionary(OptionalPageValidity<'a>, ValuesDictionary<'a, P>),
 }
@@ -162,11 +154,11 @@ where
             }
             (Encoding::Plain, _, true) => {
                 let validity = OptionalPageValidity::new(page);
-                let values = Values::new(page);
+                let values = Values::new::<P>(page);
 
                 Ok(State::Optional(validity, values))
             }
-            (Encoding::Plain, _, false) => Ok(State::Required(Values::new(page))),
+            (Encoding::Plain, _, false) => Ok(State::Required(Values::new::<P>(page))),
             _ => Err(utils::not_implemented(
                 &page.encoding(),
                 is_optional,
diff --git a/src/io/parquet/read/deserialize/primitive/nested.rs b/src/io/parquet/read/deserialize/primitive/nested.rs
index 42210887e7b..a16217c9b18 100644
--- a/src/io/parquet/read/deserialize/primitive/nested.rs
+++ b/src/io/parquet/read/deserialize/primitive/nested.rs
@@ -22,8 +22,8 @@ enum State<'a, P>
 where
     P: ParquetNativeType,
 {
-    Optional(Optional<'a>, Values<'a, P>),
-    Required(Values<'a, P>),
+    Optional(Optional<'a>, Values<'a>),
+    Required(Values<'a>),
     RequiredDictionary(ValuesDictionary<'a, P>),
     OptionalDictionary(Optional<'a>, ValuesDictionary<'a, P>),
 }
@@ -96,9 +96,9 @@ where
                 ))
             }
             (Encoding::Plain, _, true) => {
-                Ok(State::Optional(Optional::new(page), Values::new(page)))
+                Ok(State::Optional(Optional::new(page), Values::new::<P>(page)))
             }
-            (Encoding::Plain, _, false) => Ok(State::Required(Values::new(page))),
+            (Encoding::Plain, _, false) => Ok(State::Required(Values::new::<P>(page))),
             _ => Err(utils::not_implemented(
                 &page.encoding(),
                 is_optional,