Skip to content

Fix clippy for Rust 1.84 #14065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions datafusion/common/src/pyarrow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ mod tests {
fn test_py_scalar() {
init_python();

// TODO: remove this attribute when bumping pyo3 to v0.23.0
// See: <https://github.com/PyO3/pyo3/blob/v0.23.0/guide/src/migration.md#gil-refs-feature-removed>
#[allow(unexpected_cfgs)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pyo3 will be updated in

I need to find some time to polish that PR a bit

Python::with_gil(|py| {
let scalar_float = ScalarValue::Float64(Some(12.34));
let py_float = scalar_float.into_py(py).call_method0(py, "as_py").unwrap();
Expand Down
4 changes: 2 additions & 2 deletions datafusion/core/src/datasource/listing/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1148,8 +1148,8 @@ impl ListingTable {
/// This method first checks if the statistics for the given file are already cached.
/// If they are, it returns the cached statistics.
/// If they are not, it infers the statistics from the file and stores them in the cache.
async fn do_collect_statistics<'a>(
&'a self,
async fn do_collect_statistics(
&self,
ctx: &SessionState,
store: &Arc<dyn ObjectStore>,
part_file: &PartitionedFile,
Expand Down
9 changes: 3 additions & 6 deletions datafusion/core/src/execution/context/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1047,7 +1047,7 @@ impl SessionContext {
Ok(table)
}

async fn find_and_deregister<'a>(
async fn find_and_deregister(
&self,
table_ref: impl Into<TableReference>,
table_type: TableType,
Expand Down Expand Up @@ -1481,10 +1481,7 @@ impl SessionContext {
/// provided reference.
///
/// [`register_table`]: SessionContext::register_table
pub async fn table<'a>(
&self,
table_ref: impl Into<TableReference>,
) -> Result<DataFrame> {
pub async fn table(&self, table_ref: impl Into<TableReference>) -> Result<DataFrame> {
let table_ref: TableReference = table_ref.into();
let provider = self.table_provider(table_ref.clone()).await?;
let plan = LogicalPlanBuilder::scan(
Expand All @@ -1511,7 +1508,7 @@ impl SessionContext {
}

/// Return a [`TableProvider`] for the specified table.
pub async fn table_provider<'a>(
pub async fn table_provider(
&self,
table_ref: impl Into<TableReference>,
) -> Result<Arc<dyn TableProvider>> {
Expand Down
4 changes: 1 addition & 3 deletions datafusion/physical-expr-common/src/physical_expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,7 @@ pub trait DynEq {

impl<T: Eq + Any> DynEq for T {
fn dyn_eq(&self, other: &dyn Any) -> bool {
other
.downcast_ref::<Self>()
.map_or(false, |other| other == self)
other.downcast_ref::<Self>() == Some(self)
}
}

Expand Down
6 changes: 3 additions & 3 deletions datafusion/physical-expr-common/src/sort_expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ impl PhysicalSortRequirement {
/// Returns whether this requirement is equal or more specific than `other`.
pub fn compatible(&self, other: &PhysicalSortRequirement) -> bool {
self.expr.eq(&other.expr)
&& other.options.map_or(true, |other_opts| {
self.options.map_or(false, |opts| opts == other_opts)
})
&& other
.options
.map_or(true, |other_opts| self.options == Some(other_opts))
}

#[deprecated(since = "43.0.0", note = "use LexRequirement::from_lex_ordering")]
Expand Down
Loading