Fix up clippy for Rust 1.78 #5710
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
parquet
alamb
commented
May 2, 2024
| @@ -435,11 +435,20 @@ impl Parser for Float64Type { | |||
| } | |||
| } | |||
|
|
|||
| /// This API is only stable since 1.70 so can't use it when current MSRV is lower | |||
There was a problem hiding this comment.
I simply copy/pasted from is_some_and https://docs.rs/parquet/latest/src/parquet/file/metadata.rs.html#594-596
Otherwise clippy complains like
error: current MSRV (Minimum Supported Rust Version) is `1.62.0` but this item is stable since `1.70.0`
--> arrow-json/src/writer/encoder.rs:163:56
|
163 | let is_null = field_encoder.nulls.as_ref().is_some_and(|n| n.is_null(idx));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#incompatible_msrv
= note: `-D clippy::incompatible-msrv` implied by `-D warnings`
= help: to override `-D warnings` add `#[allow(clippy::incompatible_msrv)]`
| @@ -40,7 +40,13 @@ struct Args { | |||
| arrow: String, | |||
| #[clap(short, long, help("Path to JSON file"))] | |||
| json: String, | |||
| #[clap(value_enum, short, long, default_value_t = Mode::Validate, help="Mode of integration testing tool")] | |||
| #[clap( | |||
There was a problem hiding this comment.
apparently default_value_t (parsed value) is only available in Rust 1.70
I verified this is the right value (SCREAMING_SNAKE_CASE 🐍 ) like this:
cargo run --bin arrow-json-integration-test| @@ -155,12 +155,21 @@ struct StructArrayEncoder<'a> { | |||
| explicit_nulls: bool, | |||
| } | |||
|
|
|||
| /// This API is only stable since 1.70 so can't use it when current MSRV is lower | |||
| @@ -1172,13 +1172,6 @@ fn compare_greater<T: ParquetValueType>(descr: &ColumnDescriptor, a: &T, b: &T) | |||
| // https://github.com/apache/parquet-mr/blob/master/parquet-column/src/main/java/org/apache/parquet/column/values/factory/DefaultV1ValuesWriterFactory.java | |||
| // https://github.com/apache/parquet-mr/blob/master/parquet-column/src/main/java/org/apache/parquet/column/values/factory/DefaultV2ValuesWriterFactory.java | |||
|
|
|||
| /// Trait to define default encoding for types, including whether or not the type | |||
| @@ -47,12 +47,13 @@ pub trait Encoder<T: DataType>: Send { | |||
| /// identified by `valid_bits`. | |||
| /// | |||
| /// Returns the number of non-null values encoded. | |||
| #[cfg(test)] | |||
There was a problem hiding this comment.
only used in tests apparently
viirya
approved these changes
May 2, 2024
tustvold
reviewed
May 3, 2024
arrow-cast/src/parse.rs
Outdated
| @@ -435,11 +435,20 @@ impl Parser for Float64Type { | |||
| } | |||
| } | |||
|
|
|||
| /// This API is only stable since 1.70 so can't use it when current MSRV is lower | |||
| #[inline(always)] | |||
| pub fn is_some_and<T>(opt: Option<T>, f: impl FnOnce(T) -> bool) -> bool { | |||
There was a problem hiding this comment.
Does this need to be public?
There was a problem hiding this comment.
no it doesn't. I will fix
|
CI failed with some sort of linker error -- I have retriggered it |
|
I believe the archery integration test failure is not related to this PR -- I filed #5719 to track it |
|
Merging to keep things moving along |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue does this PR close?
Closes #.
Rationale for this change
Rust 1.78 was released today and it includes new clippy lints
What changes are included in this PR?
Fix the lints
Are there any user-facing changes?
No