Merge pull request #8 from picobyte/patch-1

add from_backslash() and _lossy() functions

Author: rhysd

Diff for: README.md

@@ -7,7 +7,7 @@ Rust library to convert a file path from/to slash path
 [`path-slash`][crates-io] is a tiny library to convert a file path (e.g. `foo/bar`, `foo\bar` or
 `C:\foo\bar`) from/to slash path (e.g. `foo/bar`, `C:/foo/bar`).
 
-On Unix-like OS, path separator is slash `/` by default. So any conversion is not necessary. But on
+On Unix-like OS, path separator is slash `/` by default. One may want to convert a Windows path. But on
 Windows, file path separator `\` needs to be replaced with slash `/` (and of course `\`s for escaping
 characters should not be replaced).
 
@@ -25,6 +25,8 @@ and `std::path::PathBuf` gains some methods and associated functions
 - `PathBufExt`
   - `PathBuf::from_slash<S: AsRef<str>>(s: S) -> PathBuf`
   - `PathBuf::from_slash_lossy<S: AsRef<OsStr>>(s: S) -> PathBuf`
+  - `PathBuf::from_backslash<S: AsRef<str>>(s: S) -> PathBuf`
+  - `PathBuf::from_backslash_lossy<S: AsRef<OsStr>>(s: S) -> PathBuf`
   - `PathBuf::to_slash(&self) -> Option<String>`
   - `PathBuf::to_slash_lossy(&self) -> String`
 

Diff for: src/lib.rs

@@ -248,6 +248,8 @@ impl PathExt for Path {
 pub trait PathBufExt {
     fn from_slash<S: AsRef<str>>(s: S) -> Self;
     fn from_slash_lossy<S: AsRef<OsStr>>(s: S) -> Self;
+    fn from_backslash<S: AsRef<str>>(s: S) -> Self;
+    fn from_backslash_lossy<S: AsRef<OsStr>>(s: S) -> Self;
     fn to_slash(&self) -> Option<String>;
     fn to_slash_lossy(&self) -> String;
 }
@@ -313,6 +315,43 @@ impl PathBufExt for PathBuf {
         PathBuf::from(s)
     }
 
+    /// Convert the backslash path (path separated with '\') to [`std::path::PathBuf`].
+    ///
+    /// Any '\' in the slash path is replaced with the file path separator.
+    /// The replacements only happen on non-Windows.
+    #[cfg(not(target_os = "windows"))]
+    fn from_backslash<S: AsRef<str>>(s: S) -> Self {
+        use std::path;
+
+        let s = s
+            .as_ref()
+            .chars()
+            .map(|c| match c {
+                '\\' => path::MAIN_SEPARATOR,
+                c => c,
+            })
+            .collect::<String>();
+        PathBuf::from(s)
+    }
+
+    #[cfg(target_os = "windows")]
+    fn from_backslash<S: AsRef<str>>(s: S) -> Self {
+        PathBuf::from(s.as_ref())
+    }
+    
+    /// Convert the backslash path (path separated with '\') to [`std::path::PathBuf`].
+    ///
+    /// Any '\' in the slash path is replaced with the file path separator.
+    #[cfg(not(target_os = "windows"))]
+    fn from_backslash_lossy<S: AsRef<OsStr>>(s: S) -> Self {
+        PathBuf::from(s.as_ref().to_string_lossy().replace(r"\", "/").chars().as_str())
+    }
+
+    #[cfg(target_os = "windows")]
+    fn from_backslash_lossy<S: AsRef<OsStr>>(s: S) -> Self {
+        PathBuf::from(s.as_ref())
+    }
+
     /// Convert the slash path (path separated with '/') to [`std::path::PathBuf`].
     ///
     /// Any '/' in the slash path is replaced with the file path separator.