Clippy fixes

This commit is contained in:
Jeremy Soller
2022-11-11 13:19:14 -07:00
parent 515a03b870
commit 8e0f54cb31
27 changed files with 76 additions and 87 deletions
+7 -7
View File
@@ -24,7 +24,7 @@ pub fn file_op(a: usize, fd: FileHandle, c: usize, d: usize) -> Result<usize> {
let scheme = {
let schemes = scheme::schemes();
let scheme = schemes.get(file.description.read().scheme).ok_or(Error::new(EBADF))?;
Arc::clone(&scheme)
Arc::clone(scheme)
};
let mut packet = Packet {
@@ -71,7 +71,7 @@ pub fn open(path: &str, flags: usize) -> Result<FileHandle> {
let (scheme_id, scheme) = {
let schemes = scheme::schemes();
let (scheme_id, scheme) = schemes.get_name(scheme_ns, scheme_name).ok_or(Error::new(ENODEV))?;
(scheme_id, Arc::clone(&scheme))
(scheme_id, Arc::clone(scheme))
};
(scheme_id, scheme.open(reference, flags, uid, gid)?)
@@ -142,7 +142,7 @@ pub fn rmdir(path: &str) -> Result<usize> {
let scheme = {
let schemes = scheme::schemes();
let (_scheme_id, scheme) = schemes.get_name(scheme_ns, scheme_name).ok_or(Error::new(ENODEV))?;
Arc::clone(&scheme)
Arc::clone(scheme)
};
scheme.rmdir(reference, uid, gid)
}
@@ -163,7 +163,7 @@ pub fn unlink(path: &str) -> Result<usize> {
let scheme = {
let schemes = scheme::schemes();
let (_scheme_id, scheme) = schemes.get_name(scheme_ns, scheme_name).ok_or(Error::new(ENODEV))?;
Arc::clone(&scheme)
Arc::clone(scheme)
};
scheme.unlink(reference, uid, gid)
}
@@ -200,7 +200,7 @@ fn duplicate_file(fd: FileHandle, buf: &[u8]) -> Result<FileDescriptor> {
let scheme = {
let schemes = scheme::schemes();
let scheme = schemes.get(description.scheme).ok_or(Error::new(EBADF))?;
Arc::clone(&scheme)
Arc::clone(scheme)
};
scheme.dup(description.number, buf)?
};
@@ -260,7 +260,7 @@ pub fn fcntl(fd: FileHandle, cmd: usize, arg: usize) -> Result<usize> {
let scheme = {
let schemes = scheme::schemes();
let scheme = schemes.get(description.scheme).ok_or(Error::new(EBADF))?;
Arc::clone(&scheme)
Arc::clone(scheme)
};
scheme.fcntl(description.number, cmd, arg)?;
};
@@ -354,7 +354,7 @@ pub fn fstat(fd: FileHandle, stat: &mut Stat) -> Result<usize> {
let scheme = {
let schemes = scheme::schemes();
let scheme = schemes.get(description.scheme).ok_or(Error::new(EBADF))?;
Arc::clone(&scheme)
Arc::clone(scheme)
};
// Fill in scheme number as device number
stat.st_dev = description.scheme.into() as u64;
+2 -2
View File
@@ -80,7 +80,7 @@ pub fn futex(addr: usize, op: usize, val: usize, val2: usize, addr2: usize) -> R
let context_lock = {
let contexts = context::contexts();
let context_lock = contexts.current().ok_or(Error::new(ESRCH))?;
Arc::clone(&context_lock)
Arc::clone(context_lock)
};
// TODO: Is the implicit SeqCst ordering too strong here?
@@ -127,7 +127,7 @@ pub fn futex(addr: usize, op: usize, val: usize, val2: usize, addr2: usize) -> R
let context_lock = {
let contexts = context::contexts();
let context_lock = contexts.current().ok_or(Error::new(ESRCH))?;
Arc::clone(&context_lock)
Arc::clone(context_lock)
};
{
+2 -2
View File
@@ -67,7 +67,7 @@ pub fn exit(status: usize) -> ! {
{
let context_lock = context::current().expect("exit failed to find context");
let mut close_files;
let close_files;
let pid = {
let mut context = context_lock.write();
close_files = Arc::try_unwrap(mem::take(&mut context.files)).map_or_else(|_| Vec::new(), RwLock::into_inner);
@@ -91,7 +91,7 @@ pub fn exit(status: usize) -> ! {
}
// Files must be closed while context is valid so that messages can be passed
for (_fd, file_opt) in close_files.drain(..).enumerate() {
for (_fd, file_opt) in close_files.into_iter().enumerate() {
if let Some(file) = file_opt {
let _ = file.close();
}