Skip to content

Commit e0f3527

Browse files
timsaucertimsaucer
committed
Clippy updates from the new rust version
1 parent eb21c9b commit e0f3527

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+104
-136
lines changed

‎src/common/data_type.rs‎

Lines changed: 50 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ impl DataTypeMap {
172172
SqlType::DATE,
173173
)),
174174
DataType::Duration(_) => Err(py_datafusion_err(DataFusionError::NotImplemented(
175-
format!("{:?}", arrow_type),
175+
format!("{arrow_type:?}"),
176176
))),
177177
DataType::Interval(interval_unit) => Ok(DataTypeMap::new(
178178
DataType::Interval(*interval_unit),
@@ -189,7 +189,7 @@ impl DataTypeMap {
189189
SqlType::BINARY,
190190
)),
191191
DataType::FixedSizeBinary(_) => Err(py_datafusion_err(
192-
DataFusionError::NotImplemented(format!("{:?}", arrow_type)),
192+
DataFusionError::NotImplemented(format!("{arrow_type:?}")),
193193
)),
194194
DataType::LargeBinary => Ok(DataTypeMap::new(
195195
DataType::LargeBinary,
@@ -207,23 +207,22 @@ impl DataTypeMap {
207207
SqlType::VARCHAR,
208208
)),
209209
DataType::List(_) => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
210-
"{:?}",
211-
arrow_type
210+
"{arrow_type:?}"
212211
)))),
213212
DataType::FixedSizeList(_, _) => Err(py_datafusion_err(
214-
DataFusionError::NotImplemented(format!("{:?}", arrow_type)),
213+
DataFusionError::NotImplemented(format!("{arrow_type:?}")),
215214
)),
216215
DataType::LargeList(_) => Err(py_datafusion_err(DataFusionError::NotImplemented(
217-
format!("{:?}", arrow_type),
216+
format!("{arrow_type:?}"),
218217
))),
219218
DataType::Struct(_) => Err(py_datafusion_err(DataFusionError::NotImplemented(
220-
format!("{:?}", arrow_type),
219+
format!("{arrow_type:?}"),
221220
))),
222221
DataType::Union(_, _) => Err(py_datafusion_err(DataFusionError::NotImplemented(
223-
format!("{:?}", arrow_type),
222+
format!("{arrow_type:?}"),
224223
))),
225224
DataType::Dictionary(_, _) => Err(py_datafusion_err(DataFusionError::NotImplemented(
226-
format!("{:?}", arrow_type),
225+
format!("{arrow_type:?}"),
227226
))),
228227
DataType::Decimal128(precision, scale) => Ok(DataTypeMap::new(
229228
DataType::Decimal128(*precision, *scale),
@@ -236,23 +235,22 @@ impl DataTypeMap {
236235
SqlType::DECIMAL,
237236
)),
238237
DataType::Map(_, _) => Err(py_datafusion_err(DataFusionError::NotImplemented(
239-
format!("{:?}", arrow_type),
238+
format!("{arrow_type:?}"),
240239
))),
241240
DataType::RunEndEncoded(_, _) => Err(py_datafusion_err(
242-
DataFusionError::NotImplemented(format!("{:?}", arrow_type)),
241+
DataFusionError::NotImplemented(format!("{arrow_type:?}")),
243242
)),
244243
DataType::BinaryView => Err(py_datafusion_err(DataFusionError::NotImplemented(
245-
format!("{:?}", arrow_type),
244+
format!("{arrow_type:?}"),
246245
))),
247246
DataType::Utf8View => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
248-
"{:?}",
249-
arrow_type
247+
"{arrow_type:?}"
250248
)))),
251249
DataType::ListView(_) => Err(py_datafusion_err(DataFusionError::NotImplemented(
252-
format!("{:?}", arrow_type),
250+
format!("{arrow_type:?}"),
253251
))),
254252
DataType::LargeListView(_) => Err(py_datafusion_err(DataFusionError::NotImplemented(
255-
format!("{:?}", arrow_type),
253+
format!("{arrow_type:?}"),
256254
))),
257255
}
258256
}
@@ -379,8 +377,7 @@ impl DataTypeMap {
379377
"double" => Ok(DataType::Float64),
380378
"byte_array" => Ok(DataType::Utf8),
381379
_ => Err(PyValueError::new_err(format!(
382-
"Unable to determine Arrow Data Type from Parquet String type: {:?}",
383-
parquet_str_type
380+
"Unable to determine Arrow Data Type from Parquet String type: {parquet_str_type:?}"
384381
))),
385382
};
386383
DataTypeMap::map_from_arrow_type(&arrow_dtype?)
@@ -404,12 +401,10 @@ impl DataTypeMap {
404401
pub fn py_map_from_sql_type(sql_type: &SqlType) -> PyResult<DataTypeMap> {
405402
match sql_type {
406403
SqlType::ANY => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
407-
"{:?}",
408-
sql_type
404+
"{sql_type:?}"
409405
)))),
410406
SqlType::ARRAY => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
411-
"{:?}",
412-
sql_type
407+
"{sql_type:?}"
413408
)))),
414409
SqlType::BIGINT => Ok(DataTypeMap::new(
415410
DataType::Int64,
@@ -432,11 +427,10 @@ impl DataTypeMap {
432427
SqlType::CHAR,
433428
)),
434429
SqlType::COLUMN_LIST => Err(py_datafusion_err(DataFusionError::NotImplemented(
435-
format!("{:?}", sql_type),
430+
format!("{sql_type:?}"),
436431
))),
437432
SqlType::CURSOR => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
438-
"{:?}",
439-
sql_type
433+
"{sql_type:?}"
440434
)))),
441435
SqlType::DATE => Ok(DataTypeMap::new(
442436
DataType::Date64,
@@ -449,137 +443,124 @@ impl DataTypeMap {
449443
SqlType::DECIMAL,
450444
)),
451445
SqlType::DISTINCT => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
452-
"{:?}",
453-
sql_type
446+
"{sql_type:?}"
454447
)))),
455448
SqlType::DOUBLE => Ok(DataTypeMap::new(
456449
DataType::Decimal256(1, 1),
457450
PythonType::Float,
458451
SqlType::DOUBLE,
459452
)),
460453
SqlType::DYNAMIC_STAR => Err(py_datafusion_err(DataFusionError::NotImplemented(
461-
format!("{:?}", sql_type),
454+
format!("{sql_type:?}"),
462455
))),
463456
SqlType::FLOAT => Ok(DataTypeMap::new(
464457
DataType::Decimal128(1, 1),
465458
PythonType::Float,
466459
SqlType::FLOAT,
467460
)),
468461
SqlType::GEOMETRY => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
469-
"{:?}",
470-
sql_type
462+
"{sql_type:?}"
471463
)))),
472464
SqlType::INTEGER => Ok(DataTypeMap::new(
473465
DataType::Int8,
474466
PythonType::Int,
475467
SqlType::INTEGER,
476468
)),
477469
SqlType::INTERVAL => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
478-
"{:?}",
479-
sql_type
470+
"{sql_type:?}"
480471
)))),
481472
SqlType::INTERVAL_DAY => Err(py_datafusion_err(DataFusionError::NotImplemented(
482-
format!("{:?}", sql_type),
473+
format!("{sql_type:?}"),
483474
))),
484475
SqlType::INTERVAL_DAY_HOUR => Err(py_datafusion_err(DataFusionError::NotImplemented(
485-
format!("{:?}", sql_type),
476+
format!("{sql_type:?}"),
486477
))),
487478
SqlType::INTERVAL_DAY_MINUTE => Err(py_datafusion_err(
488-
DataFusionError::NotImplemented(format!("{:?}", sql_type)),
479+
DataFusionError::NotImplemented(format!("{sql_type:?}")),
489480
)),
490481
SqlType::INTERVAL_DAY_SECOND => Err(py_datafusion_err(
491-
DataFusionError::NotImplemented(format!("{:?}", sql_type)),
482+
DataFusionError::NotImplemented(format!("{sql_type:?}")),
492483
)),
493484
SqlType::INTERVAL_HOUR => Err(py_datafusion_err(DataFusionError::NotImplemented(
494-
format!("{:?}", sql_type),
485+
format!("{sql_type:?}"),
495486
))),
496487
SqlType::INTERVAL_HOUR_MINUTE => Err(py_datafusion_err(
497-
DataFusionError::NotImplemented(format!("{:?}", sql_type)),
488+
DataFusionError::NotImplemented(format!("{sql_type:?}")),
498489
)),
499490
SqlType::INTERVAL_HOUR_SECOND => Err(py_datafusion_err(
500-
DataFusionError::NotImplemented(format!("{:?}", sql_type)),
491+
DataFusionError::NotImplemented(format!("{sql_type:?}")),
501492
)),
502493
SqlType::INTERVAL_MINUTE => Err(py_datafusion_err(DataFusionError::NotImplemented(
503-
format!("{:?}", sql_type),
494+
format!("{sql_type:?}"),
504495
))),
505496
SqlType::INTERVAL_MINUTE_SECOND => Err(py_datafusion_err(
506-
DataFusionError::NotImplemented(format!("{:?}", sql_type)),
497+
DataFusionError::NotImplemented(format!("{sql_type:?}")),
507498
)),
508499
SqlType::INTERVAL_MONTH => Err(py_datafusion_err(DataFusionError::NotImplemented(
509-
format!("{:?}", sql_type),
500+
format!("{sql_type:?}"),
510501
))),
511502
SqlType::INTERVAL_SECOND => Err(py_datafusion_err(DataFusionError::NotImplemented(
512-
format!("{:?}", sql_type),
503+
format!("{sql_type:?}"),
513504
))),
514505
SqlType::INTERVAL_YEAR => Err(py_datafusion_err(DataFusionError::NotImplemented(
515-
format!("{:?}", sql_type),
506+
format!("{sql_type:?}"),
516507
))),
517508
SqlType::INTERVAL_YEAR_MONTH => Err(py_datafusion_err(
518-
DataFusionError::NotImplemented(format!("{:?}", sql_type)),
509+
DataFusionError::NotImplemented(format!("{sql_type:?}")),
519510
)),
520511
SqlType::MAP => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
521-
"{:?}",
522-
sql_type
512+
"{sql_type:?}"
523513
)))),
524514
SqlType::MULTISET => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
525-
"{:?}",
526-
sql_type
515+
"{sql_type:?}"
527516
)))),
528517
SqlType::NULL => Ok(DataTypeMap::new(
529518
DataType::Null,
530519
PythonType::None,
531520
SqlType::NULL,
532521
)),
533522
SqlType::OTHER => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
534-
"{:?}",
535-
sql_type
523+
"{sql_type:?}"
536524
)))),
537525
SqlType::REAL => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
538-
"{:?}",
539-
sql_type
526+
"{sql_type:?}"
540527
)))),
541528
SqlType::ROW => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
542-
"{:?}",
543-
sql_type
529+
"{sql_type:?}"
544530
)))),
545531
SqlType::SARG => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
546-
"{:?}",
547-
sql_type
532+
"{sql_type:?}"
548533
)))),
549534
SqlType::SMALLINT => Ok(DataTypeMap::new(
550535
DataType::Int16,
551536
PythonType::Int,
552537
SqlType::SMALLINT,
553538
)),
554539
SqlType::STRUCTURED => Err(py_datafusion_err(DataFusionError::NotImplemented(
555-
format!("{:?}", sql_type),
540+
format!("{sql_type:?}"),
556541
))),
557542
SqlType::SYMBOL => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
558-
"{:?}",
559-
sql_type
543+
"{sql_type:?}"
560544
)))),
561545
SqlType::TIME => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
562-
"{:?}",
563-
sql_type
546+
"{sql_type:?}"
564547
)))),
565548
SqlType::TIME_WITH_LOCAL_TIME_ZONE => Err(py_datafusion_err(
566-
DataFusionError::NotImplemented(format!("{:?}", sql_type)),
549+
DataFusionError::NotImplemented(format!("{sql_type:?}")),
567550
)),
568551
SqlType::TIMESTAMP => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
569-
"{:?}",
570-
sql_type
552+
"{sql_type:?}"
571553
)))),
572554
SqlType::TIMESTAMP_WITH_LOCAL_TIME_ZONE => Err(py_datafusion_err(
573-
DataFusionError::NotImplemented(format!("{:?}", sql_type)),
555+
DataFusionError::NotImplemented(format!("{sql_type:?}")),
574556
)),
575557
SqlType::TINYINT => Ok(DataTypeMap::new(
576558
DataType::Int8,
577559
PythonType::Int,
578560
SqlType::TINYINT,
579561
)),
580562
SqlType::UNKNOWN => Err(py_datafusion_err(DataFusionError::NotImplemented(format!(
581-
"{:?}",
582-
sql_type
563+
"{sql_type:?}"
583564
)))),
584565
SqlType::VARBINARY => Ok(DataTypeMap::new(
585566
DataType::LargeBinary,
@@ -682,8 +663,7 @@ impl PyDataType {
682663
"datetime64" => Ok(DataType::Date64),
683664
"object" => Ok(DataType::Utf8),
684665
_ => Err(PyValueError::new_err(format!(
685-
"Unable to determine Arrow Data Type from Arrow String type: {:?}",
686-
arrow_str_type
666+
"Unable to determine Arrow Data Type from Arrow String type: {arrow_str_type:?}"
687667
))),
688668
};
689669
Ok(PyDataType {

‎src/context.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ impl PySessionContext {
368368
} else {
369369
&upstream_host
370370
};
371-
let url_string = format!("{}{}", scheme, derived_host);
371+
let url_string = format!("{scheme}{derived_host}");
372372
let url = Url::parse(&url_string).unwrap();
373373
self.ctx.runtime_env().register_object_store(&url, store);
374374
Ok(())

‎src/expr.rs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,10 @@ impl PyExpr {
171171
Expr::Cast(value) => Ok(cast::PyCast::from(value.clone()).into_bound_py_any(py)?),
172172
Expr::TryCast(value) => Ok(cast::PyTryCast::from(value.clone()).into_bound_py_any(py)?),
173173
Expr::ScalarFunction(value) => Err(py_unsupported_variant_err(format!(
174-
"Converting Expr::ScalarFunction to a Python object is not implemented: {:?}",
175-
value
174+
"Converting Expr::ScalarFunction to a Python object is not implemented: {value:?}"
176175
))),
177176
Expr::WindowFunction(value) => Err(py_unsupported_variant_err(format!(
178-
"Converting Expr::WindowFunction to a Python object is not implemented: {:?}",
179-
value
177+
"Converting Expr::WindowFunction to a Python object is not implemented: {value:?}"
180178
))),
181179
Expr::InList(value) => Ok(in_list::PyInList::from(value.clone()).into_bound_py_any(py)?),
182180
Expr::Exists(value) => Ok(exists::PyExists::from(value.clone()).into_bound_py_any(py)?),
@@ -188,8 +186,7 @@ impl PyExpr {
188186
}
189187
#[allow(deprecated)]
190188
Expr::Wildcard { qualifier, options } => Err(py_unsupported_variant_err(format!(
191-
"Converting Expr::Wildcard to a Python object is not implemented : {:?} {:?}",
192-
qualifier, options
189+
"Converting Expr::Wildcard to a Python object is not implemented : {qualifier:?} {options:?}"
193190
))),
194191
Expr::GroupingSet(value) => {
195192
Ok(grouping_set::PyGroupingSet::from(value.clone()).into_bound_py_any(py)?)
@@ -198,8 +195,7 @@ impl PyExpr {
198195
Ok(placeholder::PyPlaceholder::from(value.clone()).into_bound_py_any(py)?)
199196
}
200197
Expr::OuterReferenceColumn(data_type, column) => Err(py_unsupported_variant_err(format!(
201-
"Converting Expr::OuterReferenceColumn to a Python object is not implemented: {:?} - {:?}",
202-
data_type, column
198+
"Converting Expr::OuterReferenceColumn to a Python object is not implemented: {data_type:?} - {column:?}"
203199
))),
204200
Expr::Unnest(value) => Ok(unnest_expr::PyUnnestExpr::from(value.clone()).into_bound_py_any(py)?),
205201
}
@@ -755,8 +751,7 @@ impl PyExpr {
755751
Expr::Cast(Cast { expr: _, data_type }) => DataTypeMap::map_from_arrow_type(data_type),
756752
Expr::Literal(scalar_value, _) => DataTypeMap::map_from_scalar_value(scalar_value),
757753
_ => Err(py_type_err(format!(
758-
"Non Expr::Literal encountered in types: {:?}",
759-
expr
754+
"Non Expr::Literal encountered in types: {expr:?}"
760755
))),
761756
}
762757
}

‎src/expr/aggregate.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ impl PyAggregate {
116116
}
117117

118118
fn __repr__(&self) -> PyResult<String> {
119-
Ok(format!("Aggregate({})", self))
119+
Ok(format!("Aggregate({self})"))
120120
}
121121
}
122122

‎src/expr/aggregate_expr.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@ impl PyAggregateFunction {
7575

7676
/// Get a String representation of this column
7777
fn __repr__(&self) -> String {
78-
format!("{}", self)
78+
format!("{self}")
7979
}
8080
}

‎src/expr/alias.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ impl PyAlias {
6464

6565
/// Get a String representation of this column
6666
fn __repr__(&self) -> String {
67-
format!("{}", self)
67+
format!("{self}")
6868
}
6969
}

‎src/expr/analyze.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ impl PyAnalyze {
6969
}
7070

7171
fn __repr__(&self) -> PyResult<String> {
72-
Ok(format!("Analyze({})", self))
72+
Ok(format!("Analyze({self})"))
7373
}
7474
}
7575

‎src/expr/between.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,6 @@ impl PyBetween {
7171
}
7272

7373
fn __repr__(&self) -> String {
74-
format!("{}", self)
74+
format!("{self}")
7575
}
7676
}

‎src/expr/column.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ impl PyColumn {
4545

4646
/// Get the column relation
4747
fn relation(&self) -> Option<String> {
48-
self.col.relation.as_ref().map(|r| format!("{}", r))
48+
self.col.relation.as_ref().map(|r| format!("{r}"))
4949
}
5050

5151
/// Get the fully-qualified column name

0 commit comments

Comments
 (0)