Reformat code with cargo fmt (#279)

* chaos_game: Remove errant semicolon * Add rust-toolchain.toml to specify specify rustfmt version * Add `rustfmt` workflow to CI * Format the code with `cargo fmt`
servo · Mar 18, 2024 · f7eb174 · f7eb174
1 parent e42ca0d
commit f7eb174
Show file tree

Hide file tree

Showing 19 changed files with 114 additions and 120 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -70,10 +70,17 @@ jobs:
         cd surfman
         rustup component add rust-src --target=aarch64-uwp-windows-msvc
         cargo build -Z build-std --verbose --target=aarch64-uwp-windows-msvc
+  Format:
+    name: Run `rustfmt`
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: mkroening/rust-toolchain-toml@main
+      - run: cargo fmt --check
   build_result:
     name: Result
     runs-on: ubuntu-latest
-    needs: ["Build"]
+    needs: ["Build", "Format"]
     if: always()
     steps:
       - name: Mark the job as successful

diff --git a/android-example/rust/src/lib.rs b/android-example/rust/src/lib.rs
@@ -167,14 +167,12 @@ impl ResourceLoader for JavaResourceLoader {
 
         let loader = self.loader.as_obj();
         let mut env = self.vm.get_env().unwrap();
-        match env
-            .call_method(
-                loader,
-                "slurp",
-                "(Ljava/lang/String;)Ljava/nio/ByteBuffer;",
-                &[JValue::Object(&env.new_string(filename).unwrap())],
-            )
-        {
+        match env.call_method(
+            loader,
+            "slurp",
+            "(Ljava/lang/String;)Ljava/nio/ByteBuffer;",
+            &[JValue::Object(&env.new_string(filename).unwrap())],
+        ) {
             Ok(JValueGen::Object(object)) => {
                 let byte_buffer = JByteBuffer::from(object);
                 unsafe {
@@ -184,7 +182,7 @@ impl ResourceLoader for JavaResourceLoader {
                     );
                     dest.extend_from_slice(slice);
                 }
-            },
+            }
             _ => panic!("Unexpected return value!"),
         }
     }

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -0,0 +1,4 @@
+[toolchain]
+channel = "1.76"
+components = [ "rustfmt" ]
+profile = "minimal"
diff --git a/surfman/examples/chaos_game.rs b/surfman/examples/chaos_game.rs
@@ -6,7 +6,7 @@ use euclid::default::Point2D;
 use rand::{self, Rng};
 use surfman::{SurfaceAccess, SurfaceType};
 use winit::dpi::PhysicalSize;
-use winit::event::{DeviceEvent, Event, WindowEvent, KeyboardInput, VirtualKeyCode};
+use winit::event::{DeviceEvent, Event, KeyboardInput, VirtualKeyCode, WindowEvent};
 use winit::event_loop::{ControlFlow, EventLoop};
 use winit::window::WindowBuilder;
 
@@ -53,7 +53,7 @@ fn main() {
     let window_size = Size2D::new(window_size.width as i32, window_size.height as i32);
     let handle = window.window_handle().unwrap();
     let native_widget = connection
-        .create_native_widget_from_raw_window_handle(handle.as_raw(), window_size);
+        .create_native_widget_from_raw_window_handle(handle.as_raw(), window_size)
         .unwrap();
 
     let surface_type = SurfaceType::Widget { native_widget };

diff --git a/surfman/examples/threads.rs b/surfman/examples/threads.rs
@@ -21,7 +21,7 @@ use winit::{
     dpi::PhysicalSize,
     event::{DeviceEvent, Event, WindowEvent},
     event_loop::{ControlFlow, EventLoop},
-    window::WindowBuilder
+    window::WindowBuilder,
 };
 
 #[cfg(feature = "sm-raw-window-handle-05")]
@@ -91,24 +91,27 @@ static BACKGROUND_COLOR: [f32; 4] = [
 ];
 
 #[cfg(feature = "sm-raw-window-handle-05")]
-fn make_connection(window: &winit::window::Window) -> surfman::Connection
-{
+fn make_connection(window: &winit::window::Window) -> surfman::Connection {
     let raw_display_handle = window.raw_display_handle();
     let connection = Connection::from_raw_display_handle(raw_display_handle).unwrap();
     connection
 }
 
 #[cfg(not(feature = "sm-raw-window-handle-05"))]
-fn make_connection(window: &winit::window::Window) -> surfman::Connection
-{
-    let display_handle = window.display_handle().expect("failed to get display handle from window");
+fn make_connection(window: &winit::window::Window) -> surfman::Connection {
+    let display_handle = window
+        .display_handle()
+        .expect("failed to get display handle from window");
     let connection = Connection::from_display_handle(display_handle).unwrap();
     connection
 }
 
 #[cfg(feature = "sm-raw-window-handle-05")]
-fn make_native_widget(window: &winit::window::Window, connection: &surfman::Connection, window_size: Size2D<i32>) -> surfman::NativeWidget
-{
+fn make_native_widget(
+    window: &winit::window::Window,
+    connection: &surfman::Connection,
+    window_size: Size2D<i32>,
+) -> surfman::NativeWidget {
     let raw_window_handle = window.raw_window_handle();
     let native_widget = connection
         .create_native_widget_from_raw_window_handle(raw_window_handle, window_size)
@@ -117,9 +120,14 @@ fn make_native_widget(window: &winit::window::Window, connection: &surfman::Conn
 }
 
 #[cfg(not(feature = "sm-raw-window-handle-05"))]
-fn make_native_widget(window: &winit::window::Window, connection: &surfman::Connection, window_size: Size2D<i32>) -> surfman::NativeWidget
-{
-    let raw_window_handle = window.window_handle().expect("couldn't get window handle from window");
+fn make_native_widget(
+    window: &winit::window::Window,
+    connection: &surfman::Connection,
+    window_size: Size2D<i32>,
+) -> surfman::NativeWidget {
+    let raw_window_handle = window
+        .window_handle()
+        .expect("couldn't get window handle from window");
     let native_widget = connection
         .create_native_widget_from_window_handle(raw_window_handle, window_size)
         .unwrap();
@@ -128,7 +136,10 @@ fn make_native_widget(window: &winit::window::Window, connection: &surfman::Conn
 
 #[cfg(not(target_os = "android"))]
 fn main() {
-    use winit::{event::RawKeyEvent, keyboard::{KeyCode, PhysicalKey}};
+    use winit::{
+        event::RawKeyEvent,
+        keyboard::{KeyCode, PhysicalKey},
+    };
 
     let event_loop = EventLoop::new().expect("couldn't create eventloop");
     let window_size = Size2D::new(WINDOW_WIDTH, WINDOW_HEIGHT);
@@ -177,22 +188,26 @@ fn main() {
         window_size,
     );
 
-    event_loop.run(move |event, target| match event {
-        Event::WindowEvent {
-            event: WindowEvent::CloseRequested,
-            ..
-        }
-        | Event::DeviceEvent {
-            event:
-                DeviceEvent::Key(RawKeyEvent {
-                    physical_key: PhysicalKey::Code(KeyCode::Escape),
-                    ..
-                }),
-            ..
-        } => target.exit(),
-        _ => { app.tick(true); target.set_control_flow(ControlFlow::Poll) }
-    }).expect("failed to run event loop");
-
+    event_loop
+        .run(move |event, target| match event {
+            Event::WindowEvent {
+                event: WindowEvent::CloseRequested,
+                ..
+            }
+            | Event::DeviceEvent {
+                event:
+                    DeviceEvent::Key(RawKeyEvent {
+                        physical_key: PhysicalKey::Code(KeyCode::Escape),
+                        ..
+                    }),
+                ..
+            } => target.exit(),
+            _ => {
+                app.tick(true);
+                target.set_control_flow(ControlFlow::Poll)
+            }
+        })
+        .expect("failed to run event loop");
 }
 pub struct App {
     main_from_worker_receiver: Receiver<Frame>,
@@ -213,7 +228,6 @@ impl Drop for App {
 }
 
 impl App {
-
     pub fn new(
         connection: Connection,
         adapter: Adapter,

diff --git a/surfman/src/chains.rs b/surfman/src/chains.rs
@@ -22,8 +22,8 @@
 
 #![allow(missing_docs)]
 
-use crate::{ContextID, Error, SurfaceAccess, SurfaceInfo, SurfaceType};
 use crate::device::Device as DeviceAPI;
+use crate::{ContextID, Error, SurfaceAccess, SurfaceInfo, SurfaceType};
 use euclid::default::Size2D;
 use fnv::{FnvHashMap, FnvHashSet};
 use log::debug;

diff --git a/surfman/src/connection.rs b/surfman/src/connection.rs
@@ -56,15 +56,11 @@ pub trait Connection: Sized {
 
     /// Opens the display connection corresponding to the given `RawDisplayHandle`.
     #[cfg(feature = "sm-raw-window-handle-05")]
-    fn from_raw_display_handle(
-        raw_handle: rwh_05::RawDisplayHandle,
-    ) -> Result<Self, Error>;
+    fn from_raw_display_handle(raw_handle: rwh_05::RawDisplayHandle) -> Result<Self, Error>;
 
     /// Opens the display connection corresponding to the given `DisplayHandle`.
     #[cfg(feature = "sm-raw-window-handle-06")]
-    fn from_display_handle(
-        handle: rwh_06::DisplayHandle,
-    ) -> Result<Self, Error>;
+    fn from_display_handle(handle: rwh_06::DisplayHandle) -> Result<Self, Error>;
 
     /// Creates a native widget from a raw pointer
     unsafe fn create_native_widget_from_ptr(

diff --git a/surfman/src/implementation/connection.rs b/surfman/src/implementation/connection.rs
@@ -72,17 +72,13 @@ impl ConnectionInterface for Connection {
 
     #[inline]
     #[cfg(feature = "sm-raw-window-handle-05")]
-    fn from_raw_display_handle(
-        raw_handle: rwh_05::RawDisplayHandle,
-    ) -> Result<Connection, Error> {
+    fn from_raw_display_handle(raw_handle: rwh_05::RawDisplayHandle) -> Result<Connection, Error> {
         Connection::from_raw_display_handle(raw_handle)
     }
 
     #[inline]
     #[cfg(feature = "sm-raw-window-handle-06")]
-    fn from_display_handle(
-        handle: rwh_06::DisplayHandle,
-    ) -> Result<Connection, Error> {
+    fn from_display_handle(handle: rwh_06::DisplayHandle) -> Result<Connection, Error> {
         Connection::from_display_handle(handle)
     }
 

diff --git a/surfman/src/platform/android/connection.rs b/surfman/src/platform/android/connection.rs
@@ -99,17 +99,13 @@ impl Connection {
 
     /// Opens the display connection corresponding to the given raw display handle.
     #[cfg(feature = "sm-raw-window-handle-05")]
-    pub fn from_raw_display_handle(
-        _: rwh_05::RawDisplayHandle,
-    ) -> Result<Connection, Error> {
+    pub fn from_raw_display_handle(_: rwh_05::RawDisplayHandle) -> Result<Connection, Error> {
         Ok(Connection)
     }
 
     /// Opens the display connection corresponding to the given `DisplayHandle`.
     #[cfg(feature = "sm-raw-window-handle-06")]
-    pub fn from_display_handle(
-        _: rwh_06::DisplayHandle,
-    ) -> Result<Connection, Error> {
+    pub fn from_display_handle(_: rwh_06::DisplayHandle) -> Result<Connection, Error> {
         Ok(Connection)
     }
 

diff --git a/surfman/src/platform/android/context.rs b/surfman/src/platform/android/context.rs
@@ -316,11 +316,17 @@ impl Device {
         context::get_proc_address(symbol_name)
     }
 
-    pub(crate) fn context_to_egl_config(
-        &self,
-        context: &Context,
-    ) -> EGLConfig {
-        unsafe { context::egl_config_from_id(self.egl_display, context::get_context_attr(self.egl_display, context.egl_context, egl::CONFIG_ID as EGLint)) }
+    pub(crate) fn context_to_egl_config(&self, context: &Context) -> EGLConfig {
+        unsafe {
+            context::egl_config_from_id(
+                self.egl_display,
+                context::get_context_attr(
+                    self.egl_display,
+                    context.egl_context,
+                    egl::CONFIG_ID as EGLint,
+                ),
+            )
+        }
     }
 
     pub(crate) fn temporarily_make_context_current(

diff --git a/surfman/src/platform/generic/multi/connection.rs b/surfman/src/platform/generic/multi/connection.rs
@@ -199,9 +199,7 @@ where
     ) -> Result<Connection<Def, Alt>, Error> {
         match <Def::Connection>::from_display_handle(handle) {
             Ok(connection) => Ok(Connection::Default(connection)),
-            Err(_) => {
-                <Alt::Connection>::from_display_handle(handle).map(Connection::Alternate)
-            }
+            Err(_) => <Alt::Connection>::from_display_handle(handle).map(Connection::Alternate),
         }
     }
 
@@ -325,9 +323,7 @@ where
     }
 
     #[cfg(feature = "sm-raw-window-handle-06")]
-    fn from_display_handle(
-        handle: rwh_06::DisplayHandle,
-    ) -> Result<Connection<Def, Alt>, Error> {
+    fn from_display_handle(handle: rwh_06::DisplayHandle) -> Result<Connection<Def, Alt>, Error> {
         Connection::from_display_handle(handle)
     }
 

diff --git a/surfman/src/platform/macos/cgl/connection.rs b/surfman/src/platform/macos/cgl/connection.rs
@@ -154,7 +154,7 @@ impl Connection {
             AppKit(handle) => {
                 let ns_view = handle.ns_view.as_ptr() as id;
                 // https://developer.apple.com/documentation/appkit/nsview/1483301-window
-                let ns_window: id = unsafe{ msg_send![ns_view, window] };
+                let ns_window: id = unsafe { msg_send![ns_view, window] };
                 Ok(NativeWidget {
                     // Increment the nsview's reference count with retain. See:
                     // https://developer.apple.com/documentation/objectivec/1418956-nsobject/1571946-retain

diff --git a/surfman/src/platform/macos/system/connection.rs b/surfman/src/platform/macos/system/connection.rs
@@ -120,17 +120,13 @@ impl Connection {
 
     /// Opens the display connection corresponding to the given `RawDisplayHandle`.
     #[cfg(feature = "sm-raw-window-handle-05")]
-    pub fn from_raw_display_handle(
-        _: rwh_05::RawDisplayHandle,
-    ) -> Result<Connection, Error> {
+    pub fn from_raw_display_handle(_: rwh_05::RawDisplayHandle) -> Result<Connection, Error> {
         Connection::new()
     }
 
     /// Opens the display connection corresponding to the given `DisplayHandle`.
     #[cfg(feature = "sm-raw-window-handle-06")]
-    pub fn from_display_handle(
-        _: rwh_06::DisplayHandle,
-    ) -> Result<Connection, Error> {
+    pub fn from_display_handle(_: rwh_06::DisplayHandle) -> Result<Connection, Error> {
         Connection::new()
     }
 
@@ -179,7 +175,7 @@ impl Connection {
             AppKit(handle) => {
                 let ns_view = handle.ns_view.as_ptr() as id;
                 // https://developer.apple.com/documentation/appkit/nsview/1483301-window
-                let ns_window: id = unsafe{ msg_send![ns_view, window] };
+                let ns_window: id = unsafe { msg_send![ns_view, window] };
                 Ok(NativeWidget {
                     // Increment the nsview's reference count with retain. See:
                     // https://developer.apple.com/documentation/objectivec/1418956-nsobject/1571946-retain

diff --git a/surfman/src/platform/unix/generic/connection.rs b/surfman/src/platform/unix/generic/connection.rs
@@ -136,17 +136,13 @@ impl Connection {
 
     /// Opens the display connection corresponding to the given `RawDisplayHandle`.
     #[cfg(feature = "sm-raw-window-handle-05")]
-    pub fn from_raw_display_handle(
-        _: rwh_05::RawDisplayHandle,
-    ) -> Result<Connection, Error> {
+    pub fn from_raw_display_handle(_: rwh_05::RawDisplayHandle) -> Result<Connection, Error> {
         Err(Error::IncompatibleNativeWidget)
     }
 
     /// Opens the display connection corresponding to the given `DisplayHandle`.
     #[cfg(feature = "sm-raw-window-handle-06")]
-    pub fn from_display_handle(
-        _: rwh_06::DisplayHandle,
-    ) -> Result<Connection, Error> {
+    pub fn from_display_handle(_: rwh_06::DisplayHandle) -> Result<Connection, Error> {
         Err(Error::IncompatibleNativeWidget)
     }
 

diff --git a/surfman/src/platform/unix/wayland/connection.rs b/surfman/src/platform/unix/wayland/connection.rs
@@ -175,14 +175,14 @@ impl Connection {
 
     /// Opens the display connection corresponding to the given `DisplayHandle`.
     #[cfg(feature = "sm-raw-window-handle-06")]
-    pub fn from_display_handle(
-        handle: rwh_06::DisplayHandle,
-    ) -> Result<Connection, Error> {
+    pub fn from_display_handle(handle: rwh_06::DisplayHandle) -> Result<Connection, Error> {
         use rwh_06::RawDisplayHandle::Wayland;
         use rwh_06::WaylandDisplayHandle;
         unsafe {
             let wayland_display = match handle.as_raw() {
-                Wayland(WaylandDisplayHandle { display, .. }) => display.as_ptr() as *mut wl_display,
+                Wayland(WaylandDisplayHandle { display, .. }) => {
+                    display.as_ptr() as *mut wl_display
+                }
                 _ => return Err(Error::IncompatibleRawDisplayHandle),
             };
 

diff --git a/surfman/src/platform/unix/x11/connection.rs b/surfman/src/platform/unix/x11/connection.rs
@@ -206,9 +206,7 @@ impl Connection {
 
     /// Opens the display connection corresponding to the given `DisplayHandle`.
     #[cfg(feature = "sm-raw-window-handle-06")]
-    pub fn from_display_handle(
-        handle: rwh_06::DisplayHandle,
-    ) -> Result<Connection, Error> {
+    pub fn from_display_handle(handle: rwh_06::DisplayHandle) -> Result<Connection, Error> {
         use rwh_06::RawDisplayHandle::Xcb;
         use rwh_06::RawDisplayHandle::Xlib;
         use rwh_06::XlibDisplayHandle;