Merge pull request #1086 from stlankes/mio

remove obsolete code

src/fd/mod.rs

@@ -281,9 +281,6 @@ pub(crate) trait ObjectInterface: Sync + Send + core::fmt::Debug + DynClone {
 	fn ioctl(&self, _cmd: IoCtl, _value: bool) -> Result<(), IoError> {
 		Err(IoError::ENOSYS)
 	}
-
-	// close a file descriptor
-	fn close(&self) {}
 }
 
 pub(crate) fn open(
@@ -306,10 +303,6 @@ pub(crate) fn open(
 	}
 }
 
-pub(crate) fn close(fd: FileDescriptor) {
-	let _ = remove_object(fd).map(|v| v.close());
-}
-
 pub(crate) fn read(fd: FileDescriptor, buf: &mut [u8]) -> Result<usize, IoError> {
 	let obj = get_object(fd)?;
 

src/fs/mod.rs

@@ -12,7 +12,9 @@ use alloc::vec::Vec;
 use hermit_sync::OnceCell;
 use mem::MemDirectory;
 
-use crate::fd::{insert_object, AccessPermission, IoError, ObjectInterface, OpenOption};
+use crate::fd::{
+	insert_object, remove_object, AccessPermission, IoError, ObjectInterface, OpenOption,
+};
 use crate::io::Write;
 use crate::time::{timespec, SystemTime};
 
@@ -488,6 +490,6 @@ impl crate::io::Write for File {
 
 impl Drop for File {
 	fn drop(&mut self) {
-		fd::close(self.fd);
+		let _ = remove_object(self.fd);
 	}
 }

src/syscalls/mod.rs

@@ -247,13 +247,7 @@ pub extern "C" fn sys_open(name: *const u8, flags: i32, mode: u32) -> FileDescri
 
 extern "C" fn __sys_close(fd: FileDescriptor) -> i32 {
 	let obj = remove_object(fd);
-	obj.map_or_else(
-		|e| -num::ToPrimitive::to_i32(&e).unwrap(),
-		|v| {
-			v.close();
-			0
-		},
-	)
+	obj.map_or_else(|e| -num::ToPrimitive::to_i32(&e).unwrap(), |_| 0)
 }
 
 #[no_mangle]