format with [rustfmt_skip] and addressed a few comments

2 files changed, 19 insertions, 80 deletions

diff --git a/src/libcollectionstest/enum_set.rs b/src/libcollectionstest/enum_set.rs
index 0702471104b..972361326d7 100644
--- a/src/libcollectionstest/enum_set.rs
+++ b/src/libcollectionstest/enum_set.rs
@@ -62,8 +62,9 @@ fn test_len() {
     assert_eq!(e.len(), 0);
 }
 
-/// ////////////////////////////////////////////////////////////////////////
-/// intersect
+///////////////////////////////////////////////////////////////////////////
+// intersect
+
 #[test]
 fn test_two_empties_do_not_intersect() {
     let e1: EnumSet<Foo> = EnumSet::new();
@@ -106,8 +107,9 @@ fn test_overlapping_intersects() {
     assert!(!e1.is_disjoint(&e2));
 }
 
-/// ////////////////////////////////////////////////////////////////////////
-/// contains and contains_elem
+///////////////////////////////////////////////////////////////////////////
+// contains and contains_elem
+
 #[test]
 fn test_superset() {
     let mut e1: EnumSet<Foo> = EnumSet::new();
@@ -141,8 +143,9 @@ fn test_contains() {
     assert!(!e1.contains(&C));
 }
 
-/// ////////////////////////////////////////////////////////////////////////
-/// iter
+///////////////////////////////////////////////////////////////////////////
+// iter
+
 #[test]
 fn test_iterator() {
     let mut e1: EnumSet<Foo> = EnumSet::new();
@@ -167,8 +170,9 @@ fn test_iterator() {
     assert_eq!(elems, [A, B, C]);
 }
 
-/// ////////////////////////////////////////////////////////////////////////
-/// operators
+///////////////////////////////////////////////////////////////////////////
+// operators
+
 #[test]
 fn test_operators() {
     let mut e1: EnumSet<Foo> = EnumSet::new();
@@ -219,76 +223,13 @@ fn test_overflow() {
     #[derive(Copy, Clone)]
     #[repr(usize)]
     enum Bar {
-        V00,
-        V01,
-        V02,
-        V03,
-        V04,
-        V05,
-        V06,
-        V07,
-        V08,
-        V09,
-        V10,
-        V11,
-        V12,
-        V13,
-        V14,
-        V15,
-        V16,
-        V17,
-        V18,
-        V19,
-        V20,
-        V21,
-        V22,
-        V23,
-        V24,
-        V25,
-        V26,
-        V27,
-        V28,
-        V29,
-        V30,
-        V31,
-        V32,
-        V33,
-        V34,
-        V35,
-        V36,
-        V37,
-        V38,
-        V39,
-        V40,
-        V41,
-        V42,
-        V43,
-        V44,
-        V45,
-        V46,
-        V47,
-        V48,
-        V49,
-        V50,
-        V51,
-        V52,
-        V53,
-        V54,
-        V55,
-        V56,
-        V57,
-        V58,
-        V59,
-        V60,
-        V61,
-        V62,
-        V63,
-        V64,
-        V65,
-        V66,
-        V67,
-        V68,
-        V69,
+        V00, V01, V02, V03, V04, V05, V06, V07, V08, V09,
+        V10, V11, V12, V13, V14, V15, V16, V17, V18, V19,
+        V20, V21, V22, V23, V24, V25, V26, V27, V28, V29,
+        V30, V31, V32, V33, V34, V35, V36, V37, V38, V39,
+        V40, V41, V42, V43, V44, V45, V46, V47, V48, V49,
+        V50, V51, V52, V53, V54, V55, V56, V57, V58, V59,
+        V60, V61, V62, V63, V64, V65, V66, V67, V68, V69,
     }
 
     impl CLike for Bar {
diff --git a/src/libcollectionstest/slice.rs b/src/libcollectionstest/slice.rs
index 76d70b113f7..71416f2069f 100644
--- a/src/libcollectionstest/slice.rs
+++ b/src/libcollectionstest/slice.rs
@@ -342,7 +342,6 @@ fn test_dedup_unique() {
     v2.dedup();
     // If the boxed pointers were leaked or otherwise misused, valgrind
     // and/or rt should raise errors.
-    //
 }
 
 #[test]
@@ -355,7 +354,6 @@ fn test_dedup_shared() {
     v2.dedup();
     // If the pointers were leaked or otherwise misused, valgrind and/or
     // rt should raise errors.
-    //
 }
 
 #[test]