diff --git a/arrow-buffer/src/alloc/alignment.rs b/arrow-buffer/src/alloc/alignment.rs index b3979e1d6a0..de8a491c824 100644 --- a/arrow-buffer/src/alloc/alignment.rs +++ b/arrow-buffer/src/alloc/alignment.rs @@ -80,15 +80,6 @@ pub const ALIGNMENT: usize = 1 << 5; #[cfg(target_arch = "sparc64")] pub const ALIGNMENT: usize = 1 << 6; -// On ARM cache line sizes are fixed. both v6 and v7. -// Need to add board specific or platform specific things later. -/// Cache and allocation multiple alignment size -#[cfg(target_arch = "thumbv6")] -pub const ALIGNMENT: usize = 1 << 5; -/// Cache and allocation multiple alignment size -#[cfg(target_arch = "thumbv7")] -pub const ALIGNMENT: usize = 1 << 5; - // Operating Systems cache size determines this. // Currently no way to determine this without runtime inference. /// Cache and allocation multiple alignment size @@ -107,9 +98,6 @@ pub const ALIGNMENT: usize = 1 << 5; // If you have smaller data with less padded functionality then use 32 with force option. // - https://devtalk.nvidia.com/default/topic/803600/variable-cache-line-width-/ /// Cache and allocation multiple alignment size -#[cfg(target_arch = "nvptx")] -pub const ALIGNMENT: usize = 1 << 7; -/// Cache and allocation multiple alignment size #[cfg(target_arch = "nvptx64")] pub const ALIGNMENT: usize = 1 << 7; diff --git a/parquet/src/format.rs b/parquet/src/format.rs index 4e1aa0b65b7..9f4ddfe8285 100644 --- a/parquet/src/format.rs +++ b/parquet/src/format.rs @@ -5,7 +5,8 @@ #![allow(unused_imports)] #![allow(unused_extern_crates)] #![allow(clippy::too_many_arguments, clippy::type_complexity, clippy::vec_box, clippy::wrong_self_convention)] -#![cfg_attr(rustfmt, rustfmt_skip)] +// Fix unexpected `cfg` condition name: `rustfmt` https://github.com/apache/arrow-rs/issues/5725 +//#![cfg_attr(rustfmt, rustfmt_skip)] use std::cell::RefCell; use std::collections::{BTreeMap, BTreeSet}; diff --git a/parquet/src/lib.rs b/parquet/src/lib.rs index db5d7263438..1166703bb15 100644 --- a/parquet/src/lib.rs +++ b/parquet/src/lib.rs @@ -107,6 +107,8 @@ pub mod basic; /// Automatically generated code for reading parquet thrift definition. // see parquet/CONTRIBUTING.md for instructions on regenerating #[allow(clippy::derivable_impls, clippy::match_single_binding)] +// Don't try and format auto generated code +#[rustfmt::skip] pub mod format; #[macro_use]