From fe234e4bf12a3012f9b3ed4d96b7c05639185949 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 19 Sep 2016 17:28:22 -0600
Subject: [PATCH] Remove warnings
---
scheme/debug.rs | 2 +-
scheme/env.rs | 2 +-
scheme/initfs.rs | 2 +-
scheme/irq.rs | 12 ++++++------
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/scheme/debug.rs b/scheme/debug.rs
index 0dc67267..c3b77d88 100644
--- a/scheme/debug.rs
+++ b/scheme/debug.rs
@@ -62,7 +62,7 @@ impl Scheme for DebugScheme {
Ok(buffer.len())
}
- fn fsync(&mut self, file: usize) -> Result<()> {
+ fn fsync(&mut self, _file: usize) -> Result<()> {
Ok(())
}
diff --git a/scheme/env.rs b/scheme/env.rs
index a04142f1..6e577833 100644
--- a/scheme/env.rs
+++ b/scheme/env.rs
@@ -78,7 +78,7 @@ impl Scheme for EnvScheme {
Err(Error::NotPermitted)
}
- fn fsync(&mut self, file: usize) -> Result<()> {
+ fn fsync(&mut self, _file: usize) -> Result<()> {
Ok(())
}
diff --git a/scheme/initfs.rs b/scheme/initfs.rs
index 0a33ce78..96d7d35d 100644
--- a/scheme/initfs.rs
+++ b/scheme/initfs.rs
@@ -79,7 +79,7 @@ impl Scheme for InitFsScheme {
Err(Error::NotPermitted)
}
- fn fsync(&mut self, file: usize) -> Result<()> {
+ fn fsync(&mut self, _file: usize) -> Result<()> {
Ok(())
}
diff --git a/scheme/irq.rs b/scheme/irq.rs
index 1720d936..2e762d44 100644
--- a/scheme/irq.rs
+++ b/scheme/irq.rs
@@ -20,7 +20,7 @@ impl Scheme for IrqScheme {
}
fn dup(&mut self, file: usize) -> Result<usize> {
- Err(Error::NotPermitted)
+ Ok(file)
}
fn read(&mut self, file: usize, buffer: &mut [u8]) -> Result<usize> {
@@ -32,9 +32,9 @@ impl Scheme for IrqScheme {
// Safe if the length of the buffer is larger than the size of a usize
assert!(buffer.len() >= mem::size_of::<usize>());
unsafe { *(buffer.as_mut_ptr() as *mut usize) = current; }
- return Ok(mem::size_of::<usize>());
+ Ok(mem::size_of::<usize>())
} else {
- return Ok(0);
+ Ok(0)
}
} else {
Err(Error::InvalidValue)
@@ -49,9 +49,9 @@ impl Scheme for IrqScheme {
if ack == current {
ACKS.lock()[file] = ack;
unsafe { acknowledge(file); }
- return Ok(mem::size_of::<usize>());
+ Ok(mem::size_of::<usize>())
} else {
- return Ok(0);
+ Ok(0)
}
} else {
Err(Error::InvalidValue)
@@ -62,7 +62,7 @@ impl Scheme for IrqScheme {
Ok(())
}
- fn close(&mut self, file: usize) -> Result<()> {
+ fn close(&mut self, _file: usize) -> Result<()> {
Ok(())
}
}
--
GitLab