[librsvg] rustfmt
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] rustfmt
- Date: Wed, 16 May 2018 20:25:04 +0000 (UTC)
commit 0fa7cdca56a0b8c8dcf35a9188543a44917a189c
Author: Federico Mena Quintero <federico gnome org>
Date: Wed May 16 15:24:31 2018 -0500
rustfmt
rsvg_internals/src/float_eq_cairo.rs | 11 +++++++----
rsvg_internals/src/lib.rs | 2 +-
rsvg_internals/src/rect.rs | 4 ++--
3 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/rsvg_internals/src/float_eq_cairo.rs b/rsvg_internals/src/float_eq_cairo.rs
index 09351149..4d6f19f6 100644
--- a/rsvg_internals/src/float_eq_cairo.rs
+++ b/rsvg_internals/src/float_eq_cairo.rs
@@ -66,17 +66,20 @@ impl ApproxEqCairo for f64 {
// Macro for usage in unit tests
#[macro_export]
macro_rules! assert_approx_eq_cairo {
- ($left:expr, $right:expr) => ({
+ ($left:expr, $right:expr) => {{
match (&$left, &$right) {
(l, r) => {
if !l.approx_eq_cairo(r) {
- panic!(r#"assertion failed: `(left == right)`
+ panic!(
+ r#"assertion failed: `(left == right)`
left: `{:?}`,
- right: `{:?}`"#, l, r)
+ right: `{:?}`"#,
+ l, r
+ )
}
}
}
- });
+ }};
}
#[cfg(test)]
diff --git a/rsvg_internals/src/lib.rs b/rsvg_internals/src/lib.rs
index fc0334d0..6a9fea57 100644
--- a/rsvg_internals/src/lib.rs
+++ b/rsvg_internals/src/lib.rs
@@ -188,12 +188,12 @@ mod path_builder;
mod path_parser;
mod pattern;
mod property_bag;
+mod rect;
mod shapes;
mod space;
mod state;
mod stop;
mod structure;
-mod rect;
mod text;
mod transform;
mod unitinterval;
diff --git a/rsvg_internals/src/rect.rs b/rsvg_internals/src/rect.rs
index 76e5a041..284e2b43 100644
--- a/rsvg_internals/src/rect.rs
+++ b/rsvg_internals/src/rect.rs
@@ -93,8 +93,8 @@ pub fn outer(r: &cairo::Rectangle) -> cairo::Rectangle {
let (x, y) = (r.x.floor(), r.y.floor());
cairo::Rectangle {
- x: x,
- y: y,
+ x,
+ y,
width: (r.x + r.width).ceil() - x,
height: (r.y + r.height).ceil() - y,
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]