kernel: fix clippy warnings

slp · slp · commit 67cdf930daec · 2021-12-09T17:14:30.000+01:00
Fix code to remove clippy warnings.

Signed-off-by: Sergio Lopez &lt;slp@redhat.com&gt;
diff --git a/src/kernel/src/cmdline/mod.rs b/src/kernel/src/cmdline/mod.rs
@@ -49,10 +49,7 @@ impl fmt::Display for Error {
 pub type Result<T> = result::Result<T, Error>;
 
 fn valid_char(c: char) -> bool {
-    match c {
-        ' '..='~' => true,
-        _ => false,
-    }
+    matches!(c, ' '..='~')
 }
 
 fn valid_str(s: &str) -> Result<()> {
@@ -164,7 +161,7 @@ impl Cmdline {
 
     /// Returns the cmdline in progress as CString.
     pub fn as_cstring(&self) -> Result<CString> {
-        Ok(CString::new(self.line.clone()).map_err(|_| Error::InvalidAscii)?)
+        CString::new(self.line.clone()).map_err(|_| Error::InvalidAscii)
     }
 }
 
diff --git a/src/kernel/src/loader/mod.rs b/src/kernel/src/loader/mod.rs
@@ -41,7 +41,7 @@ impl fmt::Display for Error {
                 Error::InvalidProgramHeaderSize => "Invalid ELF program header size",
                 Error::InvalidProgramHeaderOffset => "Invalid ELF program header offset",
                 Error::InvalidProgramHeaderAddress => "Invalid ELF program header address",
-                Error::ReadKernelDataStruct(ref e) => e,
+                Error::ReadKernelDataStruct(e) => e,
                 Error::ReadKernelImage => "Failed to write kernel image to guest memory",
                 Error::SeekKernelStart => {
                     "Failed to seek to file offset as pointed by the ELF program header"

Original file line number	Diff line number	Diff line change
`@@ -49,10 +49,7 @@ impl fmt::Display for Error {`
`49`	`49`	`pub type Result<T> = result::Result<T, Error>;`
`50`	`50`
`51`	`51`	`fn valid_char(c: char) -> bool {`
`52`		`- match c {`
`53`		`- ' '..='~' => true,`
`54`		`- _ => false,`
`55`		`- }`
	`52`	`+ matches!(c, ' '..='~')`
`56`	`53`	`}`
`57`	`54`
`58`	`55`	`fn valid_str(s: &str) -> Result<()> {`
`@@ -164,7 +161,7 @@ impl Cmdline {`
`164`	`161`
`165`	`162`	`/// Returns the cmdline in progress as CString.`
`166`	`163`	`pub fn as_cstring(&self) -> Result<CString> {`
`167`		`- Ok(CString::new(self.line.clone()).map_err(\|_\| Error::InvalidAscii)?)`
	`164`	`+ CString::new(self.line.clone()).map_err(\|_\| Error::InvalidAscii)`
`168`	`165`	`}`
`169`	`166`	`}`
`170`	`167`