alamb opened a new pull request, #6875: URL: https://github.com/apache/arrow-datafusion/pull/6875
# Which issue does this PR close? N/A # Rationale for this change https://github.com/apache/arrow-datafusion/pull/6860 and https://github.com/apache/arrow-datafusion/pull/6835 conflicted logically and cause compilation to fail on `main`: https://github.com/apache/arrow-datafusion/actions/runs/5483558927/jobs/9990031096 ``` Compiling datafusion v27.0.0 (D:\a\arrow-datafusion\arrow-datafusion\datafusion\core) error[E0252]: the name `DisplayFormatType` is defined multiple times --> datafusion\core\src\physical_plan\streaming.rs:38:24 | 34 | DisplayFormatType, ExecutionPlan, Partitioning, SendableRecordBatchStream, | ----------------- previous import of the type `DisplayFormatType` here ... 38 | use super::{DisplayAs, DisplayFormatType}; | ^^^^^^^^^^^^^^^^^ `DisplayFormatType` reimported here | = note: `DisplayFormatType` must be defined only once in the type namespace of this module error[E0407]: method `fmt_as` is not a member of trait `ExecutionPlan` --> datafusion\core\src\physical_plan\streaming.rs:167:5 | 167 | / fn fmt_as( 168 | | &self, 169 | | t: DisplayFormatType, 170 | | f: &mut std::fmt::Formatter, ... | 203 | | } 204 | | } | |_____^ not a member of trait `ExecutionPlan` warning: unused import: `DisplayFormatType` --> datafusion\core\src\physical_plan\streaming.rs:38:24 | 38 | use super::{DisplayAs, DisplayFormatType}; | ^^^^^^^^^^^^^^^^^ | = note: `#[warn(unused_imports)]` on by default ``` # What changes are included in this PR? Fix conflict # Are these changes tested? yes, by CI <!-- 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. --> -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
