Cleanups, minor fixes to item locations

Author: CraftSpider

src/shims/files.rs

@@ -1,21 +1,14 @@
 use std::any::Any;
 use std::collections::BTreeMap;
 use std::io::{IsTerminal, Read, SeekFrom, Write};
-use std::{fs, io};
 use std::ops::Deref;
 use std::rc::{Rc, Weak};
+use std::{fs, io};
 
 use rustc_abi::Size;
 
-use crate::*;
 use crate::shims::unix::UnixFileDescription;
-
-#[derive(Debug, Clone, Copy, Eq, PartialEq)]
-pub(crate) enum FlockOp {
-    SharedLock { nonblocking: bool },
-    ExclusiveLock { nonblocking: bool },
-    Unlock,
-}
+use crate::*;
 
 /// Represents an open file description.
 pub trait FileDescription: std::fmt::Debug + Any {
@@ -70,9 +63,7 @@ pub trait FileDescription: std::fmt::Debug + Any {
     }
 
     fn metadata<'tcx>(&self) -> InterpResult<'tcx, io::Result<fs::Metadata>> {
-        throw_unsup_format!(
-            "obtaining metadata is only supported on file-backed file descriptors"
-        );
+        throw_unsup_format!("obtaining metadata is only supported on file-backed file descriptors");
     }
 
     fn is_tty(&self, _communicate_allowed: bool) -> bool {

src/shims/unix/fd.rs

@@ -6,10 +6,17 @@ use std::io::{self, ErrorKind};
 use rustc_abi::Size;
 
 use crate::helpers::check_min_arg_count;
+use crate::shims::files::FileDescription;
 use crate::shims::unix::linux::epoll::EpollReadyEvents;
 use crate::shims::unix::*;
 use crate::*;
-use crate::shims::files::{FileDescription, FlockOp};
+
+#[derive(Debug, Clone, Copy, Eq, PartialEq)]
+pub(crate) enum FlockOp {
+    SharedLock { nonblocking: bool },
+    ExclusiveLock { nonblocking: bool },
+    Unlock,
+}
 
 /// Represents unix-specific file descriptions.
 pub trait UnixFileDescription: FileDescription {

src/shims/unix/fs.rs

@@ -1,7 +1,10 @@
 //! File and file system access
 
 use std::borrow::Cow;
-use std::fs::{DirBuilder, File, FileType, OpenOptions, ReadDir, read_dir, remove_dir, remove_file, rename, Metadata};
+use std::fs::{
+    DirBuilder, File, FileType, Metadata, OpenOptions, ReadDir, read_dir, remove_dir, remove_file,
+    rename,
+};
 use std::io::{self, ErrorKind, IsTerminal, Read, Seek, SeekFrom, Write};
 use std::path::{Path, PathBuf};
 use std::time::SystemTime;
@@ -11,10 +14,10 @@ use rustc_data_structures::fx::FxHashMap;
 
 use self::shims::time::system_time_to_duration;
 use crate::helpers::check_min_arg_count;
+use crate::shims::files::{EvalContextExt as _, FileDescription, FileDescriptionRef};
 use crate::shims::os_str::bytes_to_os_str;
-use crate::shims::files::{FileDescription, FileDescriptionRef, FlockOp, EvalContextExt as _};
+use crate::shims::unix::fd::{FlockOp, UnixFileDescription};
 use crate::*;
-use crate::shims::unix::fd::UnixFileDescription;
 
 #[derive(Debug)]
 struct FileHandle {

src/shims/windows/foreign_items.rs

@@ -12,7 +12,7 @@ use crate::*;
 
 // The NTSTATUS STATUS_INVALID_HANDLE (0xC0000008) encoded as a HRESULT by setting the N bit.
 // (https://learn.microsoft.com/en-us/openspecs/windows_protocols/ms-erref/0642cb2f-2075-4469-918c-4441e69c548a)
-const STATUS_INVALID_HANDLE: u32 = 0xD0000008;
+// const STATUS_INVALID_HANDLE: u32 = 0xD0000008;
 
 pub fn is_dyn_sym(name: &str) -> bool {
     // std does dynamic detection for these symbols