[librsvg/librsvg-2.42] Update rustfmt configuration

[Federico Mena Quintero <federico src gnome org>]

commit fa70c935c143aa8928d9336d28cb010da7e0a869
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Aug 7 15:19:02 2018 -0500

    Update rustfmt configuration

 .rustfmt.toml                      |  1 -
 rsvg_internals/src/aspect_ratio.rs |  4 ++--
 rsvg_internals/src/draw.rs         | 15 +++++++--------
 rsvg_internals/src/gradient.rs     |  3 +--
 rsvg_internals/src/marker.rs       | 36 ++++++++++++++++++------------------
 rsvg_internals/src/parsers.rs      |  3 +--
 rsvg_internals/src/pattern.rs      |  6 ++----
 rsvg_internals/src/space.rs        |  9 +++------
 rsvg_internals/src/stop.rs         |  4 ++--
 rsvg_internals/src/transform.rs    | 28 +++++++++++-----------------
 10 files changed, 47 insertions(+), 62 deletions(-)
---
diff --git a/.rustfmt.toml b/.rustfmt.toml
index 9d6f9fdd..1dabca43 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -6,7 +6,6 @@ wrap_comments = true
 tab_spaces = 4
 hard_tabs = false
 newline_style = "Unix"
-write_mode = "Overwrite"
 condense_wildcard_suffixes = false
 format_strings = true
 normalize_comments = true
diff --git a/rsvg_internals/src/aspect_ratio.rs b/rsvg_internals/src/aspect_ratio.rs
index e8b076e5..1973d5ce 100644
--- a/rsvg_internals/src/aspect_ratio.rs
+++ b/rsvg_internals/src/aspect_ratio.rs
@@ -160,8 +160,8 @@ impl AspectRatio {
                 .and_then(|ident| Align::parse_xy(ident))
         })?;
 
-        let fit =
-            p.try(|p| {
+        let fit = p
+            .try(|p| {
                 p.expect_ident()
                     .map_err(|_| ())
                     .and_then(|ident| FitMode::parse(ident))
diff --git a/rsvg_internals/src/draw.rs b/rsvg_internals/src/draw.rs
index 5e74b144..8ff69b5e 100644
--- a/rsvg_internals/src/draw.rs
+++ b/rsvg_internals/src/draw.rs
@@ -232,14 +232,13 @@ pub fn draw_pango_layout(
     if clipping {
         need_layout_path = true;
     } else {
-        need_layout_path = stroke.is_some()
-            && paint_server::_set_source_rsvg_paint_server(
-                draw_ctx,
-                stroke.unwrap(),
-                state::get_stroke_opacity(state),
-                &bbox,
-                state::get_current_color(state),
-            );
+        need_layout_path = stroke.is_some() && paint_server::_set_source_rsvg_paint_server(
+            draw_ctx,
+            stroke.unwrap(),
+            state::get_stroke_opacity(state),
+            &bbox,
+            state::get_current_color(state),
+        );
     }
 
     if need_layout_path {
diff --git a/rsvg_internals/src/gradient.rs b/rsvg_internals/src/gradient.rs
index 21db32fe..17713479 100644
--- a/rsvg_internals/src/gradient.rs
+++ b/rsvg_internals/src/gradient.rs
@@ -374,8 +374,7 @@ fn resolve_gradient(gradient: &Gradient, draw_ctx: *mut RsvgDrawingCtx) -> Gradi
                     result.resolve_from_fallback(&fallback_grad)
                 });
                 Some(())
-            })
-            .or_else(|| {
+            }).or_else(|| {
                 result.resolve_from_defaults();
                 Some(())
             });
diff --git a/rsvg_internals/src/marker.rs b/rsvg_internals/src/marker.rs
index 92523824..afdd9ac2 100644
--- a/rsvg_internals/src/marker.rs
+++ b/rsvg_internals/src/marker.rs
@@ -1151,30 +1151,30 @@ mod directionality_tests {
 
     #[test]
     fn curve_has_directionality() {
-        let (v1x, v1y, v2x, v2y) = super::get_segment_directionalities(&curve(
-            1.0, 2.0, 3.0, 5.0, 8.0, 13.0, 20.0, 33.0,
-        )).unwrap();
+        let (v1x, v1y, v2x, v2y) =
+            super::get_segment_directionalities(&curve(1.0, 2.0, 3.0, 5.0, 8.0, 13.0, 20.0, 33.0))
+                .unwrap();
         assert_eq!((2.0, 3.0), (v1x, v1y));
         assert_eq!((12.0, 20.0), (v2x, v2y));
     }
 
     #[test]
     fn curves_with_loops_and_coincident_ends_have_directionality() {
-        let (v1x, v1y, v2x, v2y) = super::get_segment_directionalities(&curve(
-            1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 1.0, 2.0,
-        )).unwrap();
+        let (v1x, v1y, v2x, v2y) =
+            super::get_segment_directionalities(&curve(1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 1.0, 2.0))
+                .unwrap();
         assert_eq!((2.0, 2.0), (v1x, v1y));
         assert_eq!((-4.0, -4.0), (v2x, v2y));
 
-        let (v1x, v1y, v2x, v2y) = super::get_segment_directionalities(&curve(
-            1.0, 2.0, 1.0, 2.0, 3.0, 4.0, 1.0, 2.0,
-        )).unwrap();
+        let (v1x, v1y, v2x, v2y) =
+            super::get_segment_directionalities(&curve(1.0, 2.0, 1.0, 2.0, 3.0, 4.0, 1.0, 2.0))
+                .unwrap();
         assert_eq!((2.0, 2.0), (v1x, v1y));
         assert_eq!((-2.0, -2.0), (v2x, v2y));
 
-        let (v1x, v1y, v2x, v2y) = super::get_segment_directionalities(&curve(
-            1.0, 2.0, 3.0, 4.0, 1.0, 2.0, 1.0, 2.0,
-        )).unwrap();
+        let (v1x, v1y, v2x, v2y) =
+            super::get_segment_directionalities(&curve(1.0, 2.0, 3.0, 4.0, 1.0, 2.0, 1.0, 2.0))
+                .unwrap();
         assert_eq!((2.0, 2.0), (v1x, v1y));
         assert_eq!((-2.0, -2.0), (v2x, v2y));
     }
@@ -1189,18 +1189,18 @@ mod directionality_tests {
 
     #[test]
     fn curve_with_123_coincident_has_directionality() {
-        let (v1x, v1y, v2x, v2y) = super::get_segment_directionalities(&curve(
-            0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 20.0, 40.0,
-        )).unwrap();
+        let (v1x, v1y, v2x, v2y) =
+            super::get_segment_directionalities(&curve(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 20.0, 40.0))
+                .unwrap();
         assert_eq!((20.0, 40.0), (v1x, v1y));
         assert_eq!((20.0, 40.0), (v2x, v2y));
     }
 
     #[test]
     fn curve_with_234_coincident_has_directionality() {
-        let (v1x, v1y, v2x, v2y) = super::get_segment_directionalities(&curve(
-            20.0, 40.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0,
-        )).unwrap();
+        let (v1x, v1y, v2x, v2y) =
+            super::get_segment_directionalities(&curve(20.0, 40.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0))
+                .unwrap();
 
         assert_eq!((-20.0, -40.0), (v1x, v1y));
         assert_eq!((-20.0, -40.0), (v2x, v2y));
diff --git a/rsvg_internals/src/parsers.rs b/rsvg_internals/src/parsers.rs
index 2f081add..6890cbc4 100644
--- a/rsvg_internals/src/parsers.rs
+++ b/rsvg_internals/src/parsers.rs
@@ -61,8 +61,7 @@ where
             } else {
                 Ok(v)
             }
-        })
-        .map_err(|e| NodeError::attribute_error(key, e))
+        }).map_err(|e| NodeError::attribute_error(key, e))
 }
 
 // angle:
