Skip to content
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

Fix clippy errors for Rust 1.80 #11654

Merged
merged 4 commits into from
Jul 25, 2024
Merged

Fix clippy errors for Rust 1.80 #11654

merged 4 commits into from
Jul 25, 2024

Conversation

findepi
Copy link
Member

@findepi findepi commented Jul 25, 2024

Newest version of clippy complains when list item continuation is not indented.

Fixes #11651

Closes #11467

@github-actions github-actions bot added the core Core DataFusion crate label Jul 25, 2024
Signed-off-by: Nick Cameron <nrc@ncameron.org>
@github-actions github-actions bot added logical-expr Logical plan and expressions optimizer Optimizer rules sqllogictest SQL Logic Tests (.slt) sql SQL Planner physical-expr Physical Expressions labels Jul 25, 2024
@findepi
Copy link
Member Author

findepi commented Jul 25, 2024

Cherry picked #11467 and rebased it on current main.

Newest version of clippy complains when list item continuation is not
indented.
Reported by clippy
Copy link
Contributor

@alamb alamb left a comment

Choose a reason for hiding this comment

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

Thank you @findepi (and @nrc )

This looks good to me.

I filed follow on tickets, and I'll make a subsequent PR to annotate the tests with them so it is easier to understand why they are commented out (without resorting to git archeology)

@@ -251,25 +251,26 @@ SELECT COUNT(*) FROM timestamp_with_tz;
----
131072

# FIXME(#TODO) fails with feature `force_hash_collisions`
Copy link
Contributor

Choose a reason for hiding this comment

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

I think the concern on #11467 was that this masks a real bug.

However, what I think we should do is file a PR to investigate / restore the tests which I will do so shortly

Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# FIXME(#TODO) fails with feature `force_hash_collisions`
# FIXME(#TODO) fails with feature `force_hash_collisions`
# https://github.com/apache/datafusion/issues/11660

Copy link
Contributor

Choose a reason for hiding this comment

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

in #11661

@@ -1930,6 +1931,8 @@ mod tests {
Ok(())
}

// FIXME(#TODO) test fails with feature `force_hash_collisions`
#[cfg(not(feature = "force_hash_collisions"))]
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
#[cfg(not(feature = "force_hash_collisions"))]
// https://github.com/apache/datafusion/issues/11658
#[cfg(not(feature = "force_hash_collisions"))]

@@ -1985,6 +1988,8 @@ mod tests {
}

/// Test where the left has 2 parts, the right with 1 part => 1 part
// FIXME(#TODO) test fails with feature `force_hash_collisions`
#[cfg(not(feature = "force_hash_collisions"))]
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
#[cfg(not(feature = "force_hash_collisions"))]
// https://github.com/apache/datafusion/issues/11658
#[cfg(not(feature = "force_hash_collisions"))]

@@ -2097,6 +2102,8 @@ mod tests {
}

/// Test where the left has 1 part, the right has 2 parts => 2 parts
// FIXME(#TODO) test fails with feature `force_hash_collisions`
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// FIXME(#TODO) test fails with feature `force_hash_collisions`
// FIXME(#TODO) test fails with feature `force_hash_collisions`
// https://github.com/apache/datafusion/issues/11658

Copy link
Contributor

Choose a reason for hiding this comment

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

in in #11661

@@ -238,16 +238,17 @@ SELECT * FROM t1 FULL JOIN t2 ON t1_id = t2_id
44 d 4 44 x 3
NULL NULL NULL 55 w 3

# FIXME(#TODO) fails with feature `force_hash_collisions`
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
# FIXME(#TODO) fails with feature `force_hash_collisions`
# FIXME(#TODO) fails with feature `force_hash_collisions`
# https://github.com/apache/datafusion/issues/11659

Copy link
Contributor

Choose a reason for hiding this comment

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

in #11661

@alamb alamb merged commit 6fd57b2 into apache:main Jul 25, 2024
28 of 31 checks passed
@findepi findepi deleted the findepi/clippy branch July 25, 2024 21:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Core DataFusion crate logical-expr Logical plan and expressions optimizer Optimizer rules physical-expr Physical Expressions sql SQL Planner sqllogictest SQL Logic Tests (.slt) substrait
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clippy CI failures on main after Rust 1.80 release
3 participants