Merge pull request #323 from MaxVerevkin/remove-unnecessary-result

remove unnecessary Result in `CompositorState::create_surface`

Author: wash2

examples/generic_simple_window.rs

@@ -66,7 +66,7 @@ fn main() {
     .expect("Failed to create pool");
     simple_window.pool = Some(pool);
 
-    let surface = simple_window.compositor_state.create_surface(&qh).unwrap();
+    let surface = simple_window.compositor_state.create_surface(&qh);
 
     let window = Window::builder()
         .title("A wayland window")

examples/image_viewer.rs

@@ -58,7 +58,7 @@ fn main() {
         // We'll need the image in RGBA for drawing it
         let image = image.to_rgba8();
 
-        let surface = state.compositor_state.create_surface(&qh).unwrap();
+        let surface = state.compositor_state.create_surface(&qh);
 
         pool_size += image.width() * image.height() * 4;
 

examples/image_viewporter.rs

@@ -60,7 +60,7 @@ fn main() {
         // We'll need the image in RGBA for drawing it
         let image = image.to_rgba8();
 
-        let surface = state.compositor_state.create_surface(&qh).unwrap();
+        let surface = state.compositor_state.create_surface(&qh);
 
         pool_size += image.width() * image.height() * 4;
 

examples/pointer_theme_window.rs

@@ -48,8 +48,8 @@ fn main() {
     let pool = SlotPool::new(width as usize * height as usize * 4, &shm_state)
         .expect("Failed to create pool");
 
-    let window_surface = compositor_state.create_surface(&qh).unwrap();
-    let pointer_surface = compositor_state.create_surface(&qh).unwrap();
+    let window_surface = compositor_state.create_surface(&qh);
+    let pointer_surface = compositor_state.create_surface(&qh);
 
     let window = Window::builder()
         .title("A wayland window")

examples/simple_layer.rs

@@ -62,14 +62,14 @@ fn main() {
     .expect("Failed to create pool");
     simple_layer.pool = Some(pool);
 
-    let surface = simple_layer.compositor_state.create_surface(&qh).unwrap();
+    let surface = simple_layer.compositor_state.create_surface(&qh);
 
     let layer = LayerSurface::builder()
         .size((256, 256))
         .anchor(Anchor::BOTTOM)
         .keyboard_interactivity(KeyboardInteractivity::OnDemand)
         .namespace("sample_layer")
-        .map(&qh, &mut simple_layer.layer_state, surface, Layer::Top)
+        .map(&qh, &simple_layer.layer_state, surface, Layer::Top)
         .expect("layer surface creation");
 
     simple_layer.layer = Some(layer);

examples/simple_window.rs

@@ -72,7 +72,7 @@ fn main() {
     .expect("Failed to create pool");
     simple_window.pool = Some(pool);
 
-    let surface = simple_window.compositor_state.create_surface(&qh).unwrap();
+    let surface = simple_window.compositor_state.create_surface(&qh);
 
     let window = Window::builder()
         .title("A wayland window")

src/compositor.rs

@@ -69,10 +69,7 @@ impl CompositorState {
         &self.wl_compositor
     }
 
-    pub fn create_surface<D>(
-        &self,
-        qh: &QueueHandle<D>,
-    ) -> Result<wl_surface::WlSurface, GlobalError>
+    pub fn create_surface<D>(&self, qh: &QueueHandle<D>) -> wl_surface::WlSurface
     where
         D: Dispatch<wl_surface::WlSurface, SurfaceData> + 'static,
     {
@@ -83,14 +80,12 @@ impl CompositorState {
         &self,
         qh: &QueueHandle<D>,
         data: U,
-    ) -> Result<wl_surface::WlSurface, GlobalError>
+    ) -> wl_surface::WlSurface
     where
         D: Dispatch<wl_surface::WlSurface, U> + 'static,
         U: SurfaceDataExt + 'static,
     {
-        let surface = self.wl_compositor.create_surface(qh, data);
-
-        Ok(surface)
+        self.wl_compositor.create_surface(qh, data)
     }
 }
 

src/seat/pointer/mod.rs

@@ -506,11 +506,9 @@ impl ThemedPointer {
         if surface.version() >= 4 {
             surface.damage_buffer(0, 0, w as i32, h as i32);
         } else {
-            let scale = self.scale;
-
             // surface is old and does not support damage_buffer, so we damage
             // in surface coordinates and hope it is not rescaled
-            surface.damage(0, 0, w as i32 / scale as i32, h as i32 / scale as i32);
+            surface.damage(0, 0, w as i32 / self.scale, h as i32 / self.scale);
         }
 
         // Commit the surface to place the cursor image in the compositor's memory.