style: upgrade the rustfmt rule version to Version::Two

It's unstable at the moment, though: <rust-lang/rustfmt#3383>
yvt · Feb 7, 2020 · 979a35a · 979a35a
1 parent 8613696
commit 979a35a
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 84 deletions.
diff --git a/.rustfmt.toml b/.rustfmt.toml
@@ -1 +1,2 @@
 edition = "2018"
+version = "Two"
diff --git a/support/alt_fp/src/cmp.rs b/support/alt_fp/src/cmp.rs
@@ -62,40 +62,24 @@ pub trait FloatOrd {
 impl FloatOrd for f32 {
     #[inline]
     fn fmin(self, x: Self) -> Self {
-        if self < x {
-            self
-        } else {
-            x
-        }
+        if self < x { self } else { x }
     }
 
     #[inline]
     fn fmax(self, x: Self) -> Self {
-        if self > x {
-            self
-        } else {
-            x
-        }
+        if self > x { self } else { x }
     }
 }
 
 impl FloatOrd for f64 {
     #[inline]
     fn fmin(self, x: Self) -> Self {
-        if self < x {
-            self
-        } else {
-            x
-        }
+        if self < x { self } else { x }
     }
 
     #[inline]
     fn fmax(self, x: Self) -> Self {
-        if self > x {
-            self
-        } else {
-            x
-        }
+        if self > x { self } else { x }
     }
 }
 

diff --git a/support/cggeom/src/average.rs b/support/cggeom/src/average.rs
@@ -34,7 +34,9 @@ macro_rules! impl_int {
 }
 
 impl_float!(f32, f64);
-impl_int!(u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize);
+impl_int!(
+    u8, u16, u32, u64, u128, usize, i8, i16, i32, i64, i128, isize
+);
 
 macro_rules! impl_struct {
     ($ty:ty, {$($field:ident),*}) => {

diff --git a/support/cggeom/src/boxes.rs b/support/cggeom/src/boxes.rs
@@ -191,11 +191,7 @@ pub trait AxisAlignedBox<T>: Sized {
             self.min().element_wise_max(&other.min()),
             self.max().element_wise_min(&other.max()),
         );
-        if s.is_empty() {
-            None
-        } else {
-            Some(s)
-        }
+        if s.is_empty() { None } else { Some(s) }
     }
 
     #[inline]

diff --git a/support/cggeom/src/elementwise.rs b/support/cggeom/src/elementwise.rs
@@ -23,20 +23,12 @@ pub trait ElementWisePartialOrd {
 
 #[inline]
 fn num_min<T: BaseNum>(x: T, y: T) -> T {
-    if y < x {
-        y
-    } else {
-        x
-    }
+    if y < x { y } else { x }
 }
 
 #[inline]
 fn num_max<T: BaseNum>(x: T, y: T) -> T {
-    if y > x {
-        y
-    } else {
-        x
-    }
+    if y > x { y } else { x }
 }
 
 impl<T: BaseNum> ElementWiseOp for Point2<T> {

diff --git a/support/rope/benches/rope.rs b/support/rope/benches/rope.rs
@@ -18,11 +18,13 @@ fn bench_iter(b: &mut Bencher, count: usize) {
 
     let mut it = rope.iter();
 
-    b.iter(|| loop {
-        if let Some(e) = it.next() {
-            break e;
-        } else {
-            it = rope.iter();
+    b.iter(|| {
+        loop {
+            if let Some(e) = it.next() {
+                break e;
+            } else {
+                it = rope.iter();
+            }
         }
     });
 }

diff --git a/support/rope/src/ops.rs b/support/rope/src/ops.rs
@@ -78,11 +78,7 @@ where
 
         if let Some((c, o)) = co {
             // TODO: This is utterly inefficient
-            if c == self.end() {
-                None
-            } else {
-                Some((c, o))
-            }
+            if c == self.end() { None } else { Some((c, o)) }
         } else {
             None
         }

diff --git a/tcw3/designer/src/codegen/parser.rs b/tcw3/designer/src/codegen/parser.rs
@@ -444,7 +444,7 @@ impl Parse for CompItemOn {
                 return Err(Error::new_spanned(
                     vis,
                     "visibility specification is not allowed for `on`",
-                ))
+                ));
             }
         }
 
@@ -690,7 +690,7 @@ impl Parse for ObjInit {
                 return Err(Error::new_spanned(
                     mac,
                     "Invalid delimiter for object initialization literal",
-                ))
+                ));
             }
         };
 

diff --git a/tcw3/pal/src/macos/utils.rs b/tcw3/pal/src/macos/utils.rs
@@ -28,11 +28,7 @@ impl IdRef {
     }
 
     pub fn non_nil(self) -> Option<IdRef> {
-        if self.0 == nil {
-            None
-        } else {
-            Some(self)
-        }
+        if self.0 == nil { None } else { Some(self) }
     }
 }
 

