Skip to content

Commit 4edbdd7

Browse files
authored
fix: cargo warnings of import item (#10196)
* fix: cargo warnings of import item Signed-off-by: Ruihang Xia <[email protected]> * deny unused imports Signed-off-by: Ruihang Xia <[email protected]> * allow util macro re-export Signed-off-by: Ruihang Xia <[email protected]> * lift windows target feature gate to mod level Signed-off-by: Ruihang Xia <[email protected]> --------- Signed-off-by: Ruihang Xia <[email protected]>
1 parent fe268bc commit 4edbdd7

File tree

143 files changed

+140
-436
lines changed

Some content is hidden

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

143 files changed

+140
-436
lines changed

.github/workflows/rust.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
run: cargo check --all-targets --no-default-features -p datafusion-functions
7878

7979
- name: Check workspace in debug mode
80-
run: cargo check
80+
run: cargo check --all-targets --workspace
8181

8282
- name: Check workspace with avro,json features
8383
run: cargo check --workspace --benches --features avro,json

Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,6 @@ rpath = false
130130
[workspace.lints.clippy]
131131
# Detects large stack-allocated futures that may cause stack overflow crashes (see threshold in clippy.toml)
132132
large_futures = "warn"
133+
134+
[workspace.lints.rust]
135+
unused_imports = "deny"

datafusion-examples/examples/custom_datasource.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ use std::time::Duration;
2424
use datafusion::arrow::array::{UInt64Builder, UInt8Builder};
2525
use datafusion::arrow::datatypes::{DataType, Field, Schema, SchemaRef};
2626
use datafusion::arrow::record_batch::RecordBatch;
27-
use datafusion::dataframe::DataFrame;
2827
use datafusion::datasource::{provider_as_source, TableProvider, TableType};
2928
use datafusion::error::Result;
3029
use datafusion::execution::context::{SessionState, TaskContext};
@@ -34,7 +33,7 @@ use datafusion::physical_plan::{
3433
Partitioning, PlanProperties, SendableRecordBatchStream,
3534
};
3635
use datafusion::prelude::*;
37-
use datafusion_expr::{Expr, LogicalPlanBuilder};
36+
use datafusion_expr::LogicalPlanBuilder;
3837
use datafusion_physical_expr::EquivalenceProperties;
3938

4039
use async_trait::async_trait;

datafusion-examples/examples/flight/flight_client.rs

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
// under the License.
1717

1818
use std::collections::HashMap;
19-
use std::convert::TryFrom;
2019
use std::sync::Arc;
2120

2221
use datafusion::arrow::datatypes::Schema;

datafusion-examples/examples/simple_udaf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use datafusion::arrow::{
2323
use datafusion::{error::Result, physical_plan::Accumulator};
2424
use datafusion::{logical_expr::Volatility, prelude::*, scalar::ScalarValue};
2525
use datafusion_common::cast::as_float64_array;
26-
use datafusion_expr::create_udaf;
2726
use std::sync::Arc;
2827

2928
// create local session context with an in-memory table

datafusion-examples/examples/simple_udwf.rs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use arrow::{
2222
datatypes::Float64Type,
2323
};
2424
use arrow_schema::DataType;
25-
use datafusion::datasource::file_format::options::CsvReadOptions;
2625

2726
use datafusion::error::Result;
2827
use datafusion::prelude::*;

datafusion/common/src/column.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ impl fmt::Display for Column {
373373
mod tests {
374374
use super::*;
375375
use arrow::datatypes::DataType;
376-
use arrow_schema::{Field, SchemaBuilder};
376+
use arrow_schema::SchemaBuilder;
377377

378378
fn create_qualified_schema(qualifier: &str, names: Vec<&str>) -> Result<DFSchema> {
379379
let mut schema_builder = SchemaBuilder::new();

datafusion/common/src/dfschema.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
//! fields with optional relation names.
2020
2121
use std::collections::{BTreeSet, HashMap, HashSet};
22-
use std::convert::TryFrom;
2322
use std::fmt::{Display, Formatter};
2423
use std::hash::Hash;
2524
use std::sync::Arc;
@@ -453,7 +452,7 @@ impl DFSchema {
453452
let matches = self.qualified_fields_with_unqualified_name(name);
454453
match matches.len() {
455454
0 => Err(unqualified_field_not_found(name, self)),
456-
1 => Ok((matches[0].0, &matches[0].1)),
455+
1 => Ok((matches[0].0, (matches[0].1))),
457456
_ => {
458457
// When `matches` size > 1, it doesn't necessarily mean an `ambiguous name` problem.
459458
// Because name may generate from Alias/... . It means that it don't own qualifier.
@@ -1004,7 +1003,6 @@ mod tests {
10041003
use crate::assert_contains;
10051004

10061005
use super::*;
1007-
use arrow::datatypes::DataType;
10081006

10091007
#[test]
10101008
fn qualifier_in_name() -> Result<()> {

datafusion/common/src/hash_utils.rs

-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ use arrow::array::*;
2424
use arrow::datatypes::*;
2525
use arrow::row::Rows;
2626
use arrow::{downcast_dictionary_array, downcast_primitive_array};
27-
use arrow_buffer::i256;
2827

2928
use crate::cast::{
3029
as_boolean_array, as_fixed_size_list_array, as_generic_binary_array,
@@ -450,7 +449,6 @@ pub fn create_row_hashes_v2<'a>(
450449
#[cfg(test)]
451450
mod tests {
452451
use arrow::{array::*, datatypes::*};
453-
use std::sync::Arc;
454452

455453
use super::*;
456454

datafusion/common/src/scalar/mod.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mod struct_builder;
2222
use std::borrow::Borrow;
2323
use std::cmp::Ordering;
2424
use std::collections::{HashSet, VecDeque};
25-
use std::convert::{Infallible, TryFrom, TryInto};
25+
use std::convert::Infallible;
2626
use std::fmt;
2727
use std::hash::Hash;
2828
use std::iter::repeat;
@@ -52,7 +52,6 @@ use arrow::{
5252
UInt16Type, UInt32Type, UInt64Type, UInt8Type, DECIMAL128_MAX_PRECISION,
5353
},
5454
};
55-
use arrow_array::{ArrowNativeTypeOp, Scalar};
5655
use arrow_buffer::Buffer;
5756
use arrow_schema::{UnionFields, UnionMode};
5857

@@ -3424,8 +3423,6 @@ impl ScalarType<i32> for Date32Type {
34243423

34253424
#[cfg(test)]
34263425
mod tests {
3427-
use std::cmp::Ordering;
3428-
use std::sync::Arc;
34293426

34303427
use super::*;
34313428
use crate::cast::{
@@ -3435,9 +3432,7 @@ mod tests {
34353432
use crate::assert_batches_eq;
34363433
use arrow::buffer::OffsetBuffer;
34373434
use arrow::compute::{is_null, kernels};
3438-
use arrow::datatypes::{ArrowNumericType, ArrowPrimitiveType};
34393435
use arrow::util::pretty::pretty_format_columns;
3440-
use arrow_buffer::Buffer;
34413436
use arrow_schema::Fields;
34423437
use chrono::NaiveDate;
34433438
use rand::Rng;

datafusion/common/src/utils.rs

-4
Original file line numberDiff line numberDiff line change
@@ -681,12 +681,8 @@ pub fn find_indices<T: PartialEq, S: Borrow<T>>(
681681

682682
#[cfg(test)]
683683
mod tests {
684-
use crate::ScalarValue;
685684
use crate::ScalarValue::Null;
686685
use arrow::array::Float64Array;
687-
use arrow_array::Array;
688-
use std::ops::Range;
689-
use std::sync::Arc;
690686

691687
use super::*;
692688

datafusion/core/benches/physical_plan.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use criterion::{BatchSize, Criterion};
2121
extern crate arrow;
2222
extern crate datafusion;
2323

24-
use std::{iter::FromIterator, sync::Arc};
24+
use std::sync::Arc;
2525

2626
use arrow::{
2727
array::{ArrayRef, Int64Array, StringArray},

datafusion/core/src/dataframe/mod.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -1570,19 +1570,17 @@ mod tests {
15701570
use std::vec;
15711571

15721572
use super::*;
1573+
use crate::assert_batches_sorted_eq;
15731574
use crate::execution::context::SessionConfig;
15741575
use crate::physical_plan::{ColumnarValue, Partitioning, PhysicalExpr};
15751576
use crate::test_util::{register_aggregate_csv, test_table, test_table_with_name};
1576-
use crate::{assert_batches_sorted_eq, execution::context::SessionContext};
15771577

15781578
use arrow::array::{self, Int32Array};
1579-
use arrow::datatypes::DataType;
15801579
use datafusion_common::{Constraint, Constraints};
15811580
use datafusion_common_runtime::SpawnedTask;
15821581
use datafusion_expr::{
1583-
avg, cast, count, count_distinct, create_udf, expr, lit, max, min, sum,
1584-
BuiltInWindowFunction, ScalarFunctionImplementation, Volatility, WindowFrame,
1585-
WindowFunctionDefinition,
1582+
cast, count_distinct, create_udf, expr, lit, sum, BuiltInWindowFunction,
1583+
ScalarFunctionImplementation, Volatility, WindowFrame, WindowFunctionDefinition,
15861584
};
15871585
use datafusion_physical_expr::expressions::Column;
15881586
use datafusion_physical_plan::{get_plan_string, ExecutionPlanProperties};

datafusion/core/src/datasource/file_format/avro.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use std::any::Any;
2121
use std::sync::Arc;
2222

2323
use arrow::datatypes::Schema;
24-
use arrow::{self, datatypes::SchemaRef};
24+
use arrow::datatypes::SchemaRef;
2525
use async_trait::async_trait;
2626
use datafusion_common::FileType;
2727
use datafusion_physical_expr::PhysicalExpr;

datafusion/core/src/datasource/file_format/csv.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ use crate::physical_plan::{ExecutionPlan, SendableRecordBatchStream};
3737

3838
use arrow::array::RecordBatch;
3939
use arrow::csv::WriterBuilder;
40+
use arrow::datatypes::SchemaRef;
4041
use arrow::datatypes::{DataType, Field, Fields, Schema};
41-
use arrow::{self, datatypes::SchemaRef};
4242
use datafusion_common::config::CsvOptions;
4343
use datafusion_common::file_options::csv_writer::CsvWriterOptions;
4444
use datafusion_common::{exec_err, not_impl_err, DataFusionError, FileType};
@@ -537,12 +537,10 @@ mod tests {
537537
use arrow::compute::concat_batches;
538538
use datafusion_common::cast::as_string_array;
539539
use datafusion_common::stats::Precision;
540-
use datafusion_common::{internal_err, FileType, GetExt};
540+
use datafusion_common::{internal_err, GetExt};
541541
use datafusion_expr::{col, lit};
542542

543-
use bytes::Bytes;
544543
use chrono::DateTime;
545-
use futures::StreamExt;
546544
use object_store::local::LocalFileSystem;
547545
use object_store::path::Path;
548546
use regex::Regex;

datafusion/core/src/datasource/file_format/parquet.rs

-8
Original file line numberDiff line numberDiff line change
@@ -1021,10 +1021,7 @@ pub(crate) mod test_util {
10211021
use super::*;
10221022
use crate::test::object_store::local_unpartitioned_file;
10231023

1024-
use arrow::record_batch::RecordBatch;
1025-
10261024
use parquet::arrow::ArrowWriter;
1027-
use parquet::file::properties::WriterProperties;
10281025
use tempfile::NamedTempFile;
10291026

10301027
/// How many rows per page should be written
@@ -1112,7 +1109,6 @@ mod tests {
11121109
use crate::physical_plan::metrics::MetricValue;
11131110
use crate::prelude::{SessionConfig, SessionContext};
11141111
use arrow::array::{Array, ArrayRef, StringArray};
1115-
use arrow::record_batch::RecordBatch;
11161112
use arrow_schema::Field;
11171113
use async_trait::async_trait;
11181114
use bytes::Bytes;
@@ -1121,16 +1117,13 @@ mod tests {
11211117
as_int32_array, as_timestamp_nanosecond_array,
11221118
};
11231119
use datafusion_common::config::ParquetOptions;
1124-
use datafusion_common::config::TableParquetOptions;
11251120
use datafusion_common::ScalarValue;
11261121
use datafusion_execution::object_store::ObjectStoreUrl;
11271122
use datafusion_execution::runtime_env::RuntimeEnv;
11281123
use datafusion_physical_plan::stream::RecordBatchStreamAdapter;
11291124
use futures::stream::BoxStream;
1130-
use futures::StreamExt;
11311125
use log::error;
11321126
use object_store::local::LocalFileSystem;
1133-
use object_store::path::Path;
11341127
use object_store::{
11351128
GetOptions, GetResult, ListResult, MultipartId, PutOptions, PutResult,
11361129
};
@@ -1139,7 +1132,6 @@ mod tests {
11391132
use parquet::file::metadata::{ParquetColumnIndex, ParquetOffsetIndex};
11401133
use parquet::file::page_index::index::Index;
11411134
use tokio::fs::File;
1142-
use tokio::io::AsyncWrite;
11431135

11441136
#[tokio::test]
11451137
async fn read_merged_batches() -> Result<()> {

datafusion/core/src/datasource/listing/helpers.rs

-2
Original file line numberDiff line numberDiff line change
@@ -423,8 +423,6 @@ where
423423
mod tests {
424424
use std::ops::Not;
425425

426-
use futures::StreamExt;
427-
428426
use crate::logical_expr::{case, col, lit};
429427
use crate::test::object_store::make_test_store_and_state;
430428

datafusion/core/src/datasource/listing/table.rs

-5
Original file line numberDiff line numberDiff line change
@@ -1004,23 +1004,18 @@ impl ListingTable {
10041004

10051005
#[cfg(test)]
10061006
mod tests {
1007-
use std::collections::HashMap;
10081007

10091008
use super::*;
10101009
#[cfg(feature = "parquet")]
1011-
use crate::datasource::file_format::parquet::ParquetFormat;
10121010
use crate::datasource::{provider_as_source, MemTable};
10131011
use crate::execution::options::ArrowReadOptions;
10141012
use crate::physical_plan::collect;
10151013
use crate::prelude::*;
10161014
use crate::{
10171015
assert_batches_eq,
1018-
datasource::file_format::avro::AvroFormat,
1019-
logical_expr::{col, lit},
10201016
test::{columns, object_store::register_test_store},
10211017
};
10221018

1023-
use arrow::datatypes::{DataType, Schema};
10241019
use arrow::record_batch::RecordBatch;
10251020
use arrow_schema::SortOptions;
10261021
use datafusion_common::stats::Precision;

datafusion/core/src/datasource/memory.rs

-3
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,6 @@ impl DataSink for MemSink {
363363

364364
#[cfg(test)]
365365
mod tests {
366-
use std::collections::HashMap;
367366

368367
use super::*;
369368
use crate::datasource::provider_as_source;
@@ -376,8 +375,6 @@ mod tests {
376375
use datafusion_common::DataFusionError;
377376
use datafusion_expr::LogicalPlanBuilder;
378377

379-
use futures::StreamExt;
380-
381378
#[tokio::test]
382379
async fn test_with_projection() -> Result<()> {
383380
let session_ctx = SessionContext::new();

datafusion/core/src/datasource/physical_plan/csv.rs

-1
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,6 @@ mod tests {
526526
use datafusion_common::test_util::arrow_test_data;
527527
use datafusion_common::FileType;
528528

529-
use futures::StreamExt;
530529
use object_store::chunked::ChunkedStore;
531530
use object_store::local::LocalFileSystem;
532531
use rstest::*;

datafusion/core/src/datasource/physical_plan/file_stream.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -521,19 +521,13 @@ mod tests {
521521
use super::*;
522522
use crate::datasource::file_format::write::BatchSerializer;
523523
use crate::datasource::object_store::ObjectStoreUrl;
524-
use crate::datasource::physical_plan::FileMeta;
525-
use crate::physical_plan::metrics::ExecutionPlanMetricsSet;
526524
use crate::prelude::SessionContext;
527-
use crate::{
528-
error::Result,
529-
test::{make_partition, object_store::register_test_store},
530-
};
525+
use crate::test::{make_partition, object_store::register_test_store};
531526

532527
use arrow_schema::Schema;
533528
use datafusion_common::{internal_err, Statistics};
534529

535530
use bytes::Bytes;
536-
use futures::StreamExt;
537531

538532
/// Test `FileOpener` which will simulate errors during file opening or scanning
539533
#[derive(Default)]

datafusion/core/src/datasource/physical_plan/json.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ use datafusion_physical_expr::{EquivalenceProperties, LexOrdering};
4444
use bytes::{Buf, Bytes};
4545
use futures::{ready, StreamExt, TryStreamExt};
4646
use object_store::buffered::BufWriter;
47-
use object_store::{self, GetOptions, GetResultPayload, ObjectStore};
47+
use object_store::{GetOptions, GetResultPayload, ObjectStore};
4848
use tokio::io::AsyncWriteExt;
4949
use tokio::task::JoinSet;
5050

@@ -387,7 +387,6 @@ mod tests {
387387
use crate::dataframe::DataFrameWriteOptions;
388388
use crate::datasource::file_format::file_compression_type::FileTypeExt;
389389
use crate::datasource::file_format::{json::JsonFormat, FileFormat};
390-
use crate::datasource::listing::PartitionedFile;
391390
use crate::datasource::object_store::ObjectStoreUrl;
392391
use crate::execution::context::SessionState;
393392
use crate::prelude::{
@@ -401,7 +400,6 @@ mod tests {
401400
use datafusion_common::FileType;
402401
use flate2::write::GzEncoder;
403402
use flate2::Compression;
404-
use futures::StreamExt;
405403
use object_store::chunked::ChunkedStore;
406404
use object_store::local::LocalFileSystem;
407405
use rstest::*;

datafusion/core/src/datasource/physical_plan/parquet/mod.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ mod tests {
773773
use crate::datasource::file_format::options::CsvReadOptions;
774774
use crate::datasource::file_format::parquet::test_util::store_parquet;
775775
use crate::datasource::file_format::test_util::scan_format;
776-
use crate::datasource::listing::{FileRange, ListingOptions, PartitionedFile};
776+
use crate::datasource::listing::{FileRange, ListingOptions};
777777
use crate::datasource::object_store::ObjectStoreUrl;
778778
use crate::execution::context::SessionState;
779779
use crate::physical_plan::displayable;
@@ -790,7 +790,7 @@ mod tests {
790790
StructArray,
791791
};
792792

793-
use arrow::datatypes::{DataType, Field, Schema, SchemaBuilder};
793+
use arrow::datatypes::{Field, Schema, SchemaBuilder};
794794
use arrow::record_batch::RecordBatch;
795795
use arrow_schema::Fields;
796796
use datafusion_common::{assert_contains, FileType, GetExt, ScalarValue, ToDFSchema};
@@ -799,9 +799,7 @@ mod tests {
799799
use datafusion_physical_expr::create_physical_expr;
800800

801801
use chrono::{TimeZone, Utc};
802-
use futures::StreamExt;
803802
use object_store::local::LocalFileSystem;
804-
use object_store::path::Path;
805803
use object_store::ObjectMeta;
806804
use parquet::arrow::ArrowWriter;
807805
use tempfile::TempDir;

0 commit comments

Comments
 (0)