Skip to content

Commit c352f8a

Browse files
committed
make test conditional
1 parent 9508f4f commit c352f8a

File tree

2 files changed

+48
-47
lines changed

2 files changed

+48
-47
lines changed

datafusion-cli/Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datafusion/common/src/tree_node.rs

Lines changed: 46 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ pub trait TreeNode: Sized {
125125
/// TreeNodeVisitor::f_up(ParentNode)
126126
/// ```
127127
#[cfg_attr(feature = "recursive-protection", recursive::recursive)]
128-
fn visit<'n, V: TreeNodeVisitor<'n, Node = Self>>(
128+
fn visit<'n, V: TreeNodeVisitor<'n, Node=Self>>(
129129
&'n self,
130130
visitor: &mut V,
131131
) -> Result<TreeNodeRecursion> {
@@ -175,7 +175,7 @@ pub trait TreeNode: Sized {
175175
/// TreeNodeRewriter::f_up(ParentNode)
176176
/// ```
177177
#[cfg_attr(feature = "recursive-protection", recursive::recursive)]
178-
fn rewrite<R: TreeNodeRewriter<Node = Self>>(
178+
fn rewrite<R: TreeNodeRewriter<Node=Self>>(
179179
self,
180180
rewriter: &mut R,
181181
) -> Result<Transformed<Self>> {
@@ -404,7 +404,7 @@ pub trait TreeNode: Sized {
404404
TreeNodeRecursion::Continue
405405
})
406406
})
407-
.map(|_| found)
407+
.map(|_| found)
408408
}
409409

410410
/// Low-level API used to implement other APIs.
@@ -884,7 +884,7 @@ impl<'a, T: 'a, C: TreeNodeContainer<'a, T>> TreeNodeContainer<'a, T> for Vec<C>
884884
}
885885

886886
impl<'a, T: 'a, K: Eq + Hash, C: TreeNodeContainer<'a, T>> TreeNodeContainer<'a, T>
887-
for HashMap<K, C>
887+
for HashMap<K, C>
888888
{
889889
fn apply_elements<F: FnMut(&'a T) -> Result<TreeNodeRecursion>>(
890890
&'a self,
@@ -924,7 +924,7 @@ impl<'a, T: 'a, K: Eq + Hash, C: TreeNodeContainer<'a, T>> TreeNodeContainer<'a,
924924
}
925925

926926
impl<'a, T: 'a, C0: TreeNodeContainer<'a, T>, C1: TreeNodeContainer<'a, T>>
927-
TreeNodeContainer<'a, T> for (C0, C1)
927+
TreeNodeContainer<'a, T> for (C0, C1)
928928
{
929929
fn apply_elements<F: FnMut(&'a T) -> Result<TreeNodeRecursion>>(
930930
&'a self,
@@ -950,12 +950,12 @@ impl<'a, T: 'a, C0: TreeNodeContainer<'a, T>, C1: TreeNodeContainer<'a, T>>
950950
}
951951

952952
impl<
953-
'a,
954-
T: 'a,
955-
C0: TreeNodeContainer<'a, T>,
956-
C1: TreeNodeContainer<'a, T>,
957-
C2: TreeNodeContainer<'a, T>,
958-
> TreeNodeContainer<'a, T> for (C0, C1, C2)
953+
'a,
954+
T: 'a,
955+
C0: TreeNodeContainer<'a, T>,
956+
C1: TreeNodeContainer<'a, T>,
957+
C2: TreeNodeContainer<'a, T>,
958+
> TreeNodeContainer<'a, T> for (C0, C1, C2)
959959
{
960960
fn apply_elements<F: FnMut(&'a T) -> Result<TreeNodeRecursion>>(
961961
&'a self,
@@ -1029,7 +1029,7 @@ impl<'a, T: 'a, C: TreeNodeContainer<'a, T>> TreeNodeRefContainer<'a, T> for Vec
10291029
}
10301030

10311031
impl<'a, T: 'a, C0: TreeNodeContainer<'a, T>, C1: TreeNodeContainer<'a, T>>
1032-
TreeNodeRefContainer<'a, T> for (&'a C0, &'a C1)
1032+
TreeNodeRefContainer<'a, T> for (&'a C0, &'a C1)
10331033
{
10341034
fn apply_ref_elements<F: FnMut(&'a T) -> Result<TreeNodeRecursion>>(
10351035
&self,
@@ -1042,12 +1042,12 @@ impl<'a, T: 'a, C0: TreeNodeContainer<'a, T>, C1: TreeNodeContainer<'a, T>>
10421042
}
10431043

10441044
impl<
1045-
'a,
1046-
T: 'a,
1047-
C0: TreeNodeContainer<'a, T>,
1048-
C1: TreeNodeContainer<'a, T>,
1049-
C2: TreeNodeContainer<'a, T>,
1050-
> TreeNodeRefContainer<'a, T> for (&'a C0, &'a C1, &'a C2)
1045+
'a,
1046+
T: 'a,
1047+
C0: TreeNodeContainer<'a, T>,
1048+
C1: TreeNodeContainer<'a, T>,
1049+
C2: TreeNodeContainer<'a, T>,
1050+
> TreeNodeRefContainer<'a, T> for (&'a C0, &'a C1, &'a C2)
10511051
{
10521052
fn apply_ref_elements<F: FnMut(&'a T) -> Result<TreeNodeRecursion>>(
10531053
&self,
@@ -1129,8 +1129,8 @@ impl<I: Iterator> TreeNodeIterator for I {
11291129
}
11301130
TreeNodeRecursion::Stop => Ok(item),
11311131
})
1132-
.collect::<Result<Vec<_>>>()
1133-
.map(|data| Transformed::new(data, transformed, tnr))
1132+
.collect::<Result<Vec<_>>>()
1133+
.map(|data| Transformed::new(data, transformed, tnr))
11341134
}
11351135
}
11361136

@@ -1385,9 +1385,9 @@ pub(crate) mod tests {
13851385
"f_up(i)",
13861386
"f_up(j)",
13871387
]
1388-
.into_iter()
1389-
.map(|s| s.to_string())
1390-
.collect()
1388+
.into_iter()
1389+
.map(|s| s.to_string())
1390+
.collect()
13911391
}
13921392

