[arrow-rs] branch master updated: Fix logical merge conflict in #1588 (#1678)

[al...@apache.org]

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

alamb 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 e02869a5b Fix logical merge conflict in #1588 (#1678)
e02869a5b is described below

commit e02869a5b4398b1adece3337099324585fc902c2
Author: Raphael Taylor-Davies <17...@users.noreply.github.com>
AuthorDate: Mon May 9 11:47:28 2022 +0100

    Fix logical merge conflict in #1588 (#1678)
---
 parquet/src/arrow/array_reader/list_array.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parquet/src/arrow/array_reader/list_array.rs b/parquet/src/arrow/array_reader/list_array.rs
index 00b55b154..5b7d4865f 100644
--- a/parquet/src/arrow/array_reader/list_array.rs
+++ b/parquet/src/arrow/array_reader/list_array.rs
@@ -260,7 +260,7 @@ mod tests {
         item_nullable: bool,
     ) -> ArrowType {
         let field = Box::new(Field::new("item", data_type, item_nullable));
-        match OffsetSize::is_large() {
+        match OffsetSize::IS_LARGE {
             true => ArrowType::LargeList(field),
             false => ArrowType::List(field),
         }