Large code cleanup

daemon/src/ctrl_gfx/gfx.rs

@@ -10,7 +10,7 @@ use std::str::FromStr;
 use std::{sync::Arc, sync::Mutex};
 use sysfs_class::{PciDevice, SysClass};
 use system::{GraphicsDevice, Module, PciBus};
-use vendors::{GfxCtrlAction, GfxVendors};
+use rog_types::gfx_vendors::{GfxCtrlAction, GfxVendors};
 use zbus::dbus_interface;
 
 use crate::*;
@@ -190,14 +190,9 @@ impl CtrlGraphics {
         };
         let modules = Module::all().map_err(|err| GfxError::Read("get_vendor".into(), err))?;
 
-        let driver_loaded = if modules
+        let driver_loaded = modules
             .iter()
-            .any(|module| module.name == "nouveau" || module.name == "nvidia")
-        {
-            true
-        } else {
-            false
-        };
+            .any(|module| module.name == "nouveau" || module.name == "nvidia");
 
         let vendor = if mode == "off" {
             if driver_loaded {

daemon/src/ctrl_gfx/mod.rs

@@ -1,5 +1,3 @@
-pub mod vendors;
-
 pub mod error;
 
 pub mod gfx;

daemon/src/ctrl_gfx/vendors.rs

@@ -1,86 +0,0 @@
-#[derive(Debug, PartialEq, Clone)]
-pub enum GfxVendors {
-    Nvidia,
-    Integrated,
-    Compute,
-    Hybrid,
-}
-
-use std::str::FromStr;
-
-use super::error::GfxError;
-
-impl FromStr for GfxVendors {
-    type Err = GfxError;
-
-    fn from_str(s: &str) -> Result<Self, GfxError> {
-        match s.to_lowercase().as_str() {
-            "nvidia" => Ok(GfxVendors::Nvidia),
-            "hybrid" => Ok(GfxVendors::Hybrid),
-            "compute" => Ok(GfxVendors::Compute),
-            "integrated" => Ok(GfxVendors::Integrated),
-            "nvidia\n" => Ok(GfxVendors::Nvidia),
-            "hybrid\n" => Ok(GfxVendors::Hybrid),
-            "compute\n" => Ok(GfxVendors::Compute),
-            "integrated\n" => Ok(GfxVendors::Integrated),
-            _ => Err(GfxError::ParseVendor),
-        }
-    }
-}
-
-impl From<&GfxVendors> for &str {
-    fn from(mode: &GfxVendors) -> Self {
-        match mode {
-            GfxVendors::Nvidia => "nvidia",
-            GfxVendors::Hybrid => "hybrid",
-            GfxVendors::Compute => "compute",
-            GfxVendors::Integrated => "integrated",
-        }
-    }
-}
-
-#[derive(Debug)]
-pub enum GfxCtrlAction {
-    Reboot,
-    RestartX,
-    None,
-}
-
-impl FromStr for GfxCtrlAction {
-    type Err = GfxError;
-
-    fn from_str(s: &str) -> Result<Self, GfxError> {
-        match s.to_lowercase().as_str() {
-            "reboot" => Ok(GfxCtrlAction::Reboot),
-            "restartx" => Ok(GfxCtrlAction::RestartX),
-            "none" => Ok(GfxCtrlAction::None),
-            _ => Err(GfxError::ParseVendor),
-        }
-    }
-}
-
-impl From<&GfxCtrlAction> for &str {
-    fn from(mode: &GfxCtrlAction) -> Self {
-        match mode {
-            GfxCtrlAction::Reboot => "reboot",
-            GfxCtrlAction::RestartX => "restartx",
-            GfxCtrlAction::None => "none",
-        }
-    }
-}
-
-impl From<&GfxCtrlAction> for String {
-    fn from(mode: &GfxCtrlAction) -> Self {
-        match mode {
-            GfxCtrlAction::Reboot => "reboot".into(),
-            GfxCtrlAction::RestartX => "restartx".into(),
-            GfxCtrlAction::None => "none".into(),
-        }
-    }
-}
-
-impl From<GfxCtrlAction> for String {
-    fn from(mode: GfxCtrlAction) -> Self {
-        (&mode).into()
-    }
-}