diff --git a/rsvg_internals/src/pattern.rs b/rsvg_internals/src/pattern.rs
index 92e507ac..02c49bb8 100644
--- a/rsvg_internals/src/pattern.rs
+++ b/rsvg_internals/src/pattern.rs
@@ -243,14 +243,12 @@ fn resolve_pattern(pattern: &Pattern, draw_ctx: *mut RsvgDrawingCtx) -> Pattern
             .as_ref()
             .and_then(|fallback_name| {
                 drawing_ctx::get_acquired_node_of_type(draw_ctx, &fallback_name, NodeType::Pattern)
-            })
-            .and_then(|acquired| {
+            }).and_then(|acquired| {
                 acquired.get().with_impl(|i: &NodePattern| {
                     result.resolve_from_fallback(&*i.pattern.borrow())
                 });
                 Some(())
-            })
-            .or_else(|| {
+            }).or_else(|| {
                 result.resolve_from_defaults();
                 Some(())
             });
diff --git a/rsvg_internals/src/space.rs b/rsvg_internals/src/space.rs
index 4d59bab8..a193cbfa 100644
--- a/rsvg_internals/src/space.rs
+++ b/rsvg_internals/src/space.rs
@@ -37,12 +37,10 @@ fn normalize_default(s: &str) -> String {
         .map(|ch| match ch {
             '\t' => ' ',
             c => c,
-        })
-        .coalesce(|current, next| match (current, next) {
+        }).coalesce(|current, next| match (current, next) {
             (' ', ' ') => Ok(' '),
             (_, _) => Err((current, next)),
-        })
-        .collect::<String>()
+        }).collect::<String>()
 }
 
 // From https://www.w3.org/TR/SVG/text.html#WhiteSpace
@@ -61,8 +59,7 @@ fn normalize_preserve(s: &str) -> String {
             '\n' | '\t' => ' ',
 
             c => c,
-        })
-        .collect()
+        }).collect()
 }
 
 #[no_mangle]
