Skip to content

Commit fcdb04f

Browse files
committed
Merge branch 'clippy' into 'master'
Fix some clippy warnings See merge request redox-os/uefi!11
2 parents 98175c2 + 6f87042 commit fcdb04f

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

crates/uefi_std/src/exec.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn exec_data(data: &[u8], name: &str, args: &[&str]) -> Result<usize> {
1717
for arg in args.iter() {
1818
cmdline.push_str(" \"");
1919
cmdline.push_str(arg);
20-
cmdline.push_str("\"");
20+
cmdline.push('"');
2121
}
2222
cmdline.push('\0');
2323

crates/uefi_std/src/fs.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use core::{mem, slice};
1+
use core::{mem, ptr, slice};
22
use uefi::fs::{File as InnerFile, FileInfo, SimpleFileSystem, FILE_MODE_READ};
33
use uefi::guid::{Guid, FILE_INFO_ID, FILE_SYSTEM_GUID};
44
use uefi::status::{Error, Result};
@@ -20,7 +20,7 @@ impl Protocol<SimpleFileSystem> for FileSystem {
2020

2121
impl FileSystem {
2222
pub fn root(&mut self) -> Result<Dir> {
23-
let mut interface = 0 as *mut InnerFile;
23+
let mut interface = ptr::null_mut::<InnerFile>();
2424
(self.0.OpenVolume)(self.0, &mut interface)?;
2525

2626
Ok(Dir(File(unsafe { &mut *interface })))
@@ -84,7 +84,7 @@ pub struct Dir(pub File);
8484

8585
impl Dir {
8686
pub fn open(&mut self, filename: &[u16]) -> Result<File> {
87-
let mut interface = 0 as *mut InnerFile;
87+
let mut interface = ptr::null_mut::<InnerFile>();
8888
((self.0).0.Open)((self.0).0, &mut interface, filename.as_ptr(), FILE_MODE_READ, 0)?;
8989

9090
Ok(File(unsafe { &mut *interface }))

crates/uefi_std/src/proto.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ pub trait Protocol<T: 'static> {
4848
}
4949

5050
fn all() -> Vec<Self> where Self: Sized {
51-
Self::locate_handle().unwrap_or(Vec::new())
51+
Self::locate_handle().unwrap_or_default()
5252
}
5353
}

crates/uefi_std/src/vars.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ pub fn get_boot_item(num: u16) -> Result<Vec<u8>> {
8585
}
8686

8787
pub fn set_boot_item(num: u16, data: &[u8]) -> Result<usize> {
88-
set(&format!("Boot{:>04X}", num), &data)
88+
set(&format!("Boot{:>04X}", num), data)
8989
}
9090

9191
pub fn get_os_indications() -> Result<u64> {

0 commit comments

Comments
 (0)