Skip to content

Commit 9878ee0

Browse files
authored
minor: fix clippy problem in new version. (#5532)
* minor: fix typo * minor: fix clippy problem in new version. * fix new typo
1 parent 8a1cb7e commit 9878ee0

6 files changed

Lines changed: 8 additions & 8 deletions

File tree

‎datafusion/common/src/dfschema.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,7 +519,7 @@ impl From<DFSchema> for SchemaRef {
519519
}
520520

521521
// Hashing refers to a subset of fields considered in PartialEq.
522-
#[allow(clippy::derive_hash_xor_eq)]
522+
#[allow(clippy::derived_hash_with_manual_eq)]
523523
impl Hash for DFSchema {
524524
fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
525525
self.fields.hash(state);

‎datafusion/core/src/physical_plan/aggregates/no_grouping.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ impl RecordBatchStream for AggregateStream {
164164

165165
/// Perform group-by aggregation for the given [`RecordBatch`].
166166
///
167-
/// If successfull, this returns the additional number of bytes that were allocated during this process.
167+
/// If successful, this returns the additional number of bytes that were allocated during this process.
168168
///
169169
/// TODO: Make this a member function
170170
fn aggregate_batch(

‎datafusion/core/src/physical_plan/aggregates/row_hash.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ impl RecordBatchStream for GroupedHashAggregateStream {
297297
impl GroupedHashAggregateStream {
298298
/// Perform group-by aggregation for the given [`RecordBatch`].
299299
///
300-
/// If successfull, this returns the additional number of bytes that were allocated during this process.
300+
/// If successful, this returns the additional number of bytes that were allocated during this process.
301301
///
302302
fn group_aggregate_batch(&mut self, batch: RecordBatch) -> Result<usize> {
303303
// Evaluate the grouping expressions:

‎datafusion/expr/src/logical_plan/plan.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,7 @@ pub struct CreateExternalTable {
16201620
}
16211621

16221622
// Hashing refers to a subset of fields considered in PartialEq.
1623-
#[allow(clippy::derive_hash_xor_eq)]
1623+
#[allow(clippy::derived_hash_with_manual_eq)]
16241624
impl Hash for CreateExternalTable {
16251625
fn hash<H: Hasher>(&self, state: &mut H) {
16261626
self.schema.hash(state);
@@ -1719,7 +1719,7 @@ pub struct Analyze {
17191719
}
17201720

17211721
/// Extension operator defined outside of DataFusion
1722-
#[allow(clippy::derive_hash_xor_eq)] // see impl PartialEq for explanation
1722+
#[allow(clippy::derived_hash_with_manual_eq)] // see impl PartialEq for explanation
17231723
#[derive(Clone, Eq, Hash)]
17241724
pub struct Extension {
17251725
/// The runtime extension operator

‎datafusion/physical-expr/src/aggregate/count_distinct.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ impl DistinctCountAccumulator {
112112
.values
113113
.iter()
114114
.next()
115-
.map(|vals| ScalarValue::size(vals) - std::mem::size_of_val(&vals))
115+
.map(|vals| ScalarValue::size(vals) - std::mem::size_of_val(vals))
116116
.unwrap_or(0)
117117
}
118118
}

‎datafusion/sql/src/expr/arrow_cast.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ impl<'a> Parser<'a> {
127127
let data_type = self.parse_next_type()?;
128128
// ensure that there is no trailing content
129129
if self.tokenizer.next().is_some() {
130-
return Err(make_error(
130+
Err(make_error(
131131
self.val,
132132
&format!("checking trailing content after parsing '{data_type}'"),
133-
));
133+
))
134134
} else {
135135
Ok(data_type)
136136
}

0 commit comments

Comments
 (0)