Tidy up and de-glob several use declarations.

Author: sunfishcode

cap-async-std/src/fs/mod.rs

@@ -31,10 +31,10 @@ mod dir_entry;
 mod file;
 mod read_dir;
 
-pub use dir::*;
-pub use dir_entry::*;
-pub use file::*;
-pub use read_dir::*;
+pub use dir::Dir;
+pub use dir_entry::DirEntry;
+pub use file::File;
+pub use read_dir::ReadDir;
 
 // Re-export things from `cap_primitives` that we can use as-is.
 #[cfg(not(target_os = "wasi"))]

cap-async-std/src/fs_utf8/mod.rs

@@ -24,10 +24,10 @@ mod dir_entry;
 mod file;
 mod read_dir;
 
-pub use dir::*;
-pub use dir_entry::*;
-pub use file::*;
-pub use read_dir::*;
+pub use dir::Dir;
+pub use dir_entry::DirEntry;
+pub use file::File;
+pub use read_dir::ReadDir;
 
 // Re-export things from `cap_std::fs` that we can use as-is.
 pub use crate::fs::{DirBuilder, FileType, Metadata, OpenOptions, Permissions};

cap-directories/src/lib.rs

@@ -13,8 +13,8 @@ use std::io;
 mod project_dirs;
 mod user_dirs;
 
