pth : add from_paths for AbsolutePath

Author: Wandalen

Cargo.toml

@@ -367,7 +367,7 @@ path = "module/alias/file_tools"
 default-features = false
 
 [workspace.dependencies.pth]
-version = "~0.17.0"
+version = "~0.18.0"
 path = "module/core/pth"
 default-features = false
 

module/core/pth/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pth"
-version = "0.17.0"
+version = "0.18.0"
 edition = "2021"
 authors = [
   "Kostiantyn Wandalen <[email protected]>",

module/core/pth/src/path.rs

@@ -314,19 +314,19 @@ mod private
   /// use pth::path;
   ///
   /// let paths = vec![ PathBuf::from( "a/b/c" ), PathBuf::from( "/d/e" ), PathBuf::from( "f/g" ) ];
-  /// let joined = path::join_paths( paths.iter().map( | p | p.as_path() ) );
+  /// let joined = path::iter_join( paths.iter().map( | p | p.as_path() ) );
   /// assert_eq!( joined, std::path::PathBuf::from( "/d/e/f/g" ) );
   ///
   /// let paths = vec![ PathBuf::from( "" ), PathBuf::from( "a/b" ), PathBuf::from( "" ), PathBuf::from( "c" ), PathBuf::from( "" ) ];
-  /// let joined = path::join_paths( paths.iter().map( | p | p.as_path() ) );
+  /// let joined = path::iter_join( paths.iter().map( | p | p.as_path() ) );
   /// assert_eq!( joined, std::path::PathBuf::from( PathBuf::from( "/a/b/c" ) ) );
   ///
   /// ```
   // qqq : make macro paths_join!( ... )
-  pub fn join_paths< I, P >( paths : I ) -> PathBuf
+  pub fn iter_join< 'a ,I, P >( paths : I ) -> PathBuf
   where
     I : Iterator< Item = P >,
-    P : AsPath,
+    P : TryIntoCowPath< 'a >,
   {
     #[ cfg( feature = "no_std" ) ]
     extern crate alloc;
@@ -340,7 +340,8 @@ mod private
     for path in paths
     {
       // let mut path = path.to_string_lossy().replace( '\\', "/" );
-      let path = path.as_path().to_string_lossy().replace( '\\', "/" );
+      // qqq : xxx : avoid unwrap
+      let path = path.try_into_cow_path().unwrap().to_string_lossy().replace( '\\', "/" );
       // qqq : xxx : avoid converting to String, keep it Path
 
       // path = path.replace( ':', "" );
@@ -1052,17 +1053,20 @@ mod private
 crate::mod_interface!
 {
 
-  orphan use ext;
-  orphan use exts;
-  orphan use change_ext;
-  orphan use path_relative;
-  orphan use rebase;
-  orphan use path_common;
-  orphan use join_paths;
-  orphan use without_ext;
-  orphan use is_glob;
-  orphan use normalize;
-  orphan use canonicalize;
+  orphan use
+  {
+    ext,
+    exts,
+    change_ext,
+    path_relative,
+    rebase,
+    path_common,
+    iter_join,
+    without_ext,
+    is_glob,
+    normalize,
+    canonicalize,
+  };
 
   #[ cfg( feature = "path_unique_folder_name" ) ]
   orphan use unique_folder_name;

module/core/pth/src/path/absolute_path.rs

@@ -68,7 +68,7 @@ mod private
       self.0
     }
 
-    /// Creates an `AbsolutePath` from an iterator over items that implement `AsPath`.
+    /// Creates an `AbsolutePath` from an iterator over items that implement `TryIntoCowPath`.
     ///
     /// This function joins all path segments into a single path and attempts to convert it
     /// into an `AbsolutePath`. The resulting path must be absolute.
@@ -81,14 +81,32 @@ mod private
     ///
     /// * `Ok(AbsolutePath)` if the joined path is absolute.
     /// * `Err(io::Error)` if the joined path is not absolute.
-    pub fn from_paths< I, P >( iter : I ) -> Result< Self, io::Error >
+    pub fn from_iter< 'a, I, P >( iter : I ) -> Result< Self, io::Error >
     where
       I : Iterator< Item = P >,
-      P : AsPath,
+      P : TryIntoCowPath< 'a >,
     {
-      let joined_path = join_paths( iter );
+      let joined_path = iter_join( iter );
       AbsolutePath::try_from( joined_path )
     }
+
+    /// Joins path components into a `PathBuf`.
+    ///
+    /// This function leverages the `PathJoined` trait to join multiple path components into a single `PathBuf`.
+    ///
+    /// # Arguments
+    ///
+    /// * `paths` - A tuple of path components implementing the `PathJoined` trait.
+    ///
+    /// # Returns
+    ///
+    /// * `Ok(PathBuf)` - The joined path as a `PathBuf`.
+    /// * `Err(io::Error)` - An error if any component fails to convert.
+    pub fn from_paths< Paths : PathJoined >( paths : Paths ) -> Result< Self, io::Error >
+    {
+      Self::try_from( paths.iter_join()? )
+    }
+
   }
 
   impl fmt::Display for AbsolutePath

module/core/pth/src/path/joining.rs

@@ -17,7 +17,7 @@ mod private
   /// * `Err(io::Error)` - An error if any component fails to convert.
   pub fn join< Paths : PathJoined >( paths : Paths ) -> Result< PathBuf, io::Error >
   {
-    paths.join_paths()
+    paths.iter_join()
   }
 
   /// A trait for joining path components into a `PathBuf`.
@@ -33,16 +33,33 @@ mod private
     ///
     /// * `Ok(PathBuf)` - The joined path as a `PathBuf`.
     /// * `Err(io::Error)` - An error if any component fails to convert.
-    fn join_paths( self ) -> Result< PathBuf, io::Error >;
+    fn iter_join( self ) -> Result< PathBuf, io::Error >;
   }
 
+  // // Implementation for an Iterator over items implementing TryIntoCowPath
+  // impl< 'a, I, T > PathJoined for I
+  // where
+  //   I : Iterator< Item = T >,
+  //   T : TryIntoCowPath< 'a >,
+  // {
+  //   fn iter_join( self ) -> Result< PathBuf, io::Error >
+  //   {
+  //     let mut result = PathBuf::new();
+  //     for item in self
+  //     {
+  //       result.push( item.try_into_cow_path()?.as_ref() );
+  //     }
+  //     Ok( result )
+  //   }
+  // }
+
   // Implementation for a tuple of length 1
   impl< 'a, T1 > PathJoined for ( T1, )
   where
     T1 : TryIntoCowPath< 'a >,
   {
     #[ inline ]
-    fn join_paths( self ) -> Result< PathBuf, io::Error >
+    fn iter_join( self ) -> Result< PathBuf, io::Error >
     {
       let ( p1, ) = self;
       let mut result = PathBuf::new();
@@ -58,7 +75,7 @@ mod private
     T2 : TryIntoCowPath< 'a >,
   {
     #[ inline ]
-    fn join_paths( self ) -> Result< PathBuf, io::Error >
+    fn iter_join( self ) -> Result< PathBuf, io::Error >
     {
       let ( p1, p2 ) = self;
       let mut result = PathBuf::new();
@@ -76,7 +93,7 @@ mod private
     T3 : TryIntoCowPath< 'a >,
   {
     #[ inline ]
-    fn join_paths( self ) -> Result< PathBuf, io::Error >
+    fn iter_join( self ) -> Result< PathBuf, io::Error >
     {
       let ( p1, p2, p3 ) = self;
       let mut result = PathBuf::new();
@@ -96,7 +113,7 @@ mod private
     T4 : TryIntoCowPath< 'a >,
   {
     #[ inline ]
-    fn join_paths( self ) -> Result< PathBuf, io::Error >
+    fn iter_join( self ) -> Result< PathBuf, io::Error >
     {
       let ( p1, p2, p3, p4 ) = self;
       let mut result = PathBuf::new();
@@ -118,7 +135,7 @@ mod private
     T5 : TryIntoCowPath< 'a >,
   {
     #[ inline ]
-    fn join_paths( self ) -> Result< PathBuf, io::Error >
+    fn iter_join( self ) -> Result< PathBuf, io::Error >
     {
       let ( p1, p2, p3, p4, p5 ) = self;
       let mut result = PathBuf::new();
@@ -137,7 +154,7 @@ mod private
     T : TryIntoCowPath< 'a > + Clone,
   {
     #[ inline ]
-    fn join_paths( self ) -> Result< PathBuf, io::Error >
+    fn iter_join( self ) -> Result< PathBuf, io::Error >
     {
       let mut result = PathBuf::new();
       for item in self
@@ -154,7 +171,7 @@ mod private
     T : TryIntoCowPath< 'a > + Clone,
   {
     #[ inline ]
-    fn join_paths( self ) -> Result< PathBuf, io::Error >
+    fn iter_join( self ) -> Result< PathBuf, io::Error >
     {
       let mut result = PathBuf::new();
       for item in &self

module/core/pth/tests/inc/absolute_path_test/basic_test.rs

@@ -1,19 +1,12 @@
 use super::*;
 
-#[ cfg( not( feature="no_std" ) ) ]
 use the_module::
 {
   AbsolutePath,
   Path,
   PathBuf,
 };
 
-#[ cfg( feature="no_std" ) ]
-use crate::the_module::AbsolutePath;
-
-// #[ cfg( feature = "path_utf8" ) ]
-// use the_module::Utf8PathBuf;
-
 #[ test ]
 fn basic()
 {
@@ -74,7 +67,6 @@ fn test_join()
   assert_eq!( joined_path.to_string_lossy(), "/path/to/some/file.txt" );
 }
 
-
 #[test]
 fn test_relative_path_try_from_str()
 {

module/core/pth/tests/inc/absolute_path_test/from_paths_test.rs

@@ -9,7 +9,7 @@ fn test_from_paths_single_absolute_segment()
   use std::convert::TryFrom;
 
   let segments = vec![ "/single" ];
-  let got = AbsolutePath::from_paths( segments.iter().map( |s| *s ) ).unwrap();
+  let got = AbsolutePath::from_iter( segments.iter().map( |s| *s ) ).unwrap();
   let exp = AbsolutePath::try_from( "/single" ).unwrap();
 
   assert_eq!( got, exp );
@@ -22,7 +22,7 @@ fn test_from_paths_multiple_segments()
   use std::convert::TryFrom;
 
   let segments = vec![ "/path", "to", "file" ];
-  let got = AbsolutePath::from_paths( segments.iter().map( |s| *s ) ).unwrap();
+  let got = AbsolutePath::from_iter( segments.iter().map( |s| *s ) ).unwrap();
   let exp = AbsolutePath::try_from( "/path/to/file" ).unwrap();
 
   assert_eq!( got, exp );
@@ -34,7 +34,7 @@ fn test_from_paths_empty_segments()
   use the_module::AbsolutePath;
 
   let segments : Vec< &str > = vec![];
-  let result = AbsolutePath::from_paths( segments.iter().map( | s | *s ) );
+  let result = AbsolutePath::from_iter( segments.iter().map( | s | *s ) );
 
   assert!( result.is_err(), "Expected an error for empty segments" );
 }
@@ -46,7 +46,7 @@ fn test_from_paths_with_dot_segments()
   use std::convert::TryFrom;
 
   let segments = vec![ "/path", ".", "to", "file" ];
-  let got = AbsolutePath::from_paths( segments.iter().map( |s| *s ) ).unwrap();
+  let got = AbsolutePath::from_iter( segments.iter().map( |s| *s ) ).unwrap();
   let exp = AbsolutePath::try_from( "/path/to/file" ).unwrap();
 
   assert_eq!( got, exp );
@@ -59,7 +59,7 @@ fn test_from_paths_with_dotdot_segments()
   use std::convert::TryFrom;
 
   let segments = vec![ "/path", "to", "..", "file" ];
-  let got = AbsolutePath::from_paths( segments.iter().map( |s| *s ) ).unwrap();
+  let got = AbsolutePath::from_iter( segments.iter().map( |s| *s ) ).unwrap();
   let exp = AbsolutePath::try_from( "/path/file" ).unwrap();
 
   assert_eq!( got, exp );
@@ -72,7 +72,7 @@ fn test_from_paths_with_trailing_slash()
   use std::convert::TryFrom;
 
   let segments = vec![ "/path", "to", "file/" ];
-  let got = AbsolutePath::from_paths( segments.iter().map( |s| *s ) ).unwrap();
+  let got = AbsolutePath::from_iter( segments.iter().map( |s| *s ) ).unwrap();
   let exp = AbsolutePath::try_from( "/path/to/file/" ).unwrap();
 
   assert_eq!( got, exp );
@@ -85,7 +85,7 @@ fn test_from_paths_with_mixed_slashes()
   use std::convert::TryFrom;
 
   let segments = vec![ "/path\\to", "file" ];
-  let got = AbsolutePath::from_paths( segments.iter().map( |s| *s ) ).unwrap();
+  let got = AbsolutePath::from_iter( segments.iter().map( |s| *s ) ).unwrap();
   let exp = AbsolutePath::try_from( "/path/to/file" ).unwrap();
 
   assert_eq!( got, exp );