Merge #137

137: run cargo fmt r=japaric a=japaric



Co-authored-by: Jorge Aparicio <jorge@japaric.io>

Author: bors[bot]

src/de.rs

@@ -5,8 +5,8 @@ use hash32::{BuildHasherDefault, Hash, Hasher};
 use serde::de::{self, Deserialize, Deserializer, Error, MapAccess, SeqAccess};
 
 use crate::{
-    sealed::binary_heap::Kind as BinaryHeapKind,
     indexmap::{Bucket, Pos},
+    sealed::binary_heap::Kind as BinaryHeapKind,
     BinaryHeap, IndexMap, IndexSet, LinearMap, String, Vec,
 };
 

src/indexmap.rs

@@ -979,5 +979,4 @@ mod tests {
             assert!(a == b);
         }
     }
-
 }

src/lib.rs

@@ -76,6 +76,7 @@ pub use linear_map::LinearMap;
 pub use string::String;
 pub use vec::Vec;
 
+// NOTE this code was last ported from v0.4.1 of the indexmap crate
 mod indexmap;
 mod indexset;
 mod linear_map;

src/mpmc.rs

@@ -496,7 +496,7 @@ unsafe fn dequeue<T>(buffer: *mut Cell<T>, dequeue_pos: &AtomicU8, mask: u8) ->
         } else if dif < 0 {
             return None;
         } else {
-            if pos == 255 && dif == 255{
+            if pos == 255 && dif == 255 {
                 return None;
             } else {
                 pos = dequeue_pos.load(Ordering::Relaxed);
@@ -568,7 +568,7 @@ mod tests {
     }
 
     #[test]
-    fn blocking(){
+    fn blocking() {
         let q = Q2::new();
         for _ in 0..255 {
             q.enqueue(0).unwrap();

src/ser.rs

@@ -3,8 +3,8 @@ use hash32::{BuildHasher, Hash};
 use serde::ser::{Serialize, SerializeMap, SerializeSeq, Serializer};
 
 use crate::{
-    sealed::binary_heap::Kind as BinaryHeapKind,
     indexmap::{Bucket, Pos},
+    sealed::binary_heap::Kind as BinaryHeapKind,
     BinaryHeap, IndexMap, IndexSet, LinearMap, String, Vec,
 };
 

src/spsc/mod.rs

@@ -373,9 +373,7 @@ macro_rules! impl_ {
                 let p = self.0.buffer.as_ptr();
 
                 if *head != *tail {
-                    let item = unsafe {
-                      &*(p as *const T).add(usize::from(*head % cap))
-                    };
+                    let item = unsafe { &*(p as *const T).add(usize::from(*head % cap)) };
                     Some(item)
                 } else {
                     None
@@ -921,5 +919,4 @@ mod tests {
         };
         assert_eq!(hash1, hash2);
     }
-
 }

src/string.rs

@@ -788,5 +788,4 @@ mod tests {
         assert_eq!(0, s.len());
         assert_eq!(8, s.capacity());
     }
-
 }