refactor (#386)

Author: Byron

git-sec/src/lib.rs

@@ -22,63 +22,59 @@ pub mod identity {
         pub password: String,
     }
 
+    use std::borrow::Cow;
+    use std::path::Path;
+
+    /// Obtain the owner of the given `path`.
+    pub fn from_path(path: Cow<'_, Path>) -> std::io::Result<UserId> {
+        impl_::from_path(path)
+    }
+
+    /// Obtain the of the currently running process.
+    pub fn from_process() -> Result<UserId, from_process::Error> {
+        impl_::from_process()
+    }
+
     ///
-    pub mod user_id {
+    pub mod from_process {
+        use crate::identity::impl_;
+
+        /// The error returned by [from_process()][super::from_process()].
+        pub type Error = impl_::FromProcessError;
+    }
+
+    #[cfg(not(windows))]
+    mod impl_ {
         use crate::identity::UserId;
         use std::borrow::Cow;
         use std::path::Path;
 
-        /// Obtain the owner of the given `path`.
         pub fn from_path(path: Cow<'_, Path>) -> std::io::Result<UserId> {
-            impl_::from_path(path)
+            use std::os::unix::fs::MetadataExt;
+            let meta = std::fs::symlink_metadata(path)?;
+            Ok(meta.uid())
         }
 
-        /// Obtain the of the currently running process.
-        pub fn from_process() -> Result<UserId, from_process::Error> {
-            impl_::from_process()
+        pub type FromProcessError = std::convert::Infallible;
+        pub fn from_process() -> Result<UserId, FromProcessError> {
+            // SAFETY: there is no documented possibility for failure
+            #[allow(unsafe_code)]
+            let uid = unsafe { libc::geteuid() };
+            Ok(uid)
         }
+    }
 
-        ///
-        pub mod from_process {
-            use crate::identity::user_id::impl_;
-
-            /// The error returned by [from_process()][super::from_process()].
-            pub type Error = impl_::FromProcessError;
-        }
-
-        #[cfg(not(windows))]
-        mod impl_ {
-            use crate::identity::UserId;
-            use std::borrow::Cow;
-            use std::path::Path;
-
-            pub fn from_path(path: Cow<'_, Path>) -> std::io::Result<UserId> {
-                use std::os::unix::fs::MetadataExt;
-                let meta = std::fs::symlink_metadata(path)?;
-                Ok(meta.uid())
-            }
+    #[cfg(windows)]
+    mod impl_ {
+        use crate::identity::UserId;
+        use std::borrow::Cow;
+        use std::path::Path;
 
-            pub type FromProcessError = std::convert::Infallible;
-            pub fn from_process() -> Result<UserId, FromProcessError> {
-                // SAFETY: there is no documented possibility for failure
-                #[allow(unsafe_code)]
-                let uid = unsafe { libc::geteuid() };
-                Ok(uid)
-            }
+        pub fn from_path(path: Cow<'_, Path>) -> std::io::Result<UserId> {
+            todo!("unix")
         }
-
-        #[cfg(windows)]
-        mod impl_ {
-            use crate::identity::UserId;
-            use std::borrow::Cow;
-            use std::path::Path;
-
-            pub fn from_path(path: Cow<'_, Path>) -> std::io::Result<UserId> {
-                todo!("unix")
-            }
-            pub fn from_process() -> std::io::Result<UserId> {
-                todo!("process")
-            }
+        pub fn from_process() -> std::io::Result<UserId> {
+            todo!("process")
         }
     }
 }

git-sec/tests/identity/mod.rs

@@ -2,7 +2,7 @@ mod uid {
     #[test]
     fn from_path() {
         let dir = tempfile::tempdir().unwrap();
-        let owner = git_sec::identity::user_id::from_path(dir.path().into()).unwrap();
-        assert_eq!(owner, git_sec::identity::user_id::from_process().unwrap());
+        let owner = git_sec::identity::from_path(dir.path().into()).unwrap();
+        assert_eq!(owner, git_sec::identity::from_process().unwrap());
     }
 }