File tree 10 files changed +10
-29
lines changed
arrow-integration-testing
arrow-pyarrow-integration-testing
parquet/src/arrow/async_reader
10 files changed +10
-29
lines changed Original file line number Diff line number Diff line change @@ -74,7 +74,7 @@ include = [
74
74
" NOTICE.txt" ,
75
75
]
76
76
edition = " 2021"
77
- rust-version = " 1.70 "
77
+ rust-version = " 1.81 "
78
78
79
79
[workspace .dependencies ]
80
80
arrow = { version = " 54.3.1" , path = " ./arrow" , default-features = false }
Original file line number Diff line number Diff line change @@ -463,20 +463,11 @@ impl Parser for Float64Type {
463
463
}
464
464
}
465
465
466
- /// This API is only stable since 1.70 so can't use it when current MSRV is lower
467
- #[ inline( always) ]
468
- fn is_some_and < T > ( opt : Option < T > , f : impl FnOnce ( T ) -> bool ) -> bool {
469
- match opt {
470
- None => false ,
471
- Some ( x) => f ( x) ,
472
- }
473
- }
474
-
475
466
macro_rules! parser_primitive {
476
467
( $t: ty) => {
477
468
impl Parser for $t {
478
469
fn parse( string: & str ) -> Option <Self :: Native > {
479
- if !is_some_and ( string. as_bytes( ) . last( ) , |x| x. is_ascii_digit( ) ) {
470
+ if !string. as_bytes( ) . last( ) . is_some_and ( |x| x. is_ascii_digit( ) ) {
480
471
return None ;
481
472
}
482
473
match atoi:: FromRadix10SignedChecked :: from_radix_10_signed_checked(
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ name = "arrow-flight"
20
20
description = " Apache Arrow Flight"
21
21
version = { workspace = true }
22
22
edition = { workspace = true }
23
- rust-version = " 1.71.1 "
23
+ rust-version = { workspace = true }
24
24
authors = { workspace = true }
25
25
homepage = { workspace = true }
26
26
repository = { workspace = true }
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ name = "gen"
20
20
description = " Code generation for arrow-flight"
21
21
version = " 0.1.0"
22
22
edition = { workspace = true }
23
- rust-version = " 1.71.1 "
23
+ rust-version = { workspace = true }
24
24
authors = { workspace = true }
25
25
homepage = { workspace = true }
26
26
repository = { workspace = true }
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ authors = { workspace = true }
25
25
license = { workspace = true }
26
26
edition = { workspace = true }
27
27
publish = false
28
- rust-version = " 1.75.0 "
28
+ rust-version = { workspace = true }
29
29
30
30
[lib ]
31
31
crate-type = [" lib" , " cdylib" ]
Original file line number Diff line number Diff line change @@ -387,15 +387,6 @@ struct StructArrayEncoder<'a> {
387
387
struct_mode : StructMode ,
388
388
}
389
389
390
- /// This API is only stable since 1.70 so can't use it when current MSRV is lower
391
- #[ inline( always) ]
392
- fn is_some_and < T > ( opt : Option < T > , f : impl FnOnce ( T ) -> bool ) -> bool {
393
- match opt {
394
- None => false ,
395
- Some ( x) => f ( x) ,
396
- }
397
- }
398
-
399
390
impl Encoder for StructArrayEncoder < ' _ > {
400
391
fn encode ( & mut self , idx : usize , out : & mut Vec < u8 > ) {
401
392
match self . struct_mode {
@@ -740,7 +731,7 @@ impl<'a> MapEncoder<'a> {
740
731
) ) ;
741
732
}
742
733
743
- if is_some_and ( array. entries ( ) . nulls ( ) , |x| x. null_count ( ) != 0 ) {
734
+ if array. entries ( ) . nulls ( ) . is_some_and ( |x| x. null_count ( ) != 0 ) {
744
735
return Err ( ArrowError :: InvalidArgumentError (
745
736
"Encountered nulls in MapArray entries" . to_string ( ) ,
746
737
) ) ;
Original file line number Diff line number Diff line change 25
25
license = " Apache-2.0"
26
26
keywords = [ " arrow" ]
27
27
edition = " 2021"
28
- rust-version = " 1.70 "
28
+ rust-version = " 1.81 "
29
29
publish = false
30
30
31
31
[lib ]
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ license = { workspace = true }
26
26
keywords = { workspace = true }
27
27
include = { workspace = true }
28
28
edition = { workspace = true }
29
- rust-version = " 1.64 "
29
+ rust-version = { workspace = true }
30
30
31
31
[lib ]
32
32
name = " arrow_schema"
Original file line number Diff line number Diff line change @@ -47,7 +47,7 @@ impl ExtensionType for Bool8 {
47
47
}
48
48
49
49
fn deserialize_metadata ( metadata : Option < & str > ) -> Result < Self :: Metadata , ArrowError > {
50
- if metadata. map_or ( false , str:: is_empty) {
50
+ if metadata. is_some_and ( str:: is_empty) {
51
51
Ok ( "" )
52
52
} else {
53
53
Err ( ArrowError :: InvalidArgumentError (
Original file line number Diff line number Diff line change @@ -837,9 +837,8 @@ where
837
837
self . batch_size ,
838
838
)
839
839
. await
840
- . map_err ( |err | {
840
+ . inspect_err ( |_ | {
841
841
self . state = StreamState :: Error ;
842
- err
843
842
} ) ?;
844
843
self . reader_factory = Some ( reader_factory) ;
845
844
You can’t perform that action at this time.
0 commit comments