Review fixes - comments and style

Author: CraftSpider

Cargo.toml

@@ -43,7 +43,6 @@ libloading = "0.8"
 [target.'cfg(target_family = "windows")'.dependencies]
 windows-sys = { version = "0.59", features = [
     "Win32_Foundation",
-    "Win32_Security",
     "Win32_System_IO",
     "Win32_Storage_FileSystem",
 ] }

src/shims/windows/fs.rs

@@ -251,18 +251,18 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
         }
 
         let handle = if is_dir {
-            let fh = &mut this.machine.fds;
-            let fd_num = fh.insert_new(DirHandle { path: file_name });
+            // Open this as a directory.
+            let fd_num = this.machine.fds.insert_new(DirHandle { path: file_name });
             Ok(Handle::File(fd_num))
         } else if creation_disposition == OpenExisting && !(desired_read || desired_write) {
             // Windows supports handles with no permissions. These allow things such as reading
             // metadata, but not file content.
-            let fh = &mut this.machine.fds;
             file_name.metadata().map(|meta| {
-                let fd_num = fh.insert_new(MetadataHandle { meta });
+                let fd_num = this.machine.fds.insert_new(MetadataHandle { meta });
                 Handle::File(fd_num)
             })
         } else {
+            // Open this as a standard file.
             match creation_disposition {
                 CreateAlways | OpenAlways => {
                     options.create(true);
@@ -286,8 +286,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
             }
 
             options.open(file_name).map(|file| {
-                let fh = &mut this.machine.fds;
-                let fd_num = fh.insert_new(FileHandle { file, writable: desired_write });
+                let fd_num =
+                    this.machine.fds.insert_new(FileHandle { file, writable: desired_write });
                 Handle::File(fd_num)
             })
         };

tests/pass/shims/fs.rs

@@ -17,6 +17,7 @@ mod utils;
 
 fn main() {
     test_path_conversion();
+    // Windows file handling is very incomplete.
     if cfg!(not(windows)) {
         test_file();
         test_file_create_new();