autocommit 2022-04-21 18:40:32 CEST

src/ifs/zwp_linux_buffer_params_v1.rs

@@ -9,9 +9,7 @@ use {
             buffd::{MsgParser, MsgParserError},
             errorfmt::ErrorFmt,
         },
-        video::{
+        video::dmabuf::{DmaBuf, DmaBufPlane},
-            dmabuf::{DmaBuf, DmaBufPlane},
-        },
         wire::{zwp_linux_buffer_params_v1::*, WlBufferId, ZwpLinuxBufferParamsV1Id},
     },
     ahash::AHashMap,

src/render/egl/display.rs

@@ -28,7 +28,7 @@ use {
         },
         video::{dmabuf::DmaBuf, drm::Drm, gbm::GbmDevice, INVALID_MODIFIER, LINEAR_MODIFIER},
     },
-    ahash::{AHashMap},
+    ahash::AHashMap,
     std::{ptr, rc::Rc},
 };
 
@@ -230,10 +230,13 @@ unsafe fn query_formats(dpy: EGLDisplay) -> Result<AHashMap<u32, EglFormat>, Ren
     let formats = formats();
     for fmt in vec {
         if let Some(format) = formats.get(&(fmt as u32)) {
-            res.insert(format.drm, EglFormat {
+            res.insert(
-                format: *format,
+                format.drm,
-                modifiers: query_modifiers(dpy, fmt)?,
+                EglFormat {
-            });
+                    format: *format,
+                    modifiers: query_modifiers(dpy, fmt)?,
+                },
+            );
         }
     }
     Ok(res)

src/render/renderer/context.rs

@@ -2,7 +2,10 @@ use {
     crate::{
         format::{Format, XRGB8888},
         render::{
-            egl::{context::EglContext, display::EglDisplay},
+            egl::{
+                context::EglContext,
+                display::{EglDisplay, EglFormat},
+            },
             gl::{
                 program::GlProgram, render_buffer::GlRenderBuffer, sys::GLint, texture::GlTexture,
             },
@@ -24,7 +27,6 @@ use {
     },
     uapi::ustr,
 };
-use crate::render::egl::display::EglFormat;
 
 pub(super) struct TexProg {
     pub(super) prog: GlProgram,