diff --git a/tcw3/pal/src/swrast/binner.rs b/tcw3/pal/src/swrast/binner.rs
@@ -1182,11 +1182,7 @@ fn saturating_aabb_f32_to_u16(bx: Box2<f32>) -> Option<Box2<u16>> {
         max: [bx.max.x.fmax(0.0).fmin(MAX) as u16, bx.max.y.fmax(0.0).fmin(MAX) as u16],
     };
 
-    if bx.is_empty() {
-        None
-    } else {
-        Some(bx)
-    }
+    if bx.is_empty() { None } else { Some(bx) }
 }
 
 /// Given a parallelogram, construct clip planes.

diff --git a/tcw3/pal/src/swrast/utils.rs b/tcw3/pal/src/swrast/utils.rs
@@ -95,11 +95,7 @@ mod tests {
     fn test_box2_usize_union(coords: Vec<usize>) -> TestResult {
         let boxes = coords.chunks_exact(4).map(|coords| {
             let bx = box2! { min: [coords[0], coords[1]], max: [coords[2], coords[3]] };
-            if bx.is_empty() {
-                None
-            } else {
-                Some(bx)
-            }
+            if bx.is_empty() { None } else { Some(bx) }
         });
 
         let expected = boxes

diff --git a/tcw3/pal/src/windows/frameclock.rs b/tcw3/pal/src/windows/frameclock.rs
@@ -48,20 +48,22 @@ impl DisplayLink {
 
             let inner = self.inner.as_inner_ref().unwrap();
 
-            std::thread::spawn(move || loop {
-                // Suspend if the display link is requested to stop.
-                if !inner.running.load(Ordering::Relaxed) {
-                    let mut guard = inner.mutex.lock().unwrap();
-                    while !inner.running.load(Ordering::Relaxed) {
-                        guard = inner.cv.wait(guard).unwrap();
+            std::thread::spawn(move || {
+                loop {
+                    // Suspend if the display link is requested to stop.
+                    if !inner.running.load(Ordering::Relaxed) {
+                        let mut guard = inner.mutex.lock().unwrap();
+                        while !inner.running.load(Ordering::Relaxed) {
+                            guard = inner.cv.wait(guard).unwrap();
+                        }
                     }
-                }
 
-                // This is rather surprising, but actually what Firefox
-                // seems to do.
-                unsafe { DwmFlush() };
+                    // This is rather surprising, but actually what Firefox
+                    // seems to do.
+                    unsafe { DwmFlush() };
 
-                handler();
+                    handler();
+                }
             });
 
             inner

diff --git a/tcw3/src/ui/scrolling/lineset.rs b/tcw3/src/ui/scrolling/lineset.rs
@@ -1815,11 +1815,7 @@ fn line_gr_decim_excl(
 /// and below.
 fn lod_coverage(lod: u8, scale: Index) -> Index {
     debug_assert!(scale >= 0);
-    if lod > 0 {
-        scale << (lod - 1)
-    } else {
-        0
-    }
+    if lod > 0 { scale << (lod - 1) } else { 0 }
 }
 
 /// Get the smallest `lod` such that `lod_coverage(lod, scale) >= i`.

diff --git a/tcw3/src/ui/views/scrollbar.rs b/tcw3/src/ui/views/scrollbar.rs
@@ -522,11 +522,7 @@ mod tests {
     trait Transpose: Sized {
         fn t(self) -> Self;
         fn t_if(self, cond: bool) -> Self {
-            if cond {
-                self.t()
-            } else {
-                self
-            }
+            if cond { self.t() } else { self }
         }
     }