13931393
// Expected transformed tree after a combined traversal
@@ -1458,9 +1458,9 @@ pub(crate) mod tests {
14581458
"f_up(i)",
14591459
"f_up(j)",
14601460
]
1461-
.into_iter()
1462-
.map(|s| s.to_string())
1463-
.collect()
1461+
.into_iter()
1462+
.map(|s| s.to_string())
1463+
.collect()
14641464
}
14651465

14661466
fn f_down_jump_on_a_transformed_down_tree() -> TestTreeNode<String> {
@@ -1492,9 +1492,9 @@ pub(crate) mod tests {
14921492
"f_up(i)",
14931493
"f_up(j)",
14941494
]
1495-
.into_iter()
1496-
.map(|s| s.to_string())
1497-
.collect()
1495+
.into_iter()
1496+
.map(|s| s.to_string())
1497+
.collect()
14981498
}
14991499

15001500
fn f_down_jump_on_e_transformed_tree() -> TestTreeNode<String> {
@@ -1545,9 +1545,9 @@ pub(crate) mod tests {
15451545
"f_up(i)",
15461546
"f_up(j)",
15471547
]
1548-
.into_iter()
1549-
.map(|s| s.to_string())
1550-
.collect()
1548+
.into_iter()
1549+
.map(|s| s.to_string())
1550+
.collect()
15511551
}
15521552

15531553
fn f_up_jump_on_a_transformed_tree() -> TestTreeNode<String> {
@@ -1601,9 +1601,9 @@ pub(crate) mod tests {
16011601
"f_up(i)",
16021602
"f_up(j)",
16031603
]
1604-
.into_iter()
1605-
.map(|s| s.to_string())
1606-
.collect()
1604+
.into_iter()
1605+
.map(|s| s.to_string())
1606+
.collect()
16071607
}
16081608

16091609
fn f_up_jump_on_e_transformed_tree() -> TestTreeNode<String> {
@@ -1628,9 +1628,9 @@ pub(crate) mod tests {
16281628
"f_down(d)",
16291629
"f_down(a)",
16301630
]
1631-
.into_iter()
1632-
.map(|s| s.to_string())
1633-
.collect()
1631+
.into_iter()
1632+
.map(|s| s.to_string())
1633+
.collect()
16341634
}
16351635

16361636
fn f_down_stop_on_a_transformed_tree() -> TestTreeNode<String> {
@@ -1707,9 +1707,9 @@ pub(crate) mod tests {
17071707
"f_down(a)",
17081708
"f_up(a)",
17091709
]
1710-
.into_iter()
1711-
.map(|s| s.to_string())
1712-
.collect()
1710+
.into_iter()
1711+
.map(|s| s.to_string())
1712+
.collect()
17131713
}
17141714

17151715
fn f_up_stop_on_a_transformed_tree() -> TestTreeNode<String> {
@@ -1755,9 +1755,9 @@ pub(crate) mod tests {
17551755
"f_up(c)",
17561756
"f_up(e)",
17571757
]
1758-
.into_iter()
1759-
.map(|s| s.to_string())
1760-
.collect()
1758+
.into_iter()
1759+
.map(|s| s.to_string())
1760+
.collect()
17611761
}
17621762

17631763
fn f_up_stop_on_e_transformed_tree() -> TestTreeNode<String> {
@@ -1876,7 +1876,7 @@ pub(crate) mod tests {
18761876
}
18771877

18781878
type TestRewriterF<T> =
1879-
Box<dyn FnMut(TestTreeNode<T>) -> Result<Transformed<TestTreeNode<T>>>>;
1879+
Box<dyn FnMut(TestTreeNode<T>) -> Result<Transformed<TestTreeNode<T>>>>;
18801880

18811881
struct TestRewriter<T> {
18821882
f_down: TestRewriterF<T>,
@@ -2349,6 +2349,7 @@ pub(crate) mod tests {
23492349
Ok(())
23502350
}
23512351

2352+
#[cfg(feature = "recursive-protection")]
23522353
#[test]
23532354
fn test_large_tree() {
23542355
let mut item = TestTreeNode::new_leaf("initial".to_string());

0 commit comments

Comments
 (0)