diff options
Diffstat (limited to 'cli')
-rw-r--r-- | cli/Cargo.toml | 1 | ||||
-rw-r--r-- | cli/args/mod.rs | 2 | ||||
-rw-r--r-- | cli/lsp/documents.rs | 2 | ||||
-rw-r--r-- | cli/tools/task.rs | 4 |
4 files changed, 6 insertions, 3 deletions
diff --git a/cli/Cargo.toml b/cli/Cargo.toml index a0c654780..bd3e97e9f 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -87,6 +87,7 @@ http.workspace = true hyper.workspace = true import_map = "=0.15.0" indexmap.workspace = true +indexmap1.workspace = true jsonc-parser = { version = "=0.21.1", features = ["serde"] } lazy-regex.workspace = true libc.workspace = true diff --git a/cli/args/mod.rs b/cli/args/mod.rs index f82ed9a71..536b2c860 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -15,7 +15,7 @@ use deno_npm::resolution::ValidSerializedNpmResolutionSnapshot; use deno_npm::NpmSystemInfo; use deno_runtime::deno_tls::RootCertStoreProvider; use deno_semver::npm::NpmPackageReqReference; -use indexmap::IndexMap; +use indexmap1::IndexMap; pub use deno_config::BenchConfig; pub use deno_config::CompilerOptions; diff --git a/cli/lsp/documents.rs b/cli/lsp/documents.rs index 986c20473..9c6710714 100644 --- a/cli/lsp/documents.rs +++ b/cli/lsp/documents.rs @@ -45,7 +45,7 @@ use deno_runtime::deno_node::PackageJson; use deno_runtime::permissions::PermissionsContainer; use deno_semver::npm::NpmPackageReqReference; use deno_semver::package::PackageReq; -use indexmap::IndexMap; +use indexmap1::IndexMap; use lsp::Url; use once_cell::sync::Lazy; use package_json::PackageJsonDepsProvider; diff --git a/cli/tools/task.rs b/cli/tools/task.rs index dcb53e4ec..f582a8fd8 100644 --- a/cli/tools/task.rs +++ b/cli/tools/task.rs @@ -17,7 +17,9 @@ use deno_semver::package::PackageNv; use deno_task_shell::ExecuteResult; use deno_task_shell::ShellCommand; use deno_task_shell::ShellCommandContext; +// TODO(mmastrac): Once upstream indexmap is updated, this can go away use indexmap::IndexMap; +use indexmap1::IndexMap as IndexMap1; use std::collections::HashMap; use std::path::PathBuf; use std::rc::Rc; @@ -178,7 +180,7 @@ fn collect_env_vars() -> HashMap<String, String> { fn print_available_tasks( // order can be important, so these use an index map - tasks_config: &IndexMap<String, String>, + tasks_config: &IndexMap1<String, String>, package_json_scripts: &IndexMap<String, String>, ) { eprintln!("{}", colors::green("Available tasks:")); |