You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ks...@apache.org on 2020/05/14 10:34:14 UTC
[arrow] 03/03: [Release] Fix rust lint error
This is an automated email from the ASF dual-hosted git repository.
kszucs pushed a commit to branch maint-0.17.x
in repository https://gitbox.apache.org/repos/asf/arrow.git
commit 7cab6df1836995dfb888d1263c37dfe4643bbbfa
Author: Krisztián Szűcs <sz...@gmail.com>
AuthorDate: Thu May 14 12:33:07 2020 +0200
[Release] Fix rust lint error
---
rust/parquet/src/record/api.rs | 111 ++++++++++++++++++++++-------------------
1 file changed, 60 insertions(+), 51 deletions(-)
diff --git a/rust/parquet/src/record/api.rs b/rust/parquet/src/record/api.rs
index c011da8..db1704b 100644
--- a/rust/parquet/src/record/api.rs
+++ b/rust/parquet/src/record/api.rs
@@ -83,29 +83,35 @@ pub trait RowFormatter {
/// Macro to generate type-safe get_xxx methods for primitive types,
/// e.g. `get_bool`, `get_short`.
macro_rules! row_primitive_accessor {
- ($METHOD:ident, $VARIANT:ident, $TY:ty) => {
- fn $METHOD(&self, i: usize) -> Result<$TY> {
- match self.fields[i].1 {
- Field::$VARIANT(v) => Ok(v),
- _ => Err(general_err!("Cannot access {} as {}",
- self.fields[i].1.get_type_name(), stringify!($VARIANT)))
- }
- }
- }
+ ($METHOD:ident, $VARIANT:ident, $TY:ty) => {
+ fn $METHOD(&self, i: usize) -> Result<$TY> {
+ match self.fields[i].1 {
+ Field::$VARIANT(v) => Ok(v),
+ _ => Err(general_err!(
+ "Cannot access {} as {}",
+ self.fields[i].1.get_type_name(),
+ stringify!($VARIANT)
+ )),
+ }
+ }
+ };
}
/// Macro to generate type-safe get_xxx methods for reference types,
/// e.g. `get_list`, `get_map`.
macro_rules! row_complex_accessor {
- ($METHOD:ident, $VARIANT:ident, $TY:ty) => {
- fn $METHOD(&self, i: usize) -> Result<&$TY> {
- match self.fields[i].1 {
- Field::$VARIANT(ref v) => Ok(v),
- _ => Err(general_err!("Cannot access {} as {}",
- self.fields[i].1.get_type_name(), stringify!($VARIANT)))
- }
- }
- }
+ ($METHOD:ident, $VARIANT:ident, $TY:ty) => {
+ fn $METHOD(&self, i: usize) -> Result<&$TY> {
+ match self.fields[i].1 {
+ Field::$VARIANT(ref v) => Ok(v),
+ _ => Err(general_err!(
+ "Cannot access {} as {}",
+ self.fields[i].1.get_type_name(),
+ stringify!($VARIANT)
+ )),
+ }
+ }
+ };
}
impl RowFormatter for Row {
@@ -222,33 +228,35 @@ pub trait ListAccessor {
/// Macro to generate type-safe get_xxx methods for primitive types,
/// e.g. get_bool, get_short
macro_rules! list_primitive_accessor {
- ($METHOD:ident, $VARIANT:ident, $TY:ty) => {
- fn $METHOD(&self, i: usize) -> Result<$TY> {
- match self.elements[i] {
- Field::$VARIANT(v) => Ok(v),
- _ => Err(general_err!(
- "Cannot access {} as {}",
- self.elements[i].get_type_name(), stringify!($VARIANT))
- )
- }
- }
- }
+ ($METHOD:ident, $VARIANT:ident, $TY:ty) => {
+ fn $METHOD(&self, i: usize) -> Result<$TY> {
+ match self.elements[i] {
+ Field::$VARIANT(v) => Ok(v),
+ _ => Err(general_err!(
+ "Cannot access {} as {}",
+ self.elements[i].get_type_name(),
+ stringify!($VARIANT)
+ )),
+ }
+ }
+ };
}
/// Macro to generate type-safe get_xxx methods for reference types
/// e.g. get_list, get_map
macro_rules! list_complex_accessor {
- ($METHOD:ident, $VARIANT:ident, $TY:ty) => {
- fn $METHOD(&self, i: usize) -> Result<&$TY> {
- match self.elements[i] {
- Field::$VARIANT(ref v) => Ok(v),
- _ => Err(general_err!(
- "Cannot access {} as {}",
- self.elements[i].get_type_name(), stringify!($VARIANT))
- )
- }
- }
- }
+ ($METHOD:ident, $VARIANT:ident, $TY:ty) => {
+ fn $METHOD(&self, i: usize) -> Result<&$TY> {
+ match self.elements[i] {
+ Field::$VARIANT(ref v) => Ok(v),
+ _ => Err(general_err!(
+ "Cannot access {} as {}",
+ self.elements[i].get_type_name(),
+ stringify!($VARIANT)
+ )),
+ }
+ }
+ };
}
impl ListAccessor for List {
@@ -323,17 +331,18 @@ struct MapList<'a> {
/// Macro to generate type-safe get_xxx methods for primitive types,
/// e.g. get_bool, get_short
macro_rules! map_list_primitive_accessor {
- ($METHOD:ident, $VARIANT:ident, $TY:ty) => {
- fn $METHOD(&self, i: usize) -> Result<$TY> {
- match self.elements[i] {
- Field::$VARIANT(v) => Ok(*v),
- _ => Err(general_err!(
- "Cannot access {} as {}",
- self.elements[i].get_type_name(), stringify!($VARIANT))
- )
- }
- }
- }
+ ($METHOD:ident, $VARIANT:ident, $TY:ty) => {
+ fn $METHOD(&self, i: usize) -> Result<$TY> {
+ match self.elements[i] {
+ Field::$VARIANT(v) => Ok(*v),
+ _ => Err(general_err!(
+ "Cannot access {} as {}",
+ self.elements[i].get_type_name(),
+ stringify!($VARIANT)
+ )),
+ }
+ }
+ };
}
impl<'a> ListAccessor for MapList<'a> {