autocommit 2022-04-08 23:02:38 CEST

src/backends/metal.rs

@@ -11,7 +11,6 @@ use {
         },
         backends::metal::video::{MetalDrmDevice, PendingDrmDevice},
         dbus::DbusError,
-        video::{drm::DrmError, gbm::GbmError},
         libinput::{
             consts::{
                 AccelProfile, LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE,
@@ -35,6 +34,7 @@ use {
             smallmap::SmallMap,
             syncqueue::SyncQueue,
         },
+        video::{drm::DrmError, gbm::GbmError},
     },
     std::{
         cell::{Cell, RefCell},

src/backends/metal/monitor.rs

@@ -7,9 +7,9 @@ use {
             MetalBackend, MetalDevice, MetalError, MetalInputDevice,
         },
         dbus::TRUE,
-        video::drm::DrmMaster,
         udev::UdevDevice,
         utils::{errorfmt::ErrorFmt, nonblock::set_nonblock},
+        video::drm::DrmMaster,
         wire_dbus::org::freedesktop::login1::session::{PauseDevice, ResumeDevice},
     },
     bstr::ByteSlice,

src/backends/metal/video.rs

@@ -5,6 +5,14 @@ use {
             BackendEvent, Connector, ConnectorEvent, ConnectorId, ConnectorKernelId, MonitorInfo,
         },
         backends::metal::{DrmId, MetalBackend, MetalError},
+        edid::Descriptor,
+        format::{Format, XRGB8888},
+        render::{Framebuffer, RenderContext},
+        state::State,
+        utils::{
+            bitflags::BitflagsExt, clonecell::CloneCell, debug_fn::debug_fn, errorfmt::ErrorFmt,
+            numcell::NumCell, oserror::OsError, syncqueue::SyncQueue,
+        },
         video::{
             drm::{
                 drm_mode_modeinfo, Change, ConnectorStatus, ConnectorType, DrmBlob, DrmConnector,
@@ -16,14 +24,6 @@ use {
             gbm::{GbmDevice, GBM_BO_USE_RENDERING, GBM_BO_USE_SCANOUT},
             ModifiedFormat, INVALID_MODIFIER,
         },
-        edid::Descriptor,
-        format::{Format, XRGB8888},
-        render::{Framebuffer, RenderContext},
-        state::State,
-        utils::{
-            bitflags::BitflagsExt, clonecell::CloneCell, debug_fn::debug_fn, errorfmt::ErrorFmt,
-            numcell::NumCell, oserror::OsError, syncqueue::SyncQueue,
-        },
     },
     ahash::{AHashMap, AHashSet},
     bstr::{BString, ByteSlice},
@@ -280,10 +280,10 @@ fn create_connector(
             if let Some(d) = descriptor {
                 match d {
                     Descriptor::DisplayProductSerialNumber(s) => {
-                        serial_number = s.to_string();
+                        serial_number = s.clone();
                     }
                     Descriptor::DisplayProductName(s) => {
-                        name = s.to_string();
+                        name = s.clone();
                     }
                     _ => {}
                 }

src/backends/x.rs

@@ -6,11 +6,6 @@ use {
             InputDevice, InputDeviceAccelProfile, InputDeviceCapability, InputDeviceId, InputEvent,
             KeyState, Mode, MonitorInfo, ScrollAxis,
         },
-        video::{
-            drm::{ConnectorType, Drm, DrmError},
-            gbm::{GbmDevice, GbmError, GBM_BO_USE_RENDERING},
-            ModifiedFormat, INVALID_MODIFIER,
-        },
         fixed::Fixed,
         format::XRGB8888,
         render::{Framebuffer, RenderContext, RenderError},
@@ -19,6 +14,11 @@ use {
             clonecell::CloneCell, copyhashmap::CopyHashMap, errorfmt::ErrorFmt, numcell::NumCell,
             queue::AsyncQueue, syncqueue::SyncQueue,
         },
+        video::{
+            drm::{ConnectorType, Drm, DrmError},
+            gbm::{GbmDevice, GbmError, GBM_BO_USE_RENDERING},
+            ModifiedFormat, INVALID_MODIFIER,
+        },
         wire_xcon::{
             ChangeProperty, ChangeWindowAttributes, ConfigureNotify, CreateCursor, CreatePixmap,
             CreateWindow, CreateWindowValues, DestroyNotify, Dri3Open, Dri3PixmapFromBuffer,