Add comment and simplify hiberfil_sys test

ChrisDenton · ChrisDenton · commit 2d0650457f57 · 2022-07-05T12:05:51.000+01:00
diff --git a/library/std/src/fs/tests.rs b/library/std/src/fs/tests.rs
@@ -1535,13 +1535,14 @@ fn read_large_dir() {
     }
 }
 
+/// Test the fallback for getting the metadata of files like hiberfil.sys that
+/// Windows holds a special lock on, preventing normal means of querying
+/// metadata. See #96980.
 #[test]
 #[cfg(windows)]
 fn hiberfil_sys() {
-    // Get the system drive, which is usually `C:`.
-    let mut hiberfil = crate::env::var("SystemDrive").unwrap();
-    hiberfil.push_str(r"\hiberfil.sys");
+    let hiberfil = r"C:\hiberfil.sys";
 
-    fs::metadata(&hiberfil).unwrap();
-    fs::symlink_metadata(&hiberfil).unwrap();
+    fs::metadata(hiberfil).unwrap();
+    fs::symlink_metadata(hiberfil).unwrap();
 }

Original file line number	Diff line number	Diff line change
`@@ -1535,13 +1535,14 @@ fn read_large_dir() {`
`1535`	`1535`	`}`
`1536`	`1536`	`}`
`1537`	`1537`
	`1538`	`+/// Test the fallback for getting the metadata of files like hiberfil.sys that`
	`1539`	`+/// Windows holds a special lock on, preventing normal means of querying`
	`1540`	`+/// metadata. See #96980.`
`1538`	`1541`	`#[test]`
`1539`	`1542`	`#[cfg(windows)]`
`1540`	`1543`	`fn hiberfil_sys() {`
`1541`		- // Get the system drive, which is usually `C:`.
`1542`		`- let mut hiberfil = crate::env::var("SystemDrive").unwrap();`
`1543`		`- hiberfil.push_str(r"\hiberfil.sys");`
	`1544`	`+ let hiberfil = r"C:\hiberfil.sys";`
`1544`	`1545`
`1545`		`- fs::metadata(&hiberfil).unwrap();`
`1546`		`- fs::symlink_metadata(&hiberfil).unwrap();`
	`1546`	`+ fs::metadata(hiberfil).unwrap();`
	`1547`	`+ fs::symlink_metadata(hiberfil).unwrap();`
`1547`	`1548`	`}`