File tree 4 files changed +8
-11
lines changed
4 files changed +8
-11
lines changed Original file line number Diff line number Diff line change @@ -57,7 +57,7 @@ homepage = "https://datafusion.apache.org"
57
57
license = " Apache-2.0"
58
58
readme = " README.md"
59
59
repository = " https://github.com/apache/datafusion"
60
- rust-version = " 1.76 "
60
+ rust-version = " 1.82.0 "
61
61
version = " 42.2.0"
62
62
63
63
[workspace .dependencies ]
Original file line number Diff line number Diff line change @@ -193,17 +193,16 @@ impl TableReference {
193
193
match self {
194
194
TableReference :: Bare { table } => * * table == * other. table ( ) ,
195
195
TableReference :: Partial { schema, table } => {
196
- * * table == * other. table ( )
197
- && other. schema ( ) . map_or ( true , |s| * s == * * schema)
196
+ * * table == * other. table ( ) && other. schema ( ) . is_none_or ( |s| * s == * * schema)
198
197
}
199
198
TableReference :: Full {
200
199
catalog,
201
200
schema,
202
201
table,
203
202
} => {
204
203
* * table == * other. table ( )
205
- && other. schema ( ) . map_or ( true , |s| * s == * * schema)
206
- && other. catalog ( ) . map_or ( true , |c| * c == * * catalog)
204
+ && other. schema ( ) . is_none_or ( |s| * s == * * schema)
205
+ && other. catalog ( ) . is_none_or ( |c| * c == * * catalog)
207
206
}
208
207
}
209
208
}
Original file line number Diff line number Diff line change @@ -811,7 +811,7 @@ pub fn exprlist_len(
811
811
. enumerate ( )
812
812
. filter_map ( |( idx, field) | {
813
813
let ( maybe_table_ref, _) = schema. qualified_field ( idx) ;
814
- if maybe_table_ref. map_or ( true , |q| q == qualifier) {
814
+ if maybe_table_ref. is_none_or ( |q| q == qualifier) {
815
815
Some ( ( maybe_table_ref. cloned ( ) , Arc :: clone ( field) ) )
816
816
} else {
817
817
None
Original file line number Diff line number Diff line change @@ -92,13 +92,11 @@ impl PhysicalSortExpr {
92
92
let nullable = self . expr . nullable ( schema) . unwrap_or ( true ) ;
93
93
self . expr . eq ( & requirement. expr )
94
94
&& if nullable {
95
- requirement
96
- . options
97
- . map_or ( true , |opts| self . options == opts)
95
+ requirement. options . is_none_or ( |opts| self . options == opts)
98
96
} else {
99
97
requirement
100
98
. options
101
- . map_or ( true , |opts| self . options . descending == opts. descending )
99
+ . is_none_or ( |opts| self . options . descending == opts. descending )
102
100
}
103
101
}
104
102
@@ -209,7 +207,7 @@ impl PhysicalSortRequirement {
209
207
self . expr . eq ( & other. expr )
210
208
&& other
211
209
. options
212
- . map_or ( true , |other_opts| self . options == Some ( other_opts) )
210
+ . is_none_or ( |other_opts| self . options == Some ( other_opts) )
213
211
}
214
212
215
213
/// Returns [`PhysicalSortRequirement`] that requires the exact
You can’t perform that action at this time.
0 commit comments