use self

examples/dashboard/src/widgets/map.rs

@@ -108,7 +108,7 @@ impl Map {
         if let Some(controller) = controller.into() {
             controller.bind(channel.clone());
         }
-        Map {
+        Self {
             channel,
             camera: camera.clone(),
         }
@@ -209,7 +209,7 @@ impl MapState {
         channel: Channel<MapCommand>,
         sender: Sender<MapCommand>,
     ) -> Self {
-        MapState {
+        Self {
             texture,
             channel,
             sender,
@@ -245,7 +245,7 @@ unsafe impl Send for RenderMap {}
 
 impl RenderMap {
     pub fn new(receiver: Receiver<MapCommand>) -> Self {
-        RenderMap {
+        Self {
             receiver,
             map: None,
             last_size: None,

examples/dashboard/src/widgets/metrics.rs

@@ -38,7 +38,7 @@ impl Metric {
         color: impl Into<Color>,
         value: f32,
     ) -> Self {
-        Metric {
+        Self {
             level,
             suffix: suffix.as_ref().to_string(),
             description: description.as_ref().to_string(),
@@ -124,7 +124,7 @@ struct MetricState {
 
 impl MetricState {
     pub fn new(level: i32, value: f32) -> Self {
-        MetricState {
+        Self {
             animation: None,
             level: Tween::new(0, level),
             value: Tween::new(0.0, value),
@@ -149,7 +149,7 @@ pub struct Metrics {}
 
 impl Metrics {
     pub fn new() -> Self {
-        Metrics {}
+        Self {}
     }
 }
 

examples/dashboard/src/widgets/navigation.rs

@@ -31,7 +31,7 @@ pub struct Navigation {}
 
 impl Navigation {
     pub fn new() -> Self {
-        Navigation {}
+        Self {}
     }
 }
 
@@ -68,7 +68,7 @@ struct NavigationState {
 
 impl NavigationState {
     pub fn new() -> Self {
-        NavigationState {
+        Self {
             map: MapController::new(),
         }
     }

examples/dashboard/src/widgets/sensors.rs

@@ -28,7 +28,7 @@ pub struct Sensor {
 
 impl Sensor {
     pub fn new(level: f32) -> Self {
-        Sensor { level }
+        Self { level }
     }
 }
 
@@ -81,7 +81,7 @@ struct SensorState {
 
 impl SensorState {
     pub fn new() -> Self {
-        SensorState { animation: None }
+        Self { animation: None }
     }
 
     pub fn animation(&self) -> Option<f32> {
@@ -94,7 +94,7 @@ pub struct Sensors {}
 
 impl Sensors {
     pub fn new() -> Self {
-        Sensors {}
+        Self {}
     }
 
     fn build_sensor_data(&self, title: impl AsRef<str>) -> impl Widget {

examples/dashboard/src/widgets/sidebar.rs

@@ -34,7 +34,7 @@ pub struct Sidebar {}
 
 impl Sidebar {
     pub fn new() -> Self {
-        Sidebar {}
+        Self {}
     }
 
     fn build_button(
@@ -151,7 +151,7 @@ struct SidebarState {
 
 impl SidebarState {
     pub fn new() -> Self {
-        SidebarState {
+        Self {
             selected_button: Button::Earth,
         }
     }

examples/dashboard/src/widgets/topbar.rs

@@ -41,7 +41,7 @@ impl Tab {
         title: impl AsRef<str>,
         selected: bool,
     ) -> Self {
-        Tab {
+        Self {
             title: title.as_ref().to_string(),
             selected,
         }
@@ -151,7 +151,7 @@ struct TabState {
 
 impl TabState {
     pub fn new(selected: bool) -> Self {
-        TabState {
+        Self {
             animation: None,
             selected,
         }
@@ -167,7 +167,7 @@ pub struct Topbar {}
 
 impl Topbar {
     pub fn new() -> Self {
-        Topbar {}
+        Self {}
     }
 
     fn build_tab(
@@ -273,7 +273,7 @@ struct TopbarState {
 
 impl TopbarState {
     pub fn new() -> Self {
-        TopbarState {
+        Self {
             selected_button: Button::RealTime,
         }
     }

terramach/graphics/src/gl/android_context.rs

@@ -71,7 +71,7 @@ impl Context {
 
     pub fn new_shared(&mut self) -> Self {
         let config = egl::android_choose_config(self.inner.display);
-        Context {
+        Self {
             inner: Rc::new(EGLContext {
                 owner: true,
                 context: egl::android_new_context(self.inner.display, config),
@@ -100,7 +100,7 @@ impl Context {
 
 impl Clone for Context {
     fn clone(&self) -> Self {
-        Context {
+        Self {
             inner: self.inner.clone(),
             guard: None,
         }
@@ -126,7 +126,7 @@ impl ContextGuard {
             context.inner.context,
         );
         debug_assert!(result);
-        ContextGuard {
+        Self {
             current_context,
             current_read_surface,
             current_draw_surface,

terramach/graphics/src/gl/mac_context.rs

@@ -102,7 +102,7 @@ impl Context {
 
 impl Clone for Context {
     fn clone(&self) -> Self {
-        Context {
+        Self {
             inner: self.inner.clone(),
             guard: None,
         }

terramach/ui/animation.rs

@@ -64,7 +64,7 @@ impl<T> Animation<T> {
             D: 'static + Driver,
             A: 'static + Animated<T>,
     {
-        Animation {
+        Self {
             driver: Box::new(driver),
             animated: Box::new(animated),
             interpolation: None,
@@ -115,7 +115,7 @@ pub struct DurationDriver {
 
 impl DurationDriver {
     pub fn new(duration: Duration) -> Self {
-        DurationDriver {
+        Self {
             timestamp: None,
             value: 0.0,
             duration,
@@ -167,7 +167,7 @@ pub struct Tween<T: Animated<T>> {
 
 impl<T: Animated<T>> Tween<T> {
     pub fn new(begin: impl Into<T>, end: impl Into<T>) -> Self {
-        Tween {
+        Self {
             begin: begin.into(),
             end: end.into(),
         }
@@ -188,7 +188,7 @@ impl<T: Animated<T>> Animated<T> for Tween<T> {
 
 impl<T: Animated<T>> From<(T, T)> for Tween<T> {
     fn from(values: (T, T)) -> Self {
-        Tween::new(values.0, values.1)
+        Self::new(values.0, values.1)
     }
 }
 

terramach/ui/common/index_pool.rs

@@ -24,7 +24,7 @@ pub struct IndexPool {
 
 impl IndexPool {
     pub fn new() -> Self {
-        IndexPool {
+        Self {
             current_index: 0,
             free_indexes: Vec::new(),
         }

terramach/ui/common/tree.rs

@@ -31,7 +31,7 @@ struct Node<T> {
 
 impl<T> Node<T> {
     pub fn new(id: Id, data: impl Into<Option<T>>) -> Self {
-        Node {
+        Self {
             id,
             inner: data.into(),
         }
@@ -75,7 +75,7 @@ impl<T> Tree<T> {
         let root = indices.take();
         let mut nodes = HashMap::new();
         nodes.insert(root, Node::new(root, None));
-        Tree {
+        Self {
             ids: indices,
             root,
             nodes,

terramach/ui/event.rs

@@ -59,7 +59,7 @@ pub struct EventContext {
 
 impl EventContext {
     pub fn new(event: Event) -> Self {
-        EventContext {
+        Self {
             need_layout: false,
             need_paint: false,
             need_build: false,
@@ -122,7 +122,7 @@ pub type AppEvents = Events<AppEvent>;
 
 impl Default for AppEvents {
     fn default() -> Self {
-        AppEvents::new()
+        Self::new()
     }
 }
 
@@ -135,7 +135,7 @@ pub struct Events<T> {
 
 impl<T> Events<T> {
     pub fn new() -> Self {
-        Events {
+        Self {
             queue: Default::default(),
         }
     }

terramach/ui/gesture.rs

@@ -41,7 +41,7 @@ pub struct TapGesture {
 
 impl TapGesture {
     pub fn new(touches_count: usize, tap_count: usize) -> Self {
-        TapGesture {
+        Self {
             touches_count,
             tap_count,
             start_touches_count: 0,
@@ -82,13 +82,13 @@ impl TapGesture {
 
 impl Default for TapGesture {
     fn default() -> Self {
-        TapGesture::new(1, 1)
+        Self::new(1, 1)
     }
 }
 
 impl Clone for TapGesture {
     fn clone(&self) -> Self {
-        TapGesture::new(self.touches_count, self.tap_count)
+        Self::new(self.touches_count, self.tap_count)
     }
 }
 
@@ -109,7 +109,7 @@ pub struct PanGesture {
 
 impl PanGesture {
     pub fn new(minimum_touches: usize, maximum_touches: usize) -> Self {
-        PanGesture {
+        Self {
             minimum_touches,
             maximum_touches,
             start_location: None,
@@ -118,7 +118,7 @@ impl PanGesture {
     }
 
     pub fn limit(touches_count: usize) -> Self {
-        PanGesture::new(touches_count, touches_count)
+        Self::new(touches_count, touches_count)
     }
 
     pub fn is_active(&self) -> bool {
@@ -172,13 +172,13 @@ impl PanGesture {
 
 impl Default for PanGesture {
     fn default() -> Self {
-        PanGesture::new(1, 10)
+        Self::new(1, 10)
     }
 }
 
 impl Clone for PanGesture {
     fn clone(&self) -> Self {
-        PanGesture::new(self.minimum_touches, self.maximum_touches)
+        Self::new(self.minimum_touches, self.maximum_touches)
     }
 }
 
@@ -222,7 +222,7 @@ pub struct PinchGesture {
 
 impl PinchGesture {
     pub fn new() -> Self {
-        PinchGesture {
+        Self {
             state: PinchGestureState::Possible,
             start_distance: None,
             center_location: None,
@@ -304,12 +304,12 @@ impl PinchGesture {
 
 impl Default for PinchGesture {
     fn default() -> Self {
-        PinchGesture::new()
+        Self::new()
     }
 }
 
 impl Clone for PinchGesture {
     fn clone(&self) -> Self {
-        PinchGesture::new()
+        Self::new()
     }
 }

terramach/ui/gpu/frame.rs

@@ -27,7 +27,7 @@ pub struct Frame {
 
 impl Frame {
     pub fn new(layers: &LayerTree) -> Self {
-        Frame {
+        Self {
             layers: layers.clone(),
         }
     }

terramach/ui/gpu/gl_texture.rs

@@ -34,7 +34,7 @@ impl<'a> RenderContext<'a> {
         gl: &'a mut gl::Gl,
         size: ISize,
     ) -> Self {
-        RenderContext {
+        Self {
             gl,
             size,
         }
@@ -67,7 +67,7 @@ impl<'a> PrerollContext<'a> {
         texture: TextureId,
         size: ISize,
     ) -> Self {
-        PrerollContext {
+        Self {
             pixel_ratio,
             pipeline,
             gl,
@@ -150,7 +150,7 @@ impl Texture {
             gl::BindFramebuffer(gl::FRAMEBUFFER, frame_buffer);
             gl::FramebufferTexture2D(gl::FRAMEBUFFER, gl::COLOR_ATTACHMENT0, gl::TEXTURE_2D, texture, 0);
         }
-        Texture {
+        Self {
             gl,
             gl_context,
             frame_buffer,