From c72bef364de3caf6db0a505b8c4fb5b9622f6b79 Mon Sep 17 00:00:00 2001 From: "Tom A. Wagner" Date: Mon, 14 Dec 2020 11:28:06 +0100 Subject: [PATCH] Run rustfmt on the codebase --- src/main.rs | 20 +++++++++++--------- src/view/graph_view.rs | 4 ++-- src/view/mod.rs | 2 +- src/view/pipewire_node.rs | 6 ++++-- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/main.rs b/src/main.rs index 4afc168..af00857 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,7 @@ mod view; -use glib::clone; use gio::prelude::*; +use glib::clone; use gtk::prelude::*; use std::rc::Rc; @@ -10,10 +10,9 @@ pub struct PipewireLink { pub node_from: u32, pub port_from: u32, pub node_to: u32, - pub port_to: u32 + pub port_to: u32, } - fn main() -> Result<(), Box> { gtk::init()?; let mut graphview = view::GraphView::new(); @@ -31,12 +30,15 @@ fn main() -> Result<(), Box> { graphview.add_node(0, node); graphview.add_node(1, node2); - graphview.add_link(2, PipewireLink { - node_from: 0, - port_from: 12, - node_to: 1, - port_to: 13 - }); + graphview.add_link( + 2, + PipewireLink { + node_from: 0, + port_from: 12, + node_to: 1, + port_to: 13, + }, + ); // End UI Testing let graphview = Rc::new(graphview); diff --git a/src/view/graph_view.rs b/src/view/graph_view.rs index ba6b83a..abd4d43 100644 --- a/src/view/graph_view.rs +++ b/src/view/graph_view.rs @@ -62,11 +62,11 @@ fn draw( cr.move_to( (from_alloc.x + from_alloc.width).into(), - (from_alloc.y + (from_alloc.height / 2)).into() + (from_alloc.y + (from_alloc.height / 2)).into(), ); cr.line_to( to_alloc.x.into(), - (to_alloc.y + (to_alloc.height / 2)).into() + (to_alloc.y + (to_alloc.height / 2)).into(), ); cr.stroke(); diff --git a/src/view/mod.rs b/src/view/mod.rs index 0204520..1b397df 100644 --- a/src/view/mod.rs +++ b/src/view/mod.rs @@ -1,5 +1,5 @@ mod graph_view; mod pipewire_node; +pub use graph_view::GraphView; pub use pipewire_node::PipewireNode; -pub use graph_view::GraphView; \ No newline at end of file diff --git a/src/view/pipewire_node.rs b/src/view/pipewire_node.rs index 151f134..572f6cd 100644 --- a/src/view/pipewire_node.rs +++ b/src/view/pipewire_node.rs @@ -24,12 +24,14 @@ impl PipewireNode { } pub fn add_ingoing_port(&mut self, id: u32, port: gtk::Button) { - self.widget.attach(&port, 0, (self.ingoing_ports.len() + 1) as i32, 1, 1); + self.widget + .attach(&port, 0, (self.ingoing_ports.len() + 1) as i32, 1, 1); self.ingoing_ports.insert(id, port); } pub fn add_outgoing_port(&mut self, id: u32, port: gtk::Button) { - self.widget.attach(&port, 1, (self.outgoing_ports.len() + 1) as i32, 1, 1); + self.widget + .attach(&port, 1, (self.outgoing_ports.len() + 1) as i32, 1, 1); self.outgoing_ports.insert(id, port); }