From 5696afcadd5b3b89a532f4205efac30d8a24d558 Mon Sep 17 00:00:00 2001 From: Malte Veerman Date: Wed, 11 Dec 2019 22:13:29 +0100 Subject: [PATCH] Ran cargo_fmt over changed files. --- native/src/widget/icon.rs | 21 ++++++------- src/native.rs | 4 +-- wgpu/src/renderer.rs | 12 +++---- wgpu/src/renderer/widget/icon.rs | 12 ++----- wgpu/src/svg.rs | 54 ++++++++++++++++++-------------- wgpu/src/text/font.rs | 5 +-- 6 files changed, 53 insertions(+), 55 deletions(-) diff --git a/native/src/widget/icon.rs b/native/src/widget/icon.rs index 4687d7e623..b3906ccfc2 100644 --- a/native/src/widget/icon.rs +++ b/native/src/widget/icon.rs @@ -1,8 +1,12 @@ //! Display an icon. -use crate::{layout, Element, Hasher, Layout, Length, Point, Rectangle, Widget}; +use crate::{ + layout, Element, Hasher, Layout, Length, Point, Rectangle, Widget, +}; -use std::hash::Hash; -use std::path::{Path, PathBuf}; +use std::{ + hash::Hash, + path::{Path, PathBuf}, +}; /// A simple icon_loader widget. #[derive(Debug, Clone)] @@ -63,10 +67,7 @@ where ) -> Renderer::Output { let bounds = layout.bounds(); - renderer.draw( - bounds, - self.path.as_path(), - ) + renderer.draw(bounds, self.path.as_path()) } fn hash_layout(&self, state: &mut Hasher) { @@ -86,11 +87,7 @@ pub trait Renderer: crate::Renderer { /// Draws an [`Icon`]. /// /// [`Icon`]: struct.Icon.html - fn draw( - &mut self, - bounds: Rectangle, - path: &Path, - ) -> Self::Output; + fn draw(&mut self, bounds: Rectangle, path: &Path) -> Self::Output; } impl<'a, Message, Renderer> From for Element<'a, Message, Renderer> diff --git a/src/native.rs b/src/native.rs index b24518a2a6..e52b63d3e0 100644 --- a/src/native.rs +++ b/src/native.rs @@ -89,8 +89,8 @@ pub mod widget { #[doc(no_inline)] pub use { - button::Button, icon::Icon, image::Image, scrollable::Scrollable, slider::Slider, - text_input::TextInput, + button::Button, icon::Icon, image::Image, scrollable::Scrollable, + slider::Slider, text_input::TextInput, }; /// A container that distributes its contents vertically. diff --git a/wgpu/src/renderer.rs b/wgpu/src/renderer.rs index 9895e1c4f8..92e249337d 100644 --- a/wgpu/src/renderer.rs +++ b/wgpu/src/renderer.rs @@ -243,13 +243,11 @@ impl Renderer { scale: [bounds.width, bounds.height], }); } - Primitive::Svg { handle, bounds } => { - layer.svgs.push(Svg { - handle: handle.clone(), - position: [bounds.x, bounds.y], - scale: [bounds.width, bounds.height], - }) - }, + Primitive::Svg { handle, bounds } => layer.svgs.push(Svg { + handle: handle.clone(), + position: [bounds.x, bounds.y], + scale: [bounds.width, bounds.height], + }), Primitive::Clip { bounds, offset, diff --git a/wgpu/src/renderer/widget/icon.rs b/wgpu/src/renderer/widget/icon.rs index a271bb4717..652e57a372 100644 --- a/wgpu/src/renderer/widget/icon.rs +++ b/wgpu/src/renderer/widget/icon.rs @@ -1,15 +1,9 @@ use crate::{svg::Handle, Primitive, Renderer}; -use iced_native::{ - icon, MouseCursor, Rectangle, -}; +use iced_native::{icon, MouseCursor, Rectangle}; use std::path::Path; impl icon::Renderer for Renderer { - fn draw( - &mut self, - bounds: Rectangle, - path: &Path, - ) -> Self::Output { + fn draw(&mut self, bounds: Rectangle, path: &Path) -> Self::Output { ( Primitive::Svg { handle: Handle::from_path(path), @@ -18,4 +12,4 @@ impl icon::Renderer for Renderer { MouseCursor::OutOfBounds, ) } -} \ No newline at end of file +} diff --git a/wgpu/src/svg.rs b/wgpu/src/svg.rs index 1b8f14b074..755303a591 100644 --- a/wgpu/src/svg.rs +++ b/wgpu/src/svg.rs @@ -12,7 +12,6 @@ use std::{ u32, }; - #[derive(Debug)] pub struct Pipeline { cache: RefCell, @@ -220,10 +219,11 @@ impl Pipeline { opt.usvg.dpi = handle.dpi as f64; opt.usvg.font_size = handle.font_size as f64; - let mem = match resvg::usvg::Tree::from_file(&handle.path, &opt.usvg) { - Ok(tree) => Memory::Host { tree }, - Err(_) => Memory::Invalid - }; + let mem = + match resvg::usvg::Tree::from_file(&handle.path, &opt.usvg) { + Ok(tree) => Memory::Host { tree }, + Err(_) => Memory::Invalid, + }; let _ = self.cache.borrow_mut().insert(&handle, mem); } @@ -265,12 +265,14 @@ impl Pipeline { self.load(&handle); - if let Some(texture) = self - .cache - .borrow_mut() - .get(&handle) - .unwrap() - .upload(device, encoder, &self.texture_layout, svg.scale[0] as u32, svg.scale[1] as u32) + if let Some(texture) = + self.cache.borrow_mut().get(&handle).unwrap().upload( + device, + encoder, + &self.texture_layout, + svg.scale[0] as u32, + svg.scale[1] as u32, + ) { let instance_buffer = device .create_buffer_mapped(1, wgpu::BufferUsage::COPY_SRC) @@ -409,12 +411,8 @@ impl Hash for Handle { } enum Memory { - Host { - tree: resvg::usvg::Tree, - }, - Device { - bind_group: Rc, - }, + Host { tree: resvg::usvg::Tree }, + Device { bind_group: Rc }, NotFound, Invalid, } @@ -426,7 +424,7 @@ impl Memory { encoder: &mut wgpu::CommandEncoder, texture_layout: &wgpu::BindGroupLayout, width: u32, - height: u32 + height: u32, ) -> Option> { match self { Memory::Host { tree } => { @@ -447,10 +445,17 @@ impl Memory { | wgpu::TextureUsage::SAMPLED, }); - let mut canvas = resvg::raqote::DrawTarget::new(width as i32, height as i32); + let mut canvas = + resvg::raqote::DrawTarget::new(width as i32, height as i32); let opt = resvg::Options::default(); - let screen_size = resvg::ScreenSize::new(width, height).unwrap(); - resvg::backend_raqote::render_to_canvas(tree, &opt, screen_size, &mut canvas); + let screen_size = + resvg::ScreenSize::new(width, height).unwrap(); + resvg::backend_raqote::render_to_canvas( + tree, + &opt, + screen_size, + &mut canvas, + ); let slice = canvas.get_data(); let temp_buf = device .create_buffer_mapped( @@ -506,7 +511,10 @@ impl Memory { } impl Debug for Memory { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> { + fn fmt( + &self, + f: &mut std::fmt::Formatter<'_>, + ) -> Result<(), std::fmt::Error> { match self { Memory::Host { .. } => write!(f, "Memory::Host"), Memory::Device { .. } => write!(f, "Memory::Device"), @@ -593,4 +601,4 @@ struct Instance { #[derive(Debug, Clone, Copy)] struct Uniforms { transform: [f32; 16], -} \ No newline at end of file +} diff --git a/wgpu/src/text/font.rs b/wgpu/src/text/font.rs index 31df5bf404..7346ccdb45 100644 --- a/wgpu/src/text/font.rs +++ b/wgpu/src/text/font.rs @@ -1,5 +1,6 @@ -pub use font_kit::error::SelectionError as LoadError; -pub use font_kit::family_name::FamilyName as Family; +pub use font_kit::{ + error::SelectionError as LoadError, family_name::FamilyName as Family, +}; pub struct Source { raw: font_kit::source::SystemSource,