diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/fs/Cargo.toml | 1 | ||||
-rw-r--r-- | ext/fs/in_memory_fs.rs | 2 | ||||
-rw-r--r-- | ext/fs/std_fs.rs | 2 | ||||
-rw-r--r-- | ext/kv/Cargo.toml | 1 | ||||
-rw-r--r-- | ext/kv/sqlite.rs | 2 | ||||
-rw-r--r-- | ext/node/Cargo.toml | 1 | ||||
-rw-r--r-- | ext/node/ops/require.rs | 4 |
7 files changed, 8 insertions, 5 deletions
diff --git a/ext/fs/Cargo.toml b/ext/fs/Cargo.toml index 894b307ef..42717dccb 100644 --- a/ext/fs/Cargo.toml +++ b/ext/fs/Cargo.toml @@ -21,6 +21,7 @@ async-trait.workspace = true base32.workspace = true deno_core.workspace = true deno_io.workspace = true +deno_path_util.workspace = true deno_permissions.workspace = true filetime.workspace = true libc.workspace = true diff --git a/ext/fs/in_memory_fs.rs b/ext/fs/in_memory_fs.rs index 027539e84..269202386 100644 --- a/ext/fs/in_memory_fs.rs +++ b/ext/fs/in_memory_fs.rs @@ -12,12 +12,12 @@ use std::path::PathBuf; use std::rc::Rc; use std::sync::Arc; -use deno_core::normalize_path; use deno_core::parking_lot::Mutex; use deno_io::fs::File; use deno_io::fs::FsError; use deno_io::fs::FsResult; use deno_io::fs::FsStat; +use deno_path_util::normalize_path; use crate::interface::AccessCheckCb; use crate::interface::FsDirEntry; diff --git a/ext/fs/std_fs.rs b/ext/fs/std_fs.rs index d8d5f6502..443c26819 100644 --- a/ext/fs/std_fs.rs +++ b/ext/fs/std_fs.rs @@ -11,13 +11,13 @@ use std::path::Path; use std::path::PathBuf; use std::rc::Rc; -use deno_core::normalize_path; use deno_core::unsync::spawn_blocking; use deno_io::fs::File; use deno_io::fs::FsError; use deno_io::fs::FsResult; use deno_io::fs::FsStat; use deno_io::StdFileResourceInner; +use deno_path_util::normalize_path; use crate::interface::AccessCheckCb; use crate::interface::FsDirEntry; diff --git a/ext/kv/Cargo.toml b/ext/kv/Cargo.toml index eee4762eb..9b2d596d0 100644 --- a/ext/kv/Cargo.toml +++ b/ext/kv/Cargo.toml @@ -21,6 +21,7 @@ bytes.workspace = true chrono = { workspace = true, features = ["now"] } deno_core.workspace = true deno_fetch.workspace = true +deno_path_util.workspace = true deno_permissions.workspace = true deno_tls.workspace = true denokv_proto.workspace = true diff --git a/ext/kv/sqlite.rs b/ext/kv/sqlite.rs index 8027ff03d..0b4a3693c 100644 --- a/ext/kv/sqlite.rs +++ b/ext/kv/sqlite.rs @@ -16,9 +16,9 @@ use std::sync::OnceLock; use async_trait::async_trait; use deno_core::error::type_error; use deno_core::error::AnyError; -use deno_core::normalize_path; use deno_core::unsync::spawn_blocking; use deno_core::OpState; +use deno_path_util::normalize_path; pub use denokv_sqlite::SqliteBackendError; use denokv_sqlite::SqliteConfig; use denokv_sqlite::SqliteNotifier; diff --git a/ext/node/Cargo.toml b/ext/node/Cargo.toml index 17da17cd8..06a91c501 100644 --- a/ext/node/Cargo.toml +++ b/ext/node/Cargo.toml @@ -34,6 +34,7 @@ deno_io.workspace = true deno_media_type.workspace = true deno_net.workspace = true deno_package_json.workspace = true +deno_path_util.workspace = true deno_permissions.workspace = true deno_whoami = "0.1.0" der = { version = "0.7.9", features = ["derive"] } diff --git a/ext/node/ops/require.rs b/ext/node/ops/require.rs index 3578719d0..15667aae7 100644 --- a/ext/node/ops/require.rs +++ b/ext/node/ops/require.rs @@ -3,7 +3,6 @@ use deno_core::anyhow::Context; use deno_core::error::generic_error; use deno_core::error::AnyError; -use deno_core::normalize_path; use deno_core::op2; use deno_core::url::Url; use deno_core::v8; @@ -12,6 +11,7 @@ use deno_core::ModuleSpecifier; use deno_core::OpState; use deno_fs::FileSystemRc; use deno_package_json::PackageJsonRc; +use deno_path_util::normalize_path; use node_resolver::NodeModuleKind; use node_resolver::NodeResolutionMode; use node_resolver::REQUIRE_CONDITIONS; @@ -104,7 +104,7 @@ where } else { let current_dir = &(fs.cwd().map_err(AnyError::from)).context("Unable to get CWD")?; - deno_core::normalize_path(current_dir.join(from)) + deno_path_util::normalize_path(current_dir.join(from)) }; ensure_read_permission::<P>(state, &from)?; |