Fix linter warnings

Author: qzed

src/error.rs

@@ -40,7 +40,7 @@ impl From<ErrorKind> for Error {
 
 impl From<Context<ErrorKind>> for Error {
     fn from(inner: Context<ErrorKind>) -> Error {
-        Error { inner: inner }
+        Error { inner }
     }
 }
 

src/main.rs

@@ -60,7 +60,7 @@ fn cmd_status(_: &clap::ArgMatches) -> Result<()> {
     } else {
         Err(failure::err_msg("No surface control device not found"))
             .context(ErrorKind::DeviceAccess)
-            .map_err(|e| e.into())
+            .map_err(Into::into)
     }
 }
 

src/sys/dgpu.rs

@@ -20,7 +20,7 @@ impl PowerState {
         }
     }
 
-    pub fn as_str(&self) -> &'static str {
+    pub fn as_str(self) -> &'static str {
         match self {
             PowerState::Off => "off",
             PowerState::On  => "on",
@@ -62,7 +62,7 @@ impl Device {
         } else {
             Err(failure::err_msg("Surface dGPU hot-plug device not found"))
                 .context(ErrorKind::DeviceAccess)
-                .map_err(|e| e.into())
+                .map_err(Into::into)
         }
     }
 
@@ -76,8 +76,9 @@ impl Device {
 
         let mut buf = [0; 4];
         let len = file.read(&mut buf).context(ErrorKind::Io)?;
+        let len = std::cmp::min(len + 1, buf.len());
 
-        let state = CStr::from_bytes_with_nul(&buf[0..len+1])
+        let state = CStr::from_bytes_with_nul(&buf[0..len])
             .context(ErrorKind::InvalidData)?
             .to_str().context(ErrorKind::InvalidData)?
             .trim();

src/sys/latch.rs

@@ -54,11 +54,11 @@ impl Device {
             Err(ref e) if e.kind() == std::io::ErrorKind::NotFound => {
                 Err(failure::err_msg("Surface latch device not found"))
                     .context(ErrorKind::DeviceAccess)
-                    .map_err(|e| e.into())
+                    .map_err(Into::into)
             },
             Err(e) => {
                 Err(e).context(ErrorKind::DeviceAccess)
-                    .map_err(|e| e.into())
+                    .map_err(Into::into)
             },
         }
 

src/sys/perf.rs

@@ -26,7 +26,7 @@ impl Mode {
         }
     }
 
-    pub fn short_str(&self) -> &'static str {
+    pub fn short_str(self) -> &'static str {
         match self {
             Mode::Normal  => "1",
             Mode::Battery => "2",
@@ -35,7 +35,7 @@ impl Mode {
         }
     }
 
-    pub fn long_str(&self) -> &'static str {
+    pub fn long_str(self) -> &'static str {
         match self {
             Mode::Normal  => "Normal",
             Mode::Battery => "Battery-Saver",
@@ -79,7 +79,7 @@ impl Device {
         } else {
             Err(failure::err_msg("Surface performance-mode device not found"))
                 .context(ErrorKind::DeviceAccess)
-                .map_err(|e| e.into())
+                .map_err(Into::into)
         }
     }
 
@@ -93,8 +93,9 @@ impl Device {
 
         let mut buf = [0; 4];
         let len = file.read(&mut buf).context(ErrorKind::Io)?;
+        let len = std::cmp::min(len + 1, buf.len());
 
-        let state = CStr::from_bytes_with_nul(&buf[0..len+1])
+        let state = CStr::from_bytes_with_nul(&buf[0..len])
             .context(ErrorKind::InvalidData)?
             .to_str().context(ErrorKind::InvalidData)?
             .trim();