(datafusion) branch main updated: Fix fmt after logical conflict (#19208)

[gi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git


The following commit(s) were added to refs/heads/main by this push:
     new 4c3e3c1c69 Fix fmt after logical conflict (#19208)
4c3e3c1c69 is described below

commit 4c3e3c1c69aee6a5b7eb416bef310257cb919c3d
Author: Andrew Lamb <an...@nerdnetworks.org>
AuthorDate: Mon Dec 8 10:25:01 2025 -0500

    Fix fmt after logical conflict (#19208)
    
    ## Which issue does this PR close?
    
    <!--
    We generally require a GitHub issue to be filed for all bug fixes and
    enhancements and this helps us generate change logs for our releases.
    You can link an issue to this PR using the GitHub syntax. For example
    `Closes #123` indicates that this PR will close issue #123.
    -->
    
    - Closes #.
    
    ## Rationale for this change
    
    `cargo fmt` is failing on main. Example
    https://github.com/apache/datafusion/actions/runs/20027361509/job/57427769604
    
    I believe it is a logical conflict between:
    - https://github.com/apache/datafusion/pull/19091
    - https://github.com/apache/datafusion/pull/19130
    
    
    ## What changes are included in this PR?
    
    Ran `cargo fmt` and committed the result
    
    ## Are these changes tested?
    
    <!--
    We typically require tests for all PRs in order to:
    1. Prevent the code from being accidentally broken by subsequent changes
    2. Serve as another way to document the expected behavior of the code
    
    If tests are not included in your PR, please explain why (for example,
    are they covered by existing tests)?
    -->
    
    ## Are there any user-facing changes?
    
    <!--
    If there are user-facing changes then we may require documentation to be
    updated before approving the PR.
    -->
    
    <!--
    If there are any breaking changes to public APIs, please add the `api
    change` label.
    -->
---
 datafusion/physical-expr/src/simplifier/const_evaluator.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datafusion/physical-expr/src/simplifier/const_evaluator.rs b/datafusion/physical-expr/src/simplifier/const_evaluator.rs
index ebed5965c4..65111b2911 100644
--- a/datafusion/physical-expr/src/simplifier/const_evaluator.rs
+++ b/datafusion/physical-expr/src/simplifier/const_evaluator.rs
@@ -27,8 +27,8 @@ use datafusion_common::{Result, ScalarValue};
 use datafusion_expr_common::columnar_value::ColumnarValue;
 use datafusion_physical_expr_common::physical_expr::is_volatile;
 
-use crate::expressions::{Column, Literal};
 use crate::PhysicalExpr;
+use crate::expressions::{Column, Literal};
 
 /// Simplify expressions that consist only of literals by evaluating them.
 ///


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datafusion.apache.org
For additional commands, e-mail: commits-help@datafusion.apache.org