Get rid of normpath

Author: gyk

Cargo.toml

@@ -23,7 +23,6 @@ regex = { version = "1.5.5", default-features = false, features = ["std", "unico
 aho-corasick = "0.7"
 tantivy-fst = "0.4.0"
 memmap2 = { version = "0.5.3", optional = true }
-normpath = "1.0.0"
 lz4_flex = { version = "0.10", default-features = false, features = ["checked-decode"], optional = true }
 brotli = { version = "3.3.4", optional = true }
 zstd = { version = "0.12", optional = true, default-features = false }

src/directory/mmap_directory.rs

@@ -9,7 +9,6 @@ use std::{fmt, result};
 use common::StableDeref;
 use fs2::FileExt;
 use memmap2::Mmap;
-use normpath::PathExt;
 use serde::{Deserialize, Serialize};
 use tempfile::TempDir;
 
@@ -197,9 +196,21 @@ impl MmapDirectory {
                 directory_path,
             )));
         }
-        let canonical_path: PathBuf = directory_path.normalize().map_err(|io_err| {
-            OpenDirectoryError::wrap_io_error(io_err, PathBuf::from(directory_path))
-        })?.into_path_buf();
+        let canonical_path: PathBuf = directory_path.canonicalize().or_else(|io_err| {
+            let directory_path = directory_path.to_owned();
+
+            #[cfg(windows)]
+            {
+                // `canonicalize` returns "Incorrect function" (error code 1)
+                // for virtual drives (network drives, ramdisk, etc.).
+                if io_err.raw_os_error() == Some(1) && directory_path.exists() {
+                    // Should call `std::path::absolute` when it is stabilised.
+                    return Ok(directory_path);
+                }
+            }
+
+            Err(OpenDirectoryError::wrap_io_error(io_err, directory_path))
+        })?;
         if !canonical_path.is_dir() {
             return Err(OpenDirectoryError::NotADirectory(PathBuf::from(
                 directory_path,