cargo fmt

not-fl3 · May 26, 2024 · cf5e4f9 · cf5e4f9
1 parent b1e9200
commit cf5e4f9
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 24 deletions.
diff --git a/examples/blobs.rs b/examples/blobs.rs
@@ -73,7 +73,7 @@ impl Stage {
                 VertexAttribute::new("in_uv", VertexFormat::Float2),
             ],
             shader,
-            PipelineParams::default()
+            PipelineParams::default(),
         );
 
         let uniforms = shader::Uniforms {

diff --git a/examples/post_processing.rs b/examples/post_processing.rs
@@ -144,7 +144,7 @@ impl Stage {
                 VertexAttribute::new("uv", VertexFormat::Float2),
             ],
             default_shader,
-            PipelineParams::default()
+            PipelineParams::default(),
         );
 
         let offscreen_shader = ctx

diff --git a/src/native.rs b/src/native.rs
@@ -66,7 +66,7 @@ pub(crate) enum Request {
     ShowMouse(bool),
     SetMouseCursor(crate::CursorIcon),
     SetWindowSize { new_width: u32, new_height: u32 },
-    SetWindowPosition{ new_x: u32, new_y: u32 },
+    SetWindowPosition { new_x: u32, new_y: u32 },
     SetFullscreen(bool),
     ShowKeyboard(bool),
 }

diff --git a/src/native/linux_wayland.rs b/src/native/linux_wayland.rs
@@ -397,8 +397,7 @@ unsafe extern "C" fn registry_add_object(
                 1,
             ) as _;
         }
-        "zxdg_decoration_manager" |
-        "zxdg_decoration_manager_v1" => {
+        "zxdg_decoration_manager" | "zxdg_decoration_manager_v1" => {
             display.decoration_manager = display.client.wl_registry_bind(
                 registry,
                 name,
@@ -773,20 +772,22 @@ where
 
                 while let Ok(request) = rx.try_recv() {
                     match request {
-                        Request::SetFullscreen(full) => if full {
-                            wl_request!(
-                                display.client,
-                                display.xdg_toplevel,
-                                extensions::xdg_shell::xdg_toplevel::set_fullscreen,
-                                std::ptr::null_mut::<*mut wl_output>()
-                            );
-                        } else {
-                            wl_request!(
-                                display.client,
-                                display.xdg_toplevel,
-                                extensions::xdg_shell::xdg_toplevel::unset_fullscreen
-                            );
-                        },
+                        Request::SetFullscreen(full) => {
+                            if full {
+                                wl_request!(
+                                    display.client,
+                                    display.xdg_toplevel,
+                                    extensions::xdg_shell::xdg_toplevel::set_fullscreen,
+                                    std::ptr::null_mut::<*mut wl_output>()
+                                );
+                            } else {
+                                wl_request!(
+                                    display.client,
+                                    display.xdg_toplevel,
+                                    extensions::xdg_shell::xdg_toplevel::unset_fullscreen
+                                );
+                            }
+                        }
 
                         // TODO: implement the other events
                         _ => (),

diff --git a/src/native/linux_x11/glx.rs b/src/native/linux_x11/glx.rs
@@ -212,7 +212,12 @@ pub struct Glx {
 }
 
 impl Glx {
-    pub unsafe fn init(libx11: &mut LibX11, display: *mut Display, screen: i32, conf: &crate::conf::Conf) -> Option<Glx> {
+    pub unsafe fn init(
+        libx11: &mut LibX11,
+        display: *mut Display,
+        screen: i32,
+        conf: &crate::conf::Conf,
+    ) -> Option<Glx> {
         let mut libgl = LibGlx::try_load()?;
 
         let mut errorbase = 0;
@@ -251,7 +256,14 @@ impl Glx {
         // _sapp_glx_ARB_create_context_profile =
         //     _sapp_glx_extsupported(b"GLX_ARB_create_context_profile\x00", exts);
 
-        let fbconfig = choose_fbconfig(&mut libgl, libx11, display, screen, multisample, conf.sample_count);
+        let fbconfig = choose_fbconfig(
+            &mut libgl,
+            libx11,
+            display,
+            screen,
+            multisample,
+            conf.sample_count,
+        );
         assert!(
             !fbconfig.is_null(),
             "GLX: Failed to find a suitable GLXFBConfig"
@@ -389,9 +401,8 @@ unsafe fn choose_fbconfig(
     display: *mut Display,
     screen: i32,
     multisample: bool,
-    desired_sample_count: i32
+    desired_sample_count: i32,
 ) -> GLXFBConfig {
-
     let native_configs: *mut GLXFBConfig;
     let closest: *const GLFBConfig;
     let mut native_count: libc::c_int = 0;

diff --git a/src/native/macos.rs b/src/native/macos.rs
@@ -183,7 +183,7 @@ impl MacosDisplay {
                     new_height,
                 } => self.set_window_size(new_width as _, new_height as _),
                 SetFullscreen(fullscreen) => self.set_fullscreen(fullscreen),
-                SetWindowPosition{new_x, new_y} => {
+                SetWindowPosition { new_x, new_y } => {
                     eprintln!("Not implemented for macos");
                 }
                 _ => {}