diff --git a/rsvg_internals/src/stop.rs b/rsvg_internals/src/stop.rs
index abe287a4..87cdd155 100644
--- a/rsvg_internals/src/stop.rs
+++ b/rsvg_internals/src/stop.rs
@@ -105,8 +105,8 @@ impl NodeTrait for NodeStop {
 
         let mut color_rgba: cssparser::RGBA;
 
-        let stop_color =
-            state::get_stop_color(state).map_err(|e| NodeError::attribute_error("stop-color", e))?;
+        let stop_color = state::get_stop_color(state)
+            .map_err(|e| NodeError::attribute_error("stop-color", e))?;
 
         match stop_color {
             None => color_rgba = cssparser::RGBA::transparent(),
diff --git a/rsvg_internals/src/transform.rs b/rsvg_internals/src/transform.rs
index 30d216f5..e7c4a08a 100644
--- a/rsvg_internals/src/transform.rs
+++ b/rsvg_internals/src/transform.rs
@@ -109,8 +109,7 @@ fn parse_matrix_args(parser: &mut Parser) -> Result<cairo::Matrix, AttributeErro
             let y0 = f64::from(p.expect_number()?);
 
             Ok(cairo::Matrix::new(xx, yx, xy, yy, x0, y0))
-        })
-        .map_err(CssParseError::<()>::basic)
+        }).map_err(CssParseError::<()>::basic)
         .map_err(AttributeError::from)
 }
 
@@ -127,8 +126,7 @@ fn parse_translate_args(parser: &mut Parser) -> Result<cairo::Matrix, AttributeE
             );
 
             Ok(cairo::Matrix::new(1.0, 0.0, 0.0, 1.0, tx, ty))
-        })
-        .map_err(CssParseError::<()>::basic)
+        }).map_err(CssParseError::<()>::basic)
         .map_err(AttributeError::from)
 }
 
@@ -137,16 +135,15 @@ fn parse_scale_args(parser: &mut Parser) -> Result<cairo::Matrix, AttributeError
         .parse_nested_block(|p| {
             let x = f64::from(p.expect_number()?);
 
-            let y =
-                p.try(|p| -> Result<f32, CssParseError<()>> {
+            let y = p
+                .try(|p| -> Result<f32, CssParseError<()>> {
                     optional_comma(p);
                     Ok(p.expect_number()?)
                 }).map(f64::from)
-                    .unwrap_or(x);
+                .unwrap_or(x);
 
             Ok(cairo::Matrix::new(x, 0.0, 0.0, y, 0.0, 0.0))
-        })
-        .map_err(CssParseError::<()>::basic)
+        }).map_err(CssParseError::<()>::basic)
         .map_err(AttributeError::from)
 }
 
@@ -156,8 +153,8 @@ fn parse_rotate_args(parser: &mut Parser) -> Result<cairo::Matrix, AttributeErro
             let angle = f64::from(p.expect_number()?) * PI / 180.0;
             let (s, c) = angle.sin_cos();
 
-            let (tx, ty) =
-                p.try(|p| -> Result<_, CssParseError<()>> {
+            let (tx, ty) = p
+                .try(|p| -> Result<_, CssParseError<()>> {
                     optional_comma(p);
                     let tx = f64::from(p.expect_number()?);
 
@@ -172,8 +169,7 @@ fn parse_rotate_args(parser: &mut Parser) -> Result<cairo::Matrix, AttributeErro
             m = cairo::Matrix::multiply(&cairo::Matrix::new(c, s, -s, c, 0.0, 0.0), &m);
             m = cairo::Matrix::multiply(&cairo::Matrix::new(1.0, 0.0, 0.0, 1.0, -tx, -ty), &m);
             Ok(m)
-        })
-        .map_err(CssParseError::<()>::basic)
+        }).map_err(CssParseError::<()>::basic)
         .map_err(AttributeError::from)
 }
 
@@ -182,8 +178,7 @@ fn parse_skewx_args(parser: &mut Parser) -> Result<cairo::Matrix, AttributeError
         .parse_nested_block(|p| {
             let a = f64::from(p.expect_number()?) * PI / 180.0;
             Ok(cairo::Matrix::new(1.0, 0.0, a.tan(), 1.0, 0.0, 0.0))
-        })
-        .map_err(CssParseError::<()>::basic)
+        }).map_err(CssParseError::<()>::basic)
         .map_err(AttributeError::from)
 }
 
@@ -192,8 +187,7 @@ fn parse_skewy_args(parser: &mut Parser) -> Result<cairo::Matrix, AttributeError
         .parse_nested_block(|p| {
             let a = f64::from(p.expect_number()?) * PI / 180.0;
             Ok(cairo::Matrix::new(1.0, a.tan(), 0.0, 1.0, 0.0, 0.0))
-        })
-        .map_err(CssParseError::<()>::basic)
+        }).map_err(CssParseError::<()>::basic)
         .map_err(AttributeError::from)
 }