fix doctests, add real tests

Author: Qelxiros

library/std/src/fs.rs

@@ -143,6 +143,7 @@ pub enum TryLockError {
 /// Opens a directory and then a file inside it.
 ///
 /// ```no_run
+/// #![feature(dirfd)]
 /// use std::fs::Dir;
 ///
 /// fn main() -> std::io::Result<()> {
@@ -1440,7 +1441,8 @@ impl Dir {
     /// # Examples
     ///
     /// ```no_run
-    /// use std::fs::Dir;
+    /// #![feature(dirfd)]
+    /// use std::{fs::Dir, io::Read};
     ///
     /// fn main() -> std::io::Result<()> {
     ///     let dir = Dir::new("foo")?;
@@ -1469,7 +1471,8 @@ impl Dir {
     /// # Examples
     ///
     /// ```no_run
-    /// use std::fs::Dir;
+    /// #![feature(dirfd)]
+    /// use std::fs::{Dir, OpenOptions};
     ///
     /// fn main() -> std::io::Result<()> {
     ///     let dir = Dir::new_with("foo", OpenOptions::new().write(true))?;
@@ -1482,7 +1485,7 @@ impl Dir {
         Ok(Self { inner: fs_imp::Dir::new_with(path, &opts.0)? })
     }
 
-    /// Attempts to open a file relative to this directory.
+    /// Attempts to open a file in read-only mode relative to this directory.
     ///
     /// # Errors
     ///
@@ -1494,7 +1497,8 @@ impl Dir {
     /// # Examples
     ///
     /// ```no_run
-    /// use std::fs::Dir;
+    /// #![feature(dirfd)]
+    /// use std::{fs::Dir, io::Read};
     ///
     /// fn main() -> std::io::Result<()> {
     ///     let dir = Dir::new("foo")?;
@@ -1521,7 +1525,8 @@ impl Dir {
     /// # Examples
     ///
     /// ```no_run
-    /// use std::fs::Dir;
+    /// #![feature(dirfd)]
+    /// use std::{fs::{Dir, OpenOptions}, io::Read};
     ///
     /// fn main() -> std::io::Result<()> {
     ///     let dir = Dir::new("foo")?;
@@ -1548,6 +1553,7 @@ impl Dir {
     /// # Examples
     ///
     /// ```no_run
+    /// #![feature(dirfd)]
     /// use std::fs::Dir;
     ///
     /// fn main() -> std::io::Result<()> {
@@ -1574,6 +1580,7 @@ impl Dir {
     /// # Examples
     ///
     /// ```no_run
+    /// #![feature(dirfd)]
     /// use std::fs::Dir;
     ///
     /// fn main() -> std::io::Result<()> {
@@ -1600,6 +1607,7 @@ impl Dir {
     /// # Examples
     ///
     /// ```no_run
+    /// #![feature(dirfd)]
     /// use std::fs::Dir;
     ///
     /// fn main() -> std::io::Result<()> {

library/std/src/fs/tests.rs

@@ -1,5 +1,6 @@
 use rand::RngCore;
 
+use super::Dir;
 #[cfg(any(
     windows,
     target_os = "freebsd",
@@ -17,7 +18,7 @@ use crate::char::MAX_LEN_UTF8;
     target_vendor = "apple",
 ))]
 use crate::fs::TryLockError;
-use crate::fs::{self, File, FileTimes, OpenOptions};
+use crate::fs::{self, File, FileTimes, OpenOptions, create_dir};
 use crate::io::prelude::*;
 use crate::io::{BorrowedBuf, ErrorKind, SeekFrom};
 use crate::mem::MaybeUninit;
@@ -2024,3 +2025,85 @@ fn test_rename_junction() {
     // Junction links are always absolute so we just check the file name is correct.
     assert_eq!(fs::read_link(&dest).unwrap().file_name(), Some(not_exist.as_os_str()));
 }
+
+#[test]
+fn test_dir_smoke_test() {
+    let tmpdir = tmpdir();
+    check!(Dir::new(tmpdir.path()));
+}
+
+#[test]
+fn test_dir_read_file() {
+    let tmpdir = tmpdir();
+    let mut f = check!(File::create(tmpdir.join("foo.txt")));
+    check!(f.write(b"bar"));
+    check!(f.flush());
+    drop(f);
+    let dir = check!(Dir::new(tmpdir.path()));
+    let mut f = check!(dir.open("foo.txt"));
+    let mut buf = [0u8; 3];
+    check!(f.read_exact(&mut buf));
+    assert_eq!(b"bar", &buf);
+}
+
+#[test]
+fn test_dir_write_file() {
+    let tmpdir = tmpdir();
+    let dir = check!(Dir::new(tmpdir.path()));
+    let mut f = check!(dir.open_with("foo.txt", &OpenOptions::new().write(true).create(true)));
+    check!(f.write(b"bar"));
+    check!(f.flush());
+    drop(f);
+    let mut f = check!(File::open(tmpdir.join("foo.txt")));
+    let mut buf = [0u8; 3];
+    check!(f.read_exact(&mut buf));
+    assert_eq!(b"bar", &buf);
+}
+
+#[test]
+fn test_dir_remove_file() {
+    let tmpdir = tmpdir();
+    let mut f = check!(File::create(tmpdir.join("foo.txt")));
+    check!(f.write(b"bar"));
+    check!(f.flush());
+    drop(f);
+    let dir = check!(Dir::new(tmpdir.path()));
+    check!(dir.remove_file("foo.txt"));
+    let result = File::open(tmpdir.join("foo.txt"));
+    #[cfg(all(unix, not(target_os = "vxworks")))]
+    error!(result, "No such file or directory");
+    #[cfg(target_os = "vxworks")]
+    error!(result, "no such file or directory");
+    #[cfg(windows)]
+    error!(result, 2); // ERROR_FILE_NOT_FOUND
+}
+
+#[test]
+fn test_dir_remove_dir() {
+    let tmpdir = tmpdir();
+    check!(create_dir(tmpdir.join("foo")));
+    let dir = check!(Dir::new(tmpdir.path()));
+    check!(dir.remove_dir("foo"));
+    let result = Dir::new(tmpdir.join("foo"));
+    #[cfg(all(unix, not(target_os = "vxworks")))]
+    error!(result, "No such file or directory");
+    #[cfg(target_os = "vxworks")]
+    error!(result, "no such file or directory");
+    #[cfg(windows)]
+    error!(result, 2); // ERROR_FILE_NOT_FOUND
+}
+
+#[test]
+fn test_dir_rename_file() {
+    let tmpdir = tmpdir();
+    let mut f = check!(File::create(tmpdir.join("foo.txt")));
+    check!(f.write(b"bar"));
+    check!(f.flush());
+    drop(f);
+    let dir = check!(Dir::new(tmpdir.path()));
+    check!(dir.rename("foo.txt", &dir, "baz.txt"));
+    let mut f = check!(File::open(tmpdir.join("baz.txt")));
+    let mut buf = [0u8; 3];
+    check!(f.read_exact(&mut buf));
+    assert_eq!(b"bar", &buf);
+}