From ee242e08d240a67958e3ac124ecfd4459611ccd1 Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Thu, 31 Dec 2020 16:49:21 +0100 Subject: [PATCH 1/4] Fix new clippy linting errors --- .../arrow-flight/src/arrow.flight.protocol.rs | 5 ++-- rust/datafusion/src/logical_plan/plan.rs | 24 ++++++++++++------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/rust/arrow-flight/src/arrow.flight.protocol.rs b/rust/arrow-flight/src/arrow.flight.protocol.rs index 1ede9c5f269..871eb506b26 100644 --- a/rust/arrow-flight/src/arrow.flight.protocol.rs +++ b/rust/arrow-flight/src/arrow.flight.protocol.rs @@ -498,9 +498,8 @@ pub mod flight_service_server { #[async_trait] pub trait FlightService: Send + Sync + 'static { #[doc = "Server streaming response type for the Handshake method."] - type HandshakeStream: Stream< - Item = Result, - > + Send + type HandshakeStream: Stream> + + Send + Sync + 'static; #[doc = ""] diff --git a/rust/datafusion/src/logical_plan/plan.rs b/rust/datafusion/src/logical_plan/plan.rs index b228402ca10..573cc17f3a6 100644 --- a/rust/datafusion/src/logical_plan/plan.rs +++ b/rust/datafusion/src/logical_plan/plan.rs @@ -838,8 +838,10 @@ mod tests { /// test earliy stopping in pre-visit #[test] fn early_stoping_pre_visit() { - let mut visitor = StoppingVisitor::default(); - visitor.return_false_from_pre_in = OptionalCounter::new(2); + let mut visitor = StoppingVisitor { + return_false_from_post_in: OptionalCounter::new(1), + ..Default::default() + }; let plan = test_plan(); let res = plan.accept(&mut visitor); assert!(res.is_ok()); @@ -852,8 +854,10 @@ mod tests { #[test] fn early_stoping_post_visit() { - let mut visitor = StoppingVisitor::default(); - visitor.return_false_from_post_in = OptionalCounter::new(1); + let mut visitor = StoppingVisitor { + return_false_from_post_in: OptionalCounter::new(1), + ..Default::default() + }; let plan = test_plan(); let res = plan.accept(&mut visitor); assert!(res.is_ok()); @@ -907,8 +911,10 @@ mod tests { #[test] fn error_pre_visit() { - let mut visitor = ErrorVisitor::default(); - visitor.return_error_from_pre_in = OptionalCounter::new(2); + let mut visitor = ErrorVisitor { + return_error_from_post_in: OptionalCounter::new(1), + ..Default::default() + }; let plan = test_plan(); let res = plan.accept(&mut visitor); @@ -926,8 +932,10 @@ mod tests { #[test] fn error_post_visit() { - let mut visitor = ErrorVisitor::default(); - visitor.return_error_from_post_in = OptionalCounter::new(1); + let mut visitor = ErrorVisitor { + return_error_from_post_in: OptionalCounter::new(1), + ..Default::default() + }; let plan = test_plan(); let res = plan.accept(&mut visitor); if let Err(e) = res { From 22067a4082aa792bb12f3235dc05d6d88a8cbf13 Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Thu, 31 Dec 2020 16:51:56 +0100 Subject: [PATCH 2/4] Undo fmt --- rust/arrow-flight/src/arrow.flight.protocol.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rust/arrow-flight/src/arrow.flight.protocol.rs b/rust/arrow-flight/src/arrow.flight.protocol.rs index 871eb506b26..1ede9c5f269 100644 --- a/rust/arrow-flight/src/arrow.flight.protocol.rs +++ b/rust/arrow-flight/src/arrow.flight.protocol.rs @@ -498,8 +498,9 @@ pub mod flight_service_server { #[async_trait] pub trait FlightService: Send + Sync + 'static { #[doc = "Server streaming response type for the Handshake method."] - type HandshakeStream: Stream> - + Send + type HandshakeStream: Stream< + Item = Result, + > + Send + Sync + 'static; #[doc = ""] From 7257ada5e525a395902e0642311b3032e89649e4 Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Thu, 31 Dec 2020 17:05:54 +0100 Subject: [PATCH 3/4] Fix tests --- rust/datafusion/src/logical_plan/plan.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/datafusion/src/logical_plan/plan.rs b/rust/datafusion/src/logical_plan/plan.rs index 573cc17f3a6..718b5e54ac3 100644 --- a/rust/datafusion/src/logical_plan/plan.rs +++ b/rust/datafusion/src/logical_plan/plan.rs @@ -839,7 +839,7 @@ mod tests { #[test] fn early_stoping_pre_visit() { let mut visitor = StoppingVisitor { - return_false_from_post_in: OptionalCounter::new(1), + return_false_from_post_in: OptionalCounter::new(2), ..Default::default() }; let plan = test_plan(); @@ -912,7 +912,7 @@ mod tests { #[test] fn error_pre_visit() { let mut visitor = ErrorVisitor { - return_error_from_post_in: OptionalCounter::new(1), + return_error_from_post_in: OptionalCounter::new(2), ..Default::default() }; let plan = test_plan(); From 69d17fdf8a13077066ec576e061d0271ef0d6bc8 Mon Sep 17 00:00:00 2001 From: "Heres, Daniel" Date: Thu, 31 Dec 2020 17:13:39 +0100 Subject: [PATCH 4/4] Fix tests --- rust/datafusion/src/logical_plan/plan.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/datafusion/src/logical_plan/plan.rs b/rust/datafusion/src/logical_plan/plan.rs index 718b5e54ac3..bd172b31323 100644 --- a/rust/datafusion/src/logical_plan/plan.rs +++ b/rust/datafusion/src/logical_plan/plan.rs @@ -839,7 +839,7 @@ mod tests { #[test] fn early_stoping_pre_visit() { let mut visitor = StoppingVisitor { - return_false_from_post_in: OptionalCounter::new(2), + return_false_from_pre_in: OptionalCounter::new(2), ..Default::default() }; let plan = test_plan(); @@ -912,7 +912,7 @@ mod tests { #[test] fn error_pre_visit() { let mut visitor = ErrorVisitor { - return_error_from_post_in: OptionalCounter::new(2), + return_error_from_pre_in: OptionalCounter::new(2), ..Default::default() }; let plan = test_plan();