-pub use project_dirs::*;
-pub use user_dirs::*;
+pub use project_dirs::ProjectDirs;
+pub use user_dirs::UserDirs;
 
 #[cfg(not(windows))]
 pub(crate) fn not_found() -> io::Error {

cap-primitives/src/fs/mod.rs

@@ -52,34 +52,43 @@ pub(crate) use super::posish::fs::*;
 #[cfg(windows)]
 pub(crate) use super::windows::fs::*;
 
-pub use canonicalize::*;
-pub use copy::*;
-pub use create_dir::*;
-pub use dir_builder::*;
-pub use dir_entry::*;
-pub use dir_options::*;
-pub use file_type::*;
-pub use follow_symlinks::*;
-pub use hard_link::*;
+pub(crate) use read_dir::read_dir_unchecked;
+
+pub use canonicalize::canonicalize;
+pub use copy::copy;
+pub use create_dir::create_dir;
+pub use dir_builder::DirBuilder;
+pub use dir_entry::DirEntry;
+pub use dir_options::DirOptions;
+pub use file_type::FileType;
+#[cfg(windows)]
+pub use file_type::_WindowsFileTypeExt;
+pub use follow_symlinks::FollowSymlinks;
+pub use hard_link::hard_link;
 pub use is_file_read_write::is_file_read_write;
-pub use metadata::*;
-pub use open::*;
+pub use metadata::Metadata;
+#[cfg(windows)]
+pub use metadata::_WindowsByHandle;
+pub use open::open;
 pub use open_dir::*;
-pub use open_options::*;
-pub use permissions::*;
-pub use read_dir::*;
-pub use read_link::*;
-pub use remove_dir::*;
-pub use remove_dir_all::*;
-pub use remove_file::*;
-pub use remove_open_dir::*;
-pub use rename::*;
+pub use open_options::OpenOptions;
+pub use permissions::Permissions;
+pub use read_dir::{read_base_dir, read_dir, ReadDir};
+pub use read_link::read_link;
+pub use remove_dir::remove_dir;
+pub use remove_dir_all::remove_dir_all;
+pub use remove_file::remove_file;
+pub use remove_open_dir::{remove_open_dir, remove_open_dir_all};
+pub use rename::rename;
 pub use reopen::reopen;
-pub use set_permissions::*;
-pub use set_times::*;
-pub use stat::*;
-pub use symlink::*;
-pub use system_time_spec::*;
+pub use set_permissions::set_permissions;
+pub use set_times::{set_times, set_times_nofollow};
+pub use stat::stat;
+#[cfg(not(windows))]
+pub use symlink::symlink;
+#[cfg(windows)]
+pub use symlink::{symlink_dir, symlink_file};
+pub use system_time_spec::SystemTimeSpec;
 
 #[cfg(racy_asserts)]
 fn map_result<T: Clone>(result: &std::io::Result<T>) -> Result<T, (std::io::ErrorKind, String)> {

cap-primitives/src/posish/fs/copy.rs renamed to cap-primitives/src/posish/fs/copy_impl.rs

@@ -1,5 +1,5 @@
 mod c_str;
-mod copy;
+mod copy_impl;
 mod create_dir_unchecked;
 mod dir_entry_inner;
 mod dir_options_ext;
@@ -80,30 +80,30 @@ pub(crate) use crate::fs::{
 
 #[allow(unused_imports)]
 pub(crate) use c_str::c_str;
-pub(crate) use copy::*;
-pub(crate) use create_dir_unchecked::*;
-pub(crate) use dir_entry_inner::*;
-pub(crate) use dir_options_ext::*;
+pub(crate) use copy_impl::copy_impl;
+pub(crate) use create_dir_unchecked::create_dir_unchecked;
+pub(crate) use dir_entry_inner::DirEntryInner;
+pub(crate) use dir_options_ext::DirOptionsExt;
 pub(crate) use dir_utils::*;
-pub(crate) use file_type_ext::*;
-pub(crate) use hard_link_unchecked::*;
-pub(crate) use is_file_read_write_impl::*;
-pub(crate) use is_root_dir::*;
-pub(crate) use is_same_file::*;
-pub(crate) use metadata_ext::*;
-pub(crate) use open_options_ext::*;
-pub(crate) use open_unchecked::*;
-pub(crate) use permissions_ext::*;
-pub(crate) use read_dir_inner::*;
-pub(crate) use read_link_unchecked::*;
-pub(crate) use remove_dir_all_impl::*;
-pub(crate) use remove_dir_unchecked::*;
-pub(crate) use remove_file_unchecked::*;
-pub(crate) use remove_open_dir_by_searching::*;
-pub(crate) use rename_unchecked::*;
+pub(crate) use file_type_ext::FileTypeExt;
+pub(crate) use hard_link_unchecked::hard_link_unchecked;
+pub(crate) use is_file_read_write_impl::is_file_read_write_impl;
+pub(crate) use is_root_dir::is_root_dir;
+pub(crate) use is_same_file::is_same_file;
+pub(crate) use metadata_ext::MetadataExt;
+pub(crate) use open_options_ext::OpenOptionsExt;
+pub(crate) use open_unchecked::open_unchecked;
+pub(crate) use permissions_ext::PermissionsExt;
+pub(crate) use read_dir_inner::ReadDirInner;
+pub(crate) use read_link_unchecked::read_link_unchecked;
+pub(crate) use remove_dir_all_impl::{remove_dir_all_impl, remove_open_dir_all_impl};
+pub(crate) use remove_dir_unchecked::remove_dir_unchecked;
+pub(crate) use remove_file_unchecked::remove_file_unchecked;
+pub(crate) use remove_open_dir_by_searching::remove_open_dir_by_searching;
+pub(crate) use rename_unchecked::rename_unchecked;
 pub(crate) use reopen_impl::reopen_impl;
-pub(crate) use stat_unchecked::*;
-pub(crate) use symlink_unchecked::*;
+pub(crate) use stat_unchecked::stat_unchecked;
+pub(crate) use symlink_unchecked::symlink_unchecked;
 #[allow(unused_imports)]
 pub(crate) use times::{set_times_follow_unchecked, set_times_nofollow_unchecked};
 

cap-primitives/src/posish/fs/mod.rs

@@ -10,14 +10,14 @@ mod set_times_impl;
 mod stat_impl;
 
 pub(crate) use crate::fs::via_parent::set_times_nofollow as set_times_nofollow_impl;
-pub(crate) use canonicalize_impl::*;
-pub(crate) use ensure_cloexec::*;
-pub(crate) use file_path::*;
-pub(crate) use open_entry_impl::*;
-pub(crate) use open_impl::*;
-pub(crate) use set_permissions_impl::*;
-pub(crate) use set_times_impl::*;
-pub(crate) use stat_impl::*;
+pub(crate) use canonicalize_impl::canonicalize_impl;
+pub(crate) use ensure_cloexec::ensure_cloexec;
+pub(crate) use file_path::file_path;
+pub(crate) use open_entry_impl::open_entry_impl;
+pub(crate) use open_impl::{open_beneath, open_impl};
+pub(crate) use set_permissions_impl::set_permissions_impl;
+pub(crate) use set_times_impl::set_times_impl;
+pub(crate) use stat_impl::stat_impl;
 
 use file_metadata::file_metadata;
 

cap-primitives/src/posish/linux/fs/mod.rs

@@ -31,10 +31,10 @@ mod dir_entry;
 mod file;
 mod read_dir;
 
-pub use dir::*;
-pub use dir_entry::*;
-pub use file::*;
-pub use read_dir::*;
+pub use dir::Dir;
+pub use dir_entry::DirEntry;
+pub use file::File;
+pub use read_dir::ReadDir;
 
 // Re-export things from `cap_primitives` that we can use as-is.
 #[cfg(not(target_os = "wasi"))]

cap-std/src/fs/mod.rs

@@ -24,10 +24,10 @@ mod dir_entry;
 mod file;
 mod read_dir;
 
-pub use dir::*;
-pub use dir_entry::*;
-pub use file::*;
-pub use read_dir::*;
+pub use dir::Dir;
+pub use dir_entry::DirEntry;
+pub use file::File;
+pub use read_dir::ReadDir;
 
 // Re-export things from `cap_std::fs` that we can use as-is.
 pub use crate::fs::{DirBuilder, FileType, Metadata, OpenOptions, Permissions};