Skip to content

Commit

Permalink
Appease the Great God Clippy.
Browse files Browse the repository at this point in the history
  • Loading branch information
bodil committed Nov 18, 2019
1 parent 788f16b commit 045fed7
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 7 deletions.
1 change: 1 addition & 0 deletions clippy.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ blacklisted-names = []
single-char-binding-names-threshold = 15
# I HAVE THE POWER OF OLEG
type-complexity-threshold = 999999
cognitive-complexity-threshold = 30
2 changes: 1 addition & 1 deletion src/nodes/btree.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ impl<A> Node<A> {
}

#[inline]
pub fn from_split(left: Node<A>, median: A, right: Node<A>) -> Self {
pub fn new_from_split(left: Node<A>, median: A, right: Node<A>) -> Self {
Node {
keys: Chunk::unit(median),
children: Chunk::pair(Some(Ref::from(left)), Some(Ref::from(right))),
Expand Down
2 changes: 1 addition & 1 deletion src/ord/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ where
}
Insert::Update(root) => Ref::from(root),
Insert::Split(left, median, right) => {
Ref::from(Node::from_split(left, median, right))
Ref::from(Node::new_from_split(left, median, right))
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/ord/set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ where
}
Insert::Update(root) => Ref::from(root),
Insert::Split(left, median, right) => {
Ref::from(Node::from_split(left, median, right))
Ref::from(Node::new_from_split(left, median, right))
}
}
};
Expand Down
8 changes: 4 additions & 4 deletions src/vector/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2828,21 +2828,21 @@ mod test {

#[test]
fn chunks(ref input in vector(i32::ANY, 0..10000)) {
let output: Vector<_> = input.leaves().flat_map(|a|a).cloned().collect();
let output: Vector<_> = input.leaves().flatten().cloned().collect();
assert_eq!(input, &output);
let rev_in: Vector<_> = input.iter().rev().cloned().collect();
let rev_out: Vector<_> = input.leaves().rev().map(|c| c.iter().rev()).flat_map(|a|a).cloned().collect();
let rev_out: Vector<_> = input.leaves().rev().map(|c| c.iter().rev()).flatten().cloned().collect();
assert_eq!(rev_in, rev_out);
}

#[test]
fn chunks_mut(ref mut input_src in vector(i32::ANY, 0..10000)) {
let mut input = input_src.clone();
#[allow(clippy::map_clone)]
let output: Vector<_> = input.leaves_mut().flat_map(|a| a).map(|v| *v).collect();
let output: Vector<_> = input.leaves_mut().flatten().map(|v| *v).collect();
assert_eq!(input, output);
let rev_in: Vector<_> = input.iter().rev().cloned().collect();
let rev_out: Vector<_> = input.leaves_mut().rev().map(|c| c.iter().rev()).flat_map(|a|a).cloned().collect();
let rev_out: Vector<_> = input.leaves_mut().rev().map(|c| c.iter().rev()).flatten().cloned().collect();
assert_eq!(rev_in, rev_out);
}

Expand Down

0 comments on commit 045fed7

Please sign in to comment.