about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-01-20 15:06:41 +0000
committerbors <bors@rust-lang.org>2018-01-20 15:06:41 +0000
commit15a1e2844dfea7850be5c6c901b67ceff370b0eb (patch)
tree2929f026038000e5f0ecfdbe6e1e0fb378157a6b /src/liballoc
parentbdda8d61151a91fcc95b059918dd834c8e7ac09e (diff)
parent14982db2d68268458a3de03e395b2e9afe518b50 (diff)
downloadrust-15a1e2844dfea7850be5c6c901b67ceff370b0eb.tar.gz
rust-15a1e2844dfea7850be5c6c901b67ceff370b0eb.zip
Auto merge of #46980 - zackmdavis:and_the_case_of_the_needlessly_parenthesized_arguments, r=petrochenkov
in which the unused-parens lint comes to cover function and method args

Resolves #46137.
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/vec_deque.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/vec_deque.rs b/src/liballoc/vec_deque.rs
index 8f05a69c5f3..69557fe2789 100644
--- a/src/liballoc/vec_deque.rs
+++ b/src/liballoc/vec_deque.rs
@@ -2480,7 +2480,7 @@ impl<T> From<VecDeque<T>> for Vec<T> {
             if other.is_contiguous() {
                 ptr::copy(buf.offset(tail as isize), buf, len);
             } else {
-                if (tail - head) >= cmp::min((cap - tail), head) {
+                if (tail - head) >= cmp::min(cap - tail, head) {
                     // There is enough free space in the centre for the shortest block so we can
                     // do this in at most three copy moves.
                     if (cap - tail) > head {