From c226d3af2572c93af21f5a3261ede4dd8855685e Mon Sep 17 00:00:00 2001 From: Nayeem Rahman Date: Wed, 7 Oct 2020 13:05:43 +0100 Subject: fix(cli/ops/fs): Don't force Windows paths separate paths with forward slash (#7833) --- cli/ops/fs.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'cli/ops') diff --git a/cli/ops/fs.rs b/cli/ops/fs.rs index c5d1458fc..8542b5230 100644 --- a/cli/ops/fs.rs +++ b/cli/ops/fs.rs @@ -941,10 +941,9 @@ fn op_realpath_sync( // corresponds to the realpath on Unix and // CreateFile and GetFinalPathNameByHandle on Windows let realpath = std::fs::canonicalize(&path)?; - let mut realpath_str = - into_string(realpath.into_os_string())?.replace("\\", "/"); + let mut realpath_str = into_string(realpath.into_os_string())?; if cfg!(windows) { - realpath_str = realpath_str.trim_start_matches("//?/").to_string(); + realpath_str = realpath_str.trim_start_matches("\\\\?\\").to_string(); } Ok(json!(realpath_str)) } @@ -971,10 +970,9 @@ async fn op_realpath_async( // corresponds to the realpath on Unix and // CreateFile and GetFinalPathNameByHandle on Windows let realpath = std::fs::canonicalize(&path)?; - let mut realpath_str = - into_string(realpath.into_os_string())?.replace("\\", "/"); + let mut realpath_str = into_string(realpath.into_os_string())?; if cfg!(windows) { - realpath_str = realpath_str.trim_start_matches("//?/").to_string(); + realpath_str = realpath_str.trim_start_matches("\\\\?\\").to_string(); } Ok(json!(realpath_str)) }) -- cgit v1.2.3