about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorSrinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>2016-10-16 15:41:01 +0530
committerSrinivas Reddy Thatiparthy <thatiparthysreenivas@gmail.com>2016-10-16 15:41:01 +0530
commit54e320d4bce4a397d165739fda8329a0567b35c4 (patch)
tree2bae89e04abbdfc475eaeeaaee4b67d2324cf9f5 /src/liballoc
parent6dc035ed911672c6a1f7afc9eed15fb08e574e5b (diff)
downloadrust-54e320d4bce4a397d165739fda8329a0567b35c4.tar.gz
rust-54e320d4bce4a397d165739fda8329a0567b35c4.zip
run rustfmt on various folders
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/raw_vec.rs14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs
index e153507956b..f23ea0ea8bf 100644
--- a/src/liballoc/raw_vec.rs
+++ b/src/liballoc/raw_vec.rs
@@ -57,11 +57,7 @@ impl<T> RawVec<T> {
     pub fn new() -> Self {
         unsafe {
             // !0 is usize::MAX. This branch should be stripped at compile time.
-            let cap = if mem::size_of::<T>() == 0 {
-                !0
-            } else {
-                0
-            };
+            let cap = if mem::size_of::<T>() == 0 { !0 } else { 0 };
 
             // heap::EMPTY doubles as "unallocated" and "zero-sized allocation"
             RawVec {
@@ -209,11 +205,7 @@ impl<T> RawVec<T> {
 
             let (new_cap, ptr) = if self.cap == 0 {
                 // skip to 4 because tiny Vec's are dumb; but not if that would cause overflow
-                let new_cap = if elem_size > (!0) / 8 {
-                    1
-                } else {
-                    4
-                };
+                let new_cap = if elem_size > (!0) / 8 { 1 } else { 4 };
                 let ptr = heap::allocate(new_cap * elem_size, align);
                 (new_cap, ptr)
             } else {
@@ -347,7 +339,7 @@ impl<T> RawVec<T> {
         let elem_size = mem::size_of::<T>();
         // Nothing we can really do about these checks :(
         let required_cap = used_cap.checked_add(needed_extra_cap)
-                                   .expect("capacity overflow");
+            .expect("capacity overflow");
         // Cannot overflow, because `cap <= isize::MAX`, and type of `cap` is `usize`.
         let double_cap = self.cap * 2;
         // `double_cap` guarantees exponential growth.