[arrow-rs] branch master updated: Fix master (#2494)

[tu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tustvold pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git


The following commit(s) were added to refs/heads/master by this push:
     new 7e1fbcf17 Fix master (#2494)
7e1fbcf17 is described below

commit 7e1fbcf176eefc53b2066522f1040262bc03da4e
Author: Raphael Taylor-Davies <17...@users.noreply.github.com>
AuthorDate: Thu Aug 18 11:21:54 2022 +0100

    Fix master (#2494)
---
 arrow/benches/array_from_vec.rs             | 1 +
 parquet/src/arrow/arrow_reader/selection.rs | 3 +--
 parquet/src/file/serialized_reader.rs       | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arrow/benches/array_from_vec.rs b/arrow/benches/array_from_vec.rs
index bf318ff10..ab39a3fb8 100644
--- a/arrow/benches/array_from_vec.rs
+++ b/arrow/benches/array_from_vec.rs
@@ -80,6 +80,7 @@ fn decimal128_array_from_vec(array: &[Option<i128>]) {
     criterion::black_box(
         array
             .iter()
+            .copied()
             .collect::<Decimal128Array>()
             .with_precision_and_scale(34, 2)
             .unwrap(),
diff --git a/parquet/src/arrow/arrow_reader/selection.rs b/parquet/src/arrow/arrow_reader/selection.rs
index d94ad1060..d7845cfa1 100644
--- a/parquet/src/arrow/arrow_reader/selection.rs
+++ b/parquet/src/arrow/arrow_reader/selection.rs
@@ -17,7 +17,6 @@
 
 use arrow::array::{Array, BooleanArray};
 use arrow::compute::SlicesIterator;
-use parquet_format::PageLocation;
 use std::cmp::Ordering;
 use std::collections::VecDeque;
 use std::ops::Range;
@@ -122,7 +121,7 @@ impl RowSelection {
     #[cfg(any(test, feature = "async"))]
     pub(crate) fn scan_ranges(
         &self,
-        page_locations: &[PageLocation],
+        page_locations: &[parquet_format::PageLocation],
     ) -> Vec<Range<usize>> {
         let mut ranges = vec![];
         let mut row_offset = 0;
diff --git a/parquet/src/file/serialized_reader.rs b/parquet/src/file/serialized_reader.rs
index a9433bc63..4c8951332 100644
--- a/parquet/src/file/serialized_reader.rs
+++ b/parquet/src/file/serialized_reader.rs
@@ -484,7 +484,6 @@ pub(crate) fn decode_page(
     Ok(result)
 }
 
-#[allow(clippy::large_enum_variant)]
 enum SerializedPageReaderState {
     Values {
         /// The current byte offset in the reader