Merge #6679

6679: Extract tests module to file in vfs crate r=matklad a=sasurau4

Helps with #6522 

- [x] passed `cargo test`

Co-authored-by: Daiki Ihara <[email protected]>

Author: bors[bot]

crates/vfs/src/file_set.rs

@@ -158,53 +158,4 @@ impl fst::Automaton for PrefixOf<'_> {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn path_prefix() {
-        let mut file_set = FileSetConfig::builder();
-        file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo".into())]);
-        file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo/bar/baz".into())]);
-        let file_set = file_set.build();
-
-        let mut vfs = Vfs::default();
-        vfs.set_file_contents(
-            VfsPath::new_virtual_path("/foo/src/lib.rs".into()),
-            Some(Vec::new()),
-        );
-        vfs.set_file_contents(
-            VfsPath::new_virtual_path("/foo/src/bar/baz/lib.rs".into()),
-            Some(Vec::new()),
-        );
-        vfs.set_file_contents(
-            VfsPath::new_virtual_path("/foo/bar/baz/lib.rs".into()),
-            Some(Vec::new()),
-        );
-        vfs.set_file_contents(VfsPath::new_virtual_path("/quux/lib.rs".into()), Some(Vec::new()));
-
-        let partition = file_set.partition(&vfs).into_iter().map(|it| it.len()).collect::<Vec<_>>();
-        assert_eq!(partition, vec![2, 1, 1]);
-    }
-
-    #[test]
-    fn name_prefix() {
-        let mut file_set = FileSetConfig::builder();
-        file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo".into())]);
-        file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo-things".into())]);
-        let file_set = file_set.build();
-
-        let mut vfs = Vfs::default();
-        vfs.set_file_contents(
-            VfsPath::new_virtual_path("/foo/src/lib.rs".into()),
-            Some(Vec::new()),
-        );
-        vfs.set_file_contents(
-            VfsPath::new_virtual_path("/foo-things/src/lib.rs".into()),
-            Some(Vec::new()),
-        );
-
-        let partition = file_set.partition(&vfs).into_iter().map(|it| it.len()).collect::<Vec<_>>();
-        assert_eq!(partition, vec![1, 1, 0]);
-    }
-}
+mod tests;

crates/vfs/src/file_set/tests.rs

@@ -0,0 +1,42 @@
+use super::*;
+
+#[test]
+fn path_prefix() {
+    let mut file_set = FileSetConfig::builder();
+    file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo".into())]);
+    file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo/bar/baz".into())]);
+    let file_set = file_set.build();
+
+    let mut vfs = Vfs::default();
+    vfs.set_file_contents(VfsPath::new_virtual_path("/foo/src/lib.rs".into()), Some(Vec::new()));
+    vfs.set_file_contents(
+        VfsPath::new_virtual_path("/foo/src/bar/baz/lib.rs".into()),
+        Some(Vec::new()),
+    );
+    vfs.set_file_contents(
+        VfsPath::new_virtual_path("/foo/bar/baz/lib.rs".into()),
+        Some(Vec::new()),
+    );
+    vfs.set_file_contents(VfsPath::new_virtual_path("/quux/lib.rs".into()), Some(Vec::new()));
+
+    let partition = file_set.partition(&vfs).into_iter().map(|it| it.len()).collect::<Vec<_>>();
+    assert_eq!(partition, vec![2, 1, 1]);
+}
+
+#[test]
+fn name_prefix() {
+    let mut file_set = FileSetConfig::builder();
+    file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo".into())]);
+    file_set.add_file_set(vec![VfsPath::new_virtual_path("/foo-things".into())]);
+    let file_set = file_set.build();
+
+    let mut vfs = Vfs::default();
+    vfs.set_file_contents(VfsPath::new_virtual_path("/foo/src/lib.rs".into()), Some(Vec::new()));
+    vfs.set_file_contents(
+        VfsPath::new_virtual_path("/foo-things/src/lib.rs".into()),
+        Some(Vec::new()),
+    );
+
+    let partition = file_set.partition(&vfs).into_iter().map(|it| it.len()).collect::<Vec<_>>();
+    assert_eq!(partition, vec![1, 1, 0]);
+}

crates/vfs/src/vfs_path.rs

@@ -311,35 +311,4 @@ impl VirtualPath {
 }
 
 #[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn virtual_path_extensions() {
-        assert_eq!(VirtualPath("/".to_string()).name_and_extension(), None);
-        assert_eq!(
-            VirtualPath("/directory".to_string()).name_and_extension(),
-            Some(("directory", None))
-        );
-        assert_eq!(
-            VirtualPath("/directory/".to_string()).name_and_extension(),
-            Some(("directory", None))
-        );
-        assert_eq!(
-            VirtualPath("/directory/file".to_string()).name_and_extension(),
-            Some(("file", None))
-        );
-        assert_eq!(
-            VirtualPath("/directory/.file".to_string()).name_and_extension(),
-            Some((".file", None))
-        );
-        assert_eq!(
-            VirtualPath("/directory/.file.rs".to_string()).name_and_extension(),
-            Some((".file", Some("rs")))
-        );
-        assert_eq!(
-            VirtualPath("/directory/file.rs".to_string()).name_and_extension(),
-            Some(("file", Some("rs")))
-        );
-    }
-}
+mod tests;

crates/vfs/src/vfs_path/tests.rs

@@ -0,0 +1,30 @@
+use super::*;
+
+#[test]
+fn virtual_path_extensions() {
+    assert_eq!(VirtualPath("/".to_string()).name_and_extension(), None);
+    assert_eq!(
+        VirtualPath("/directory".to_string()).name_and_extension(),
+        Some(("directory", None))
+    );
+    assert_eq!(
+        VirtualPath("/directory/".to_string()).name_and_extension(),
+        Some(("directory", None))
+    );
+    assert_eq!(
+        VirtualPath("/directory/file".to_string()).name_and_extension(),
+        Some(("file", None))
+    );
+    assert_eq!(
+        VirtualPath("/directory/.file".to_string()).name_and_extension(),
+        Some((".file", None))
+    );
+    assert_eq!(
+        VirtualPath("/directory/.file.rs".to_string()).name_and_extension(),
+        Some((".file", Some("rs")))
+    );
+    assert_eq!(
+        VirtualPath("/directory/file.rs".to_string()).name_and_extension(),
+        Some(("file", Some("rs")))
+    );
+}