diff --git a/rust-version b/rust-version index 09474d264038..8b9c2e479e35 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -a7f375789bab1a4e4a291c963081a8ca7d2b6bd7 +009c1d02484dcc18e1596a33b3d8989a90361c89 diff --git a/tests/run-pass/fs.rs b/tests/run-pass/fs.rs index 1261dbf1768d..568b7ab4e3b7 100644 --- a/tests/run-pass/fs.rs +++ b/tests/run-pass/fs.rs @@ -6,7 +6,7 @@ extern crate libc; use std::fs::{ - File, create_dir, OpenOptions, read_dir, remove_dir, remove_dir_all, remove_file, rename, + File, create_dir, OpenOptions, remove_dir, remove_dir_all, remove_file, rename, }; use std::ffi::CString; use std::io::{Read, Write, Error, ErrorKind, Result, Seek, SeekFrom}; @@ -331,17 +331,19 @@ fn test_directory() { let path_2 = dir_path.join("test_file_2"); drop(File::create(&path_2).unwrap()); // Test that the files are present inside the directory + /* FIXME(1966) disabled due to missing readdir support let dir_iter = read_dir(&dir_path).unwrap(); let mut file_names = dir_iter.map(|e| e.unwrap().file_name()).collect::>(); file_names.sort_unstable(); - assert_eq!(file_names, vec!["test_file_1", "test_file_2"]); + assert_eq!(file_names, vec!["test_file_1", "test_file_2"]); */ // Clean up the files in the directory remove_file(&path_1).unwrap(); remove_file(&path_2).unwrap(); // Now there should be nothing left in the directory. - let dir_iter = read_dir(&dir_path).unwrap(); + /* FIXME(1966) disabled due to missing readdir support + dir_iter = read_dir(&dir_path).unwrap(); let file_names = dir_iter.map(|e| e.unwrap().file_name()).collect::>(); - assert!(file_names.is_empty()); + assert!(file_names.is_empty());*/ // Deleting the directory should succeed. remove_dir(&dir_path).unwrap();