summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2024-04-28 17:23:43 -0400
committerGitHub <noreply@github.com>2024-04-28 17:23:43 -0400
commit9fc2167cf9d390c3b3f898ccdf160c31cc9151be (patch)
tree16f7c638a16cfb2af3e04bfed3cbc78aeb8fa9a7
parentae1de4de24ec2edbcb68daa618bb563e5659ed94 (diff)
parentf875ea9a52e7cbdbcfd150fe12624e0746894399 (diff)
Merge pull request #1505 from leuven65/master
set default path separator to '/' in UCRT64 of MSYS
-rw-r--r--src/filesystem.rs8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/filesystem.rs b/src/filesystem.rs
index b9df0ba..83e55c9 100644
--- a/src/filesystem.rs
+++ b/src/filesystem.rs
@@ -128,13 +128,11 @@ pub fn strip_current_dir(path: &Path) -> &Path {
pub fn default_path_separator() -> Option<String> {
if cfg!(windows) {
let msystem = env::var("MSYSTEM").ok()?;
- match msystem.as_str() {
- "MINGW64" | "MINGW32" | "MSYS" => Some("/".to_owned()),
- _ => None,
+ if !msystem.as_str().is_empty() {
+ return Some("/".to_owned());
}
- } else {
- None
}
+ None
}
#[cfg(test)]