diff --git a/Cargo.lock b/Cargo.lock index 1ceac5093e..81d427e3c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2666,6 +2666,7 @@ dependencies = [ name = "nu-cli" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "atty", "chrono", "crossterm 0.26.1", @@ -2695,6 +2696,7 @@ dependencies = [ name = "nu-cmd-dataframe" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "chrono", "fancy-regex", "indexmap", @@ -2713,6 +2715,7 @@ dependencies = [ name = "nu-cmd-extra" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "nu-cmd-lang", "nu-engine", "nu-parser", @@ -2725,6 +2728,7 @@ dependencies = [ name = "nu-cmd-lang" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "fancy-regex", "itertools", "nu-ansi-term", @@ -2740,6 +2744,7 @@ dependencies = [ name = "nu-color-config" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "nu-ansi-term", "nu-engine", "nu-json", @@ -2754,6 +2759,7 @@ name = "nu-command" version = "0.81.1" dependencies = [ "Inflector", + "ahash 0.8.3", "alphanumeric-sort", "atty", "base64 0.21.2", @@ -2856,6 +2862,7 @@ dependencies = [ name = "nu-engine" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "nu-glob", "nu-path", "nu-protocol", @@ -2867,6 +2874,7 @@ dependencies = [ name = "nu-explore" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "ansi-str", "crossterm 0.26.1", "lscolors", @@ -2903,6 +2911,7 @@ dependencies = [ name = "nu-parser" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "bytesize", "chrono", "itertools", @@ -2928,6 +2937,7 @@ dependencies = [ name = "nu-plugin" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "bincode", "nu-engine", "nu-protocol", @@ -2949,6 +2959,7 @@ dependencies = [ name = "nu-protocol" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "byte-unit", "chrono", "chrono-humanize", @@ -2981,6 +2992,7 @@ dependencies = [ name = "nu-system" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "atty", "chrono", "libc", @@ -2998,6 +3010,7 @@ dependencies = [ name = "nu-table" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "nu-ansi-term", "nu-color-config", "nu-engine", @@ -3092,6 +3105,7 @@ dependencies = [ name = "nu_plugin_query" version = "0.81.1" dependencies = [ + "ahash 0.8.3", "gjson", "nu-engine", "nu-plugin", diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml index 8516972b7e..49efad33b1 100644 --- a/crates/nu-cli/Cargo.toml +++ b/crates/nu-cli/Cargo.toml @@ -37,6 +37,7 @@ once_cell = "1.17" percent-encoding = "2" sysinfo = "0.29" unicode-segmentation = "1.10" +ahash = "0.8.3" [features] plugin = [] diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs index 6c51a6bef1..e31e4ad9c4 100644 --- a/crates/nu-cli/src/completions/custom_completions.rs +++ b/crates/nu-cli/src/completions/custom_completions.rs @@ -1,4 +1,5 @@ use crate::completions::{Completer, CompletionOptions, MatchAlgorithm, SortBy}; +use ahash::{HashMap, HashMapExt}; use nu_engine::eval_call; use nu_protocol::{ ast::{Argument, Call, Expr, Expression}, @@ -6,7 +7,7 @@ use nu_protocol::{ PipelineData, Span, Type, Value, }; use reedline::Suggestion; -use std::{collections::HashMap, sync::Arc}; +use std::sync::Arc; use super::completer::map_value_completions; diff --git a/crates/nu-cmd-dataframe/Cargo.toml b/crates/nu-cmd-dataframe/Cargo.toml index 7b0a4306cf..f83802d172 100644 --- a/crates/nu-cmd-dataframe/Cargo.toml +++ b/crates/nu-cmd-dataframe/Cargo.toml @@ -28,6 +28,7 @@ indexmap = { version = "1.7", features = ["serde-1"] } num = { version = "0.4", optional = true } serde = { version = "1.0", features = ["derive"] } sqlparser = { version = "0.33", features = ["serde"], optional = true } +ahash = "0.8.3" [dependencies.polars] features = [ diff --git a/crates/nu-cmd-dataframe/src/dataframe/eager/sql_context.rs b/crates/nu-cmd-dataframe/src/dataframe/eager/sql_context.rs index 640f850694..6fb4caafbf 100644 --- a/crates/nu-cmd-dataframe/src/dataframe/eager/sql_context.rs +++ b/crates/nu-cmd-dataframe/src/dataframe/eager/sql_context.rs @@ -1,4 +1,5 @@ use crate::dataframe::eager::sql_expr::parse_sql_expr; +use ahash::{HashMap, HashMapExt}; use polars::error::{ErrString, PolarsError}; use polars::prelude::{col, DataFrame, DataType, IntoLazy, LazyFrame}; use sqlparser::ast::{ @@ -6,7 +7,6 @@ use sqlparser::ast::{ }; use sqlparser::dialect::GenericDialect; use sqlparser::parser::Parser; -use std::collections::HashMap; #[derive(Default)] pub struct SQLContext { diff --git a/crates/nu-cmd-extra/Cargo.toml b/crates/nu-cmd-extra/Cargo.toml index 6f1a3fd9ea..83bb959f28 100644 --- a/crates/nu-cmd-extra/Cargo.toml +++ b/crates/nu-cmd-extra/Cargo.toml @@ -20,6 +20,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.81.1" } # Potential dependencies for extras num-traits = "0.2" +ahash = "0.8.3" [features] extra = ["default"] diff --git a/crates/nu-cmd-extra/src/example_test.rs b/crates/nu-cmd-extra/src/example_test.rs index 7ed7e22f75..26e6e1281e 100644 --- a/crates/nu-cmd-extra/src/example_test.rs +++ b/crates/nu-cmd-extra/src/example_test.rs @@ -15,11 +15,11 @@ mod test_examples { check_example_input_and_output_types_match_command_signature, }; + use ahash::{HashSet, HashSetExt}; use nu_protocol::{ engine::{Command, EngineState, StateWorkingSet}, Type, }; - use std::collections::HashSet; pub fn test_examples(cmd: impl Command + 'static) { let examples = cmd.examples(); diff --git a/crates/nu-cmd-lang/Cargo.toml b/crates/nu-cmd-lang/Cargo.toml index 11b16cfddb..60fd9ed5f1 100644 --- a/crates/nu-cmd-lang/Cargo.toml +++ b/crates/nu-cmd-lang/Cargo.toml @@ -22,6 +22,7 @@ nu-ansi-term = "0.47.0" fancy-regex = "0.11" itertools = "0.10" shadow-rs = { version = "0.22", default-features = false } +ahash = "0.8.3" [build-dependencies] shadow-rs = { version = "0.22", default-features = false } diff --git a/crates/nu-cmd-lang/src/example_support.rs b/crates/nu-cmd-lang/src/example_support.rs index c531719715..b5ac082172 100644 --- a/crates/nu-cmd-lang/src/example_support.rs +++ b/crates/nu-cmd-lang/src/example_support.rs @@ -1,10 +1,10 @@ +use ahash::{HashSet, HashSetExt}; use itertools::Itertools; use nu_protocol::{ ast::Block, engine::{EngineState, Stack, StateDelta, StateWorkingSet}, Example, PipelineData, Signature, Span, Type, Value, }; -use std::collections::HashSet; pub fn check_example_input_and_output_types_match_command_signature( example: &Example, diff --git a/crates/nu-cmd-lang/src/example_test.rs b/crates/nu-cmd-lang/src/example_test.rs index 0d1e13b1ab..25d7138b63 100644 --- a/crates/nu-cmd-lang/src/example_test.rs +++ b/crates/nu-cmd-lang/src/example_test.rs @@ -16,11 +16,11 @@ mod test_examples { use crate::{ Break, Collect, Def, Describe, Echo, ExportCommand, ExportDef, If, Let, Module, Mut, Use, }; + use ahash::{HashSet, HashSetExt}; use nu_protocol::{ engine::{Command, EngineState, StateWorkingSet}, Type, Value, }; - use std::collections::HashSet; pub fn test_examples(cmd: impl Command + 'static) { let examples = cmd.examples(); diff --git a/crates/nu-color-config/Cargo.toml b/crates/nu-color-config/Cargo.toml index c806e1ed2a..183a231f10 100644 --- a/crates/nu-color-config/Cargo.toml +++ b/crates/nu-color-config/Cargo.toml @@ -18,6 +18,7 @@ nu-engine = { path = "../nu-engine", version = "0.81.1" } nu-json = { path="../nu-json", version = "0.81.1" } serde = { version="1.0", features=["derive"] } +ahash = "0.8.3" [dev-dependencies] nu-test-support = { path="../nu-test-support", version = "0.81.1" } diff --git a/crates/nu-color-config/src/color_config.rs b/crates/nu-color-config/src/color_config.rs index 6dc81ec792..459c0a05d3 100644 --- a/crates/nu-color-config/src/color_config.rs +++ b/crates/nu-color-config/src/color_config.rs @@ -2,9 +2,9 @@ use crate::{ nu_style::{color_from_hex, lookup_style}, parse_nustyle, NuStyle, }; +use ahash::{HashMap, HashMapExt}; use nu_ansi_term::Style; use nu_protocol::Value; -use std::collections::HashMap; pub fn lookup_ansi_color_style(s: &str) -> Style { if s.starts_with('#') { diff --git a/crates/nu-color-config/src/style_computer.rs b/crates/nu-color-config/src/style_computer.rs index e1f51c455a..114a0614ab 100644 --- a/crates/nu-color-config/src/style_computer.rs +++ b/crates/nu-color-config/src/style_computer.rs @@ -1,5 +1,6 @@ use crate::text_style::Alignment; use crate::{color_record_to_nustyle, lookup_ansi_color_style, TextStyle}; +use ahash::HashMap; use nu_ansi_term::{Color, Style}; use nu_engine::{env::get_config, eval_block}; use nu_protocol::{ @@ -7,10 +8,7 @@ use nu_protocol::{ CliError, IntoPipelineData, Value, }; -use std::{ - collections::HashMap, - fmt::{Debug, Formatter, Result}, -}; +use std::fmt::{Debug, Formatter, Result}; // ComputableStyle represents the valid user style types: a single color value, or a closure which // takes an input value and produces a color value. The latter represents a value which @@ -142,7 +140,7 @@ impl<'a> StyleComputer<'a> { // Create the hashmap #[rustfmt::skip] - let mut map: StyleMapping = HashMap::from([ + let mut map: StyleMapping = [ ("separator".to_string(), ComputableStyle::Static(Color::White.normal())), ("leading_trailing_space_bg".to_string(), ComputableStyle::Static(Style::default().on(Color::Rgb(128, 128, 128)))), ("header".to_string(), ComputableStyle::Static(Color::White.normal())), @@ -164,7 +162,7 @@ impl<'a> StyleComputer<'a> { ("block".to_string(), ComputableStyle::Static(Color::White.normal())), ("hints".to_string(), ComputableStyle::Static(Color::DarkGray.normal())), ("search_result".to_string(), ComputableStyle::Static(Color::White.normal().on(Color::Red))), - ]); + ].into_iter().collect(); for (key, value) in &config.color_config { match value { @@ -216,10 +214,12 @@ fn test_computable_style_static() { let style_computer = StyleComputer::new( &dummy_engine_state, &dummy_stack, - HashMap::from([ + [ ("string".into(), ComputableStyle::Static(style1)), ("row_index".into(), ComputableStyle::Static(style2)), - ]), + ] + .into_iter() + .collect(), ); assert_eq!( style_computer.compute("string", &Value::nothing(Span::unknown())), diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml index 561e9a5e78..4b48109a73 100644 --- a/crates/nu-command/Cargo.toml +++ b/crates/nu-command/Cargo.toml @@ -32,6 +32,7 @@ nu-utils = { path = "../nu-utils", version = "0.81.1" } nu-ansi-term = "0.47.0" alphanumeric-sort = "1.5" +ahash = "0.8.3" atty = "0.2" base64 = "0.21" byteorder = "1.4" diff --git a/crates/nu-command/src/charting/hashable_value.rs b/crates/nu-command/src/charting/hashable_value.rs index 61ec9d82ce..f3a7376783 100644 --- a/crates/nu-command/src/charting/hashable_value.rs +++ b/crates/nu-command/src/charting/hashable_value.rs @@ -159,8 +159,8 @@ impl PartialEq for HashableValue { #[cfg(test)] mod test { use super::*; + use ahash::{HashMap, HashMapExt, HashSet, HashSetExt}; use nu_protocol::ast::{CellPath, PathMember}; - use std::collections::{HashMap, HashSet}; #[test] fn from_value() { diff --git a/crates/nu-command/src/charting/histogram.rs b/crates/nu-command/src/charting/histogram.rs index d4559ddf8b..b55de13952 100644 --- a/crates/nu-command/src/charting/histogram.rs +++ b/crates/nu-command/src/charting/histogram.rs @@ -1,4 +1,5 @@ use super::hashable_value::HashableValue; +use ahash::{HashMap, HashMapExt}; use itertools::Itertools; use nu_engine::CallExt; use nu_protocol::ast::Call; @@ -7,7 +8,6 @@ use nu_protocol::{ Example, IntoPipelineData, PipelineData, ShellError, Signature, Span, Spanned, SyntaxShape, Type, Value, }; -use std::collections::HashMap; use std::iter; #[derive(Clone)] diff --git a/crates/nu-command/src/deprecated/deprecated_commands.rs b/crates/nu-command/src/deprecated/deprecated_commands.rs index d238ce1890..090f1a924d 100644 --- a/crates/nu-command/src/deprecated/deprecated_commands.rs +++ b/crates/nu-command/src/deprecated/deprecated_commands.rs @@ -1,11 +1,11 @@ -use std::collections::HashMap; +use ahash::HashMap; /// Return map of /// This covers simple deprecated commands nicely, but it's not great for deprecating /// subcommands like `foo bar` where `foo` is still a valid command. /// For those, it's currently easiest to have a "stub" command that just returns an error. pub fn deprecated_commands() -> HashMap { - HashMap::from([ + [ ("keep".to_string(), "take".to_string()), ("match".to_string(), "find".to_string()), ("nth".to_string(), "select".to_string()), @@ -25,5 +25,7 @@ pub fn deprecated_commands() -> HashMap { ("benchmark".to_string(), "timeit".to_string()), ("str collect".to_string(), "str join".to_string()), ("old-alias".to_string(), "alias".to_string()), - ]) + ] + .into_iter() + .collect() } diff --git a/crates/nu-command/src/env/config/utils.rs b/crates/nu-command/src/env/config/utils.rs index 0e68f2b738..9b83dd8f6b 100644 --- a/crates/nu-command/src/env/config/utils.rs +++ b/crates/nu-command/src/env/config/utils.rs @@ -1,4 +1,5 @@ -use std::{collections::HashMap, path::PathBuf}; +use ahash::HashMap; +use std::path::PathBuf; use nu_protocol::{ engine::{EngineState, Stack}, diff --git a/crates/nu-command/src/env/with_env.rs b/crates/nu-command/src/env/with_env.rs index 78ab778092..39fe1333fd 100644 --- a/crates/nu-command/src/env/with_env.rs +++ b/crates/nu-command/src/env/with_env.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use ahash::{HashMap, HashMapExt}; use nu_engine::{eval_block, CallExt}; use nu_protocol::{ diff --git a/crates/nu-command/src/example_test.rs b/crates/nu-command/src/example_test.rs index f4cf8c6910..faac646d1d 100644 --- a/crates/nu-command/src/example_test.rs +++ b/crates/nu-command/src/example_test.rs @@ -14,6 +14,7 @@ mod test_examples { SplitRow, Str, StrJoin, StrLength, StrReplace, Update, Url, Values, Wrap, }; use crate::{Each, To}; + use ahash::{HashSet, HashSetExt}; use nu_cmd_lang::example_support::{ check_all_signature_input_output_types_entries_have_examples, check_example_evaluates_to_expected_output, @@ -24,7 +25,6 @@ mod test_examples { engine::{Command, EngineState, StateWorkingSet}, Type, }; - use std::collections::HashSet; pub fn test_examples(cmd: impl Command + 'static) { let examples = cmd.examples(); diff --git a/crates/nu-command/src/filesystem/rm.rs b/crates/nu-command/src/filesystem/rm.rs index 133901c913..3e75cb84c0 100644 --- a/crates/nu-command/src/filesystem/rm.rs +++ b/crates/nu-command/src/filesystem/rm.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use ahash::{HashMap, HashMapExt}; #[cfg(all( feature = "trash-support", not(target_os = "android"), diff --git a/crates/nu-command/src/filters/join.rs b/crates/nu-command/src/filters/join.rs index 8786ec126d..fefee704d5 100644 --- a/crates/nu-command/src/filters/join.rs +++ b/crates/nu-command/src/filters/join.rs @@ -1,3 +1,4 @@ +use ahash::{HashMap, HashMapExt, HashSet, HashSetExt}; use nu_engine::CallExt; use nu_protocol::ast::Call; use nu_protocol::engine::{Command, EngineState, Stack}; @@ -5,7 +6,6 @@ use nu_protocol::{ Config, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value, }; use std::cmp::max; -use std::collections::{HashMap, HashSet}; #[derive(Clone)] pub struct Join; diff --git a/crates/nu-command/src/filters/select.rs b/crates/nu-command/src/filters/select.rs index d40d33709c..a9d42e34bf 100644 --- a/crates/nu-command/src/filters/select.rs +++ b/crates/nu-command/src/filters/select.rs @@ -1,3 +1,4 @@ +use ahash::{HashSet, HashSetExt}; use nu_engine::CallExt; use nu_protocol::ast::{Call, CellPath, PathMember}; use nu_protocol::engine::{Command, EngineState, Stack}; @@ -5,7 +6,6 @@ use nu_protocol::{ Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData, PipelineIterator, ShellError, Signature, Span, SyntaxShape, Type, Value, }; -use std::collections::HashSet; #[derive(Clone)] pub struct Select; diff --git a/crates/nu-command/src/filters/uniq.rs b/crates/nu-command/src/filters/uniq.rs index 7b866e1de5..f5dea9f865 100644 --- a/crates/nu-command/src/filters/uniq.rs +++ b/crates/nu-command/src/filters/uniq.rs @@ -1,4 +1,5 @@ use crate::formats::value_to_string; +use ahash::{HashMap, HashMapExt}; use itertools::Itertools; use nu_protocol::ast::Call; use nu_protocol::engine::{Command, EngineState, Stack}; @@ -7,7 +8,6 @@ use nu_protocol::{ Span, Type, Value, }; use std::collections::hash_map::IntoIter; -use std::collections::HashMap; #[derive(Clone)] pub struct Uniq; diff --git a/crates/nu-command/src/filters/update_cells.rs b/crates/nu-command/src/filters/update_cells.rs index 621c972875..3c64b7c2f9 100644 --- a/crates/nu-command/src/filters/update_cells.rs +++ b/crates/nu-command/src/filters/update_cells.rs @@ -1,3 +1,4 @@ +use ahash::HashSet; use nu_engine::{eval_block, CallExt}; use nu_protocol::ast::{Block, Call}; use nu_protocol::engine::{Closure, Command, EngineState, Stack}; @@ -5,7 +6,6 @@ use nu_protocol::{ Category, Example, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData, PipelineIterator, ShellError, Signature, Span, SyntaxShape, Type, Value, }; -use std::collections::HashSet; use std::iter::FromIterator; #[derive(Clone)] diff --git a/crates/nu-command/src/formats/to/html.rs b/crates/nu-command/src/formats/to/html.rs index 1f129e949a..05bfa4306b 100644 --- a/crates/nu-command/src/formats/to/html.rs +++ b/crates/nu-command/src/formats/to/html.rs @@ -1,4 +1,5 @@ use crate::formats::to::delimited::merge_descriptors; +use ahash::{HashMap, HashMapExt}; use fancy_regex::Regex; use nu_engine::CallExt; use nu_protocol::ast::Call; @@ -9,7 +10,6 @@ use nu_protocol::{ }; use rust_embed::RustEmbed; use serde::{Deserialize, Serialize}; -use std::collections::HashMap; use std::error::Error; use std::fmt::Write; diff --git a/crates/nu-command/src/math/mode.rs b/crates/nu-command/src/math/mode.rs index ab5e6fafd0..a6d849527f 100644 --- a/crates/nu-command/src/math/mode.rs +++ b/crates/nu-command/src/math/mode.rs @@ -1,4 +1,5 @@ use crate::math::utils::run_with_function; +use ahash::{HashMap, HashMapExt}; use nu_protocol::ast::Call; use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, Span, Type, Value}; @@ -142,7 +143,7 @@ pub fn mode(values: &[Value], _span: Span, head: &Span) -> Result, ShellError>>()?; - let mut frequency_map = std::collections::HashMap::new(); + let mut frequency_map = HashMap::new(); for v in hashable_values { let counter = frequency_map.entry(v).or_insert(0); *counter += 1; diff --git a/crates/nu-command/src/network/http/client.rs b/crates/nu-command/src/network/http/client.rs index bdde221c0e..5f65f08b96 100644 --- a/crates/nu-command/src/network/http/client.rs +++ b/crates/nu-command/src/network/http/client.rs @@ -9,7 +9,7 @@ use nu_protocol::{ }; use ureq::{Error, ErrorKind, Request, Response}; -use std::collections::HashMap; +use ahash::{HashMap, HashMapExt}; use std::io::BufReader; use std::path::PathBuf; use std::str::FromStr; diff --git a/crates/nu-command/src/path/join.rs b/crates/nu-command/src/path/join.rs index 54fbc185ae..4addb0483e 100644 --- a/crates/nu-command/src/path/join.rs +++ b/crates/nu-command/src/path/join.rs @@ -1,7 +1,5 @@ -use std::{ - collections::HashMap, - path::{Path, PathBuf}, -}; +use ahash::HashMap; +use std::path::{Path, PathBuf}; use nu_engine::CallExt; use nu_protocol::ast::Call; diff --git a/crates/nu-command/src/platform/ansi/ansi_.rs b/crates/nu-command/src/platform/ansi/ansi_.rs index f45ef79c63..19964d3eaa 100644 --- a/crates/nu-command/src/platform/ansi/ansi_.rs +++ b/crates/nu-command/src/platform/ansi/ansi_.rs @@ -1,3 +1,4 @@ +use ahash::{HashMap, HashMapExt}; use nu_ansi_term::*; use nu_engine::CallExt; use nu_protocol::engine::{EngineState, Stack}; @@ -6,7 +7,6 @@ use nu_protocol::{ PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value, }; use once_cell::sync::Lazy; -use std::collections::HashMap; #[derive(Clone)] pub struct AnsiCommand; diff --git a/crates/nu-command/src/system/run_external.rs b/crates/nu-command/src/system/run_external.rs index 46e9ab5b10..c7dd607442 100644 --- a/crates/nu-command/src/system/run_external.rs +++ b/crates/nu-command/src/system/run_external.rs @@ -1,4 +1,5 @@ use crate::hook::eval_hook; +use ahash::HashMap; use nu_engine::env_to_strings; use nu_engine::CallExt; use nu_protocol::{ @@ -11,7 +12,6 @@ use nu_protocol::{ use nu_system::ForegroundProcess; use os_pipe::PipeReader; use pathdiff::diff_paths; -use std::collections::HashMap; use std::io::{BufRead, BufReader, Read, Write}; use std::path::{Path, PathBuf}; use std::process::{Command as CommandSys, Stdio}; diff --git a/crates/nu-command/src/viewers/explore.rs b/crates/nu-command/src/viewers/explore.rs index 65837a1238..d637a5e3b5 100644 --- a/crates/nu-command/src/viewers/explore.rs +++ b/crates/nu-command/src/viewers/explore.rs @@ -1,3 +1,4 @@ +use ahash::HashMap; use nu_ansi_term::{Color, Style}; use nu_color_config::{get_color_map, StyleComputer}; use nu_engine::CallExt; @@ -11,7 +12,6 @@ use nu_protocol::{ engine::{Command, EngineState, Stack}, Category, Example, PipelineData, ShellError, Signature, Span, SyntaxShape, Type, Value, }; -use std::collections::HashMap; /// A `less` like program to render a [Value] as a table. #[derive(Clone)] diff --git a/crates/nu-command/src/viewers/icons.rs b/crates/nu-command/src/viewers/icons.rs index dca79a3d83..4c52fa7959 100644 --- a/crates/nu-command/src/viewers/icons.rs +++ b/crates/nu-command/src/viewers/icons.rs @@ -1,6 +1,6 @@ +use ahash::HashMap; use nu_protocol::{ShellError, Span}; use once_cell::sync::Lazy; -use std::collections::HashMap; use std::path::Path; // Attribution: Thanks exa. Most of this file is taken from around here @@ -86,7 +86,7 @@ impl Icons { // } static MAP_BY_NAME: Lazy> = Lazy::new(|| { - HashMap::from([ + [ (".Trash", '\u{f1f8}'), //  (".atom", '\u{e764}'), //  (".bashprofile", '\u{e615}'), //  @@ -124,7 +124,9 @@ static MAP_BY_NAME: Lazy> = Lazy::new(|| { ("npmignore", '\u{e71e}'), //  ("rubydoc", '\u{e73b}'), //  ("yarn.lock", '\u{e718}'), //  - ]) + ] + .into_iter() + .collect() }); pub fn icon_for_file(file_path: &Path, span: Span) -> Result { diff --git a/crates/nu-engine/Cargo.toml b/crates/nu-engine/Cargo.toml index 560d6d0399..c9c2ffb111 100644 --- a/crates/nu-engine/Cargo.toml +++ b/crates/nu-engine/Cargo.toml @@ -17,6 +17,7 @@ nu-glob = { path = "../nu-glob", version = "0.81.1" } nu-utils = { path = "../nu-utils", version = "0.81.1" } sysinfo ="0.29" +ahash = "0.8.3" [features] plugin = [] diff --git a/crates/nu-engine/src/column.rs b/crates/nu-engine/src/column.rs index aba520672d..121c0f1542 100644 --- a/crates/nu-engine/src/column.rs +++ b/crates/nu-engine/src/column.rs @@ -1,5 +1,5 @@ +use ahash::HashSet; use nu_protocol::Value; -use std::collections::HashSet; pub fn get_columns(input: &[Value]) -> Vec { let mut columns = vec![]; diff --git a/crates/nu-engine/src/env.rs b/crates/nu-engine/src/env.rs index 3d69cca731..f8d289a27a 100644 --- a/crates/nu-engine/src/env.rs +++ b/crates/nu-engine/src/env.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use ahash::{HashMap, HashMapExt}; use std::path::{Path, PathBuf}; use nu_protocol::ast::{Call, Expr, PathMember}; diff --git a/crates/nu-engine/src/eval.rs b/crates/nu-engine/src/eval.rs index 8e0fadf8dd..f54873532b 100644 --- a/crates/nu-engine/src/eval.rs +++ b/crates/nu-engine/src/eval.rs @@ -1,4 +1,5 @@ use crate::{current_dir_str, get_full_help, nu_variable::NuVariable}; +use ahash::{HashMap, HashMapExt}; use nu_path::expand_path_with; use nu_protocol::{ ast::{ @@ -9,7 +10,6 @@ use nu_protocol::{ DataSource, IntoInterruptiblePipelineData, IntoPipelineData, PipelineData, PipelineMetadata, Range, ShellError, Span, Spanned, Unit, Value, VarId, ENV_VARIABLE_ID, }; -use std::collections::HashMap; use std::time::Instant; pub fn eval_operator(op: &Expression) -> Result { diff --git a/crates/nu-engine/src/scope.rs b/crates/nu-engine/src/scope.rs index 78e98ca863..a20993f71f 100644 --- a/crates/nu-engine/src/scope.rs +++ b/crates/nu-engine/src/scope.rs @@ -1,10 +1,10 @@ +use ahash::{HashMap, HashMapExt}; use nu_protocol::{ engine::{Command, EngineState, Stack, Visibility}, ShellError, Signature, Span, SyntaxShape, Type, Value, }; use std::borrow::Borrow; use std::cmp::Ordering; -use std::collections::HashMap; pub fn create_scope( engine_state: &EngineState, diff --git a/crates/nu-explore/Cargo.toml b/crates/nu-explore/Cargo.toml index 660a545e17..02cadaee5d 100644 --- a/crates/nu-explore/Cargo.toml +++ b/crates/nu-explore/Cargo.toml @@ -25,4 +25,5 @@ strip-ansi-escapes = "0.1" crossterm = "0.26" ratatui = "0.20" ansi-str = "0.7" +ahash = "0.8.3" lscolors = { version = "0.14", default-features = false, features = ["nu-ansi-term"] } diff --git a/crates/nu-explore/src/commands/config_show.rs b/crates/nu-explore/src/commands/config_show.rs index 7180926cbd..9683c5c087 100644 --- a/crates/nu-explore/src/commands/config_show.rs +++ b/crates/nu-explore/src/commands/config_show.rs @@ -1,10 +1,10 @@ -use std::{collections::HashMap, io::Result}; - +use ahash::HashMap; use nu_protocol::{ engine::{EngineState, Stack}, Value, }; use ratatui::layout::Rect; +use std::io::Result; use crate::{ nu_common::{try_build_table, NuSpan}, diff --git a/crates/nu-explore/src/commands/help.rs b/crates/nu-explore/src/commands/help.rs index 32e38fe980..5b51372fb5 100644 --- a/crates/nu-explore/src/commands/help.rs +++ b/crates/nu-explore/src/commands/help.rs @@ -1,7 +1,5 @@ -use std::{ - collections::HashMap, - io::{self, Result}, -}; +use ahash::{HashMap, HashMapExt}; +use std::io::{self, Result}; use crossterm::event::KeyEvent; use nu_protocol::{ diff --git a/crates/nu-explore/src/nu_common/value.rs b/crates/nu-explore/src/nu_common/value.rs index c05931d194..108aa5fbbd 100644 --- a/crates/nu-explore/src/nu_common/value.rs +++ b/crates/nu-explore/src/nu_common/value.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use ahash::{HashMap, HashMapExt}; use nu_engine::get_columns; use nu_protocol::{ast::PathMember, ListStream, PipelineData, PipelineMetadata, RawStream, Value}; diff --git a/crates/nu-explore/src/pager/mod.rs b/crates/nu-explore/src/pager/mod.rs index 00fe579990..f746374b1b 100644 --- a/crates/nu-explore/src/pager/mod.rs +++ b/crates/nu-explore/src/pager/mod.rs @@ -5,11 +5,12 @@ mod status_bar; use std::{ cmp::min, - collections::HashMap, io::{self, Result, Stdout}, sync::atomic::Ordering, }; +use ahash::{HashMap, HashMapExt}; + use crossterm::{ event::{KeyCode, KeyEvent, KeyModifiers}, execute, diff --git a/crates/nu-explore/src/registry/mod.rs b/crates/nu-explore/src/registry/mod.rs index 0e8c9bf8c5..7b51973bc4 100644 --- a/crates/nu-explore/src/registry/mod.rs +++ b/crates/nu-explore/src/registry/mod.rs @@ -1,11 +1,11 @@ mod command; -use std::{borrow::Cow, collections::HashMap}; - use crate::{ commands::{SimpleCommand, ViewCommand}, views::View, }; +use ahash::HashMap; +use std::borrow::Cow; pub use command::Command; diff --git a/crates/nu-explore/src/views/record/mod.rs b/crates/nu-explore/src/views/record/mod.rs index 9293776f14..1cbc740f7e 100644 --- a/crates/nu-explore/src/views/record/mod.rs +++ b/crates/nu-explore/src/views/record/mod.rs @@ -1,6 +1,8 @@ mod tablew; -use std::{borrow::Cow, collections::HashMap}; +use std::borrow::Cow; + +use ahash::{HashMap, HashMapExt}; use crossterm::event::{KeyCode, KeyEvent}; use nu_color_config::{get_color_map, StyleComputer}; diff --git a/crates/nu-parser/Cargo.toml b/crates/nu-parser/Cargo.toml index d6d871f1f4..e95d2f3fa1 100644 --- a/crates/nu-parser/Cargo.toml +++ b/crates/nu-parser/Cargo.toml @@ -21,6 +21,7 @@ chrono = { default-features = false, features = ['std'], version = "0.4" } itertools = "0.10" log = "0.4" serde_json = "1.0" +ahash = "0.8.3" [dev-dependencies] rstest = { version = "0.17", default-features = false } diff --git a/crates/nu-parser/src/parse_keywords.rs b/crates/nu-parser/src/parse_keywords.rs index 72f716b6a5..71c5e19f84 100644 --- a/crates/nu-parser/src/parse_keywords.rs +++ b/crates/nu-parser/src/parse_keywords.rs @@ -1,4 +1,5 @@ use crate::parser_path::ParserPath; +use ahash::{HashMap, HashMapExt, HashSet, HashSetExt}; use itertools::Itertools; use log::trace; use nu_path::canonicalize_with; @@ -11,7 +12,6 @@ use nu_protocol::{ span, Alias, BlockId, Exportable, Module, ModuleId, ParseError, PositionalArg, ResolvedImportPattern, Span, Spanned, SyntaxShape, Type, VarId, }; -use std::collections::{HashMap, HashSet}; use std::ffi::OsStr; use std::path::{Path, PathBuf}; diff --git a/crates/nu-parser/src/parser.rs b/crates/nu-parser/src/parser.rs index 21db2da380..1919d7e808 100644 --- a/crates/nu-parser/src/parser.rs +++ b/crates/nu-parser/src/parser.rs @@ -27,13 +27,10 @@ use crate::parse_keywords::{ parse_use, parse_where, parse_where_expr, LIB_DIRS_VAR, }; +use ahash::{HashMap, HashMapExt, HashSet, HashSetExt}; use itertools::Itertools; use log::trace; -use std::{ - collections::{HashMap, HashSet}, - num::ParseIntError, - str, -}; +use std::{num::ParseIntError, str}; #[cfg(feature = "plugin")] use crate::parse_keywords::parse_register; diff --git a/crates/nu-plugin/Cargo.toml b/crates/nu-plugin/Cargo.toml index 04cb89009d..71cfe900d4 100644 --- a/crates/nu-plugin/Cargo.toml +++ b/crates/nu-plugin/Cargo.toml @@ -18,3 +18,4 @@ bincode = "1.3" rmp-serde = "1.1" serde = { version = "1.0" } serde_json = { version = "1.0"} +ahash = "0.8.3" diff --git a/crates/nu-plugin/src/plugin/mod.rs b/crates/nu-plugin/src/plugin/mod.rs index f470e83d6b..c341f2b94b 100644 --- a/crates/nu-plugin/src/plugin/mod.rs +++ b/crates/nu-plugin/src/plugin/mod.rs @@ -1,7 +1,7 @@ mod declaration; +use ahash::HashMap; pub use declaration::PluginDeclaration; use nu_engine::documentation::get_flags_section; -use std::collections::HashMap; use crate::protocol::{CallInput, LabeledError, PluginCall, PluginData, PluginResponse}; use crate::EncodingType; diff --git a/crates/nu-protocol/Cargo.toml b/crates/nu-protocol/Cargo.toml index 6033a9d10e..08fba6567b 100644 --- a/crates/nu-protocol/Cargo.toml +++ b/crates/nu-protocol/Cargo.toml @@ -29,6 +29,7 @@ strum = "0.24" strum_macros = "0.24" thiserror = "1.0" typetag = "0.2" +ahash = "0.8.3" [features] plugin = ["serde_json"] diff --git a/crates/nu-protocol/src/ast/call.rs b/crates/nu-protocol/src/ast/call.rs index de51617ba3..bb3b4565f4 100644 --- a/crates/nu-protocol/src/ast/call.rs +++ b/crates/nu-protocol/src/ast/call.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use ahash::{HashMap, HashMapExt}; use serde::{Deserialize, Serialize}; diff --git a/crates/nu-protocol/src/ast/import_pattern.rs b/crates/nu-protocol/src/ast/import_pattern.rs index 1f1fa5712b..b6b6f7e7d7 100644 --- a/crates/nu-protocol/src/ast/import_pattern.rs +++ b/crates/nu-protocol/src/ast/import_pattern.rs @@ -1,7 +1,7 @@ use serde::{Deserialize, Serialize}; use crate::{span, ModuleId, Span}; -use std::collections::HashSet; +use ahash::{HashSet, HashSetExt}; #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub enum ImportPatternMember { diff --git a/crates/nu-protocol/src/config.rs b/crates/nu-protocol/src/config.rs index 088252b52f..2237a4516c 100644 --- a/crates/nu-protocol/src/config.rs +++ b/crates/nu-protocol/src/config.rs @@ -1,6 +1,6 @@ use crate::{ShellError, Span, Value}; +use ahash::{HashMap, HashMapExt}; use serde::{Deserialize, Serialize}; -use std::collections::HashMap; const TRIM_STRATEGY_DEFAULT: TrimStrategy = TrimStrategy::Wrap { try_to_keep_words: true, diff --git a/crates/nu-protocol/src/engine/capture_block.rs b/crates/nu-protocol/src/engine/capture_block.rs index 291a009e08..3065182008 100644 --- a/crates/nu-protocol/src/engine/capture_block.rs +++ b/crates/nu-protocol/src/engine/capture_block.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use ahash::HashMap; use crate::{BlockId, Value, VarId}; diff --git a/crates/nu-protocol/src/engine/engine_state.rs b/crates/nu-protocol/src/engine/engine_state.rs index aa3a3fbd20..464b4bf3c6 100644 --- a/crates/nu-protocol/src/engine/engine_state.rs +++ b/crates/nu-protocol/src/engine/engine_state.rs @@ -7,17 +7,15 @@ use crate::{ Signature, Span, Type, VarId, Variable, VirtualPathId, }; use crate::{ParseError, Value}; +use ahash::{HashMap, HashMapExt, HashSet, HashSetExt}; use core::panic; use std::borrow::Borrow; use std::num::NonZeroUsize; use std::path::Path; use std::path::PathBuf; -use std::{ - collections::{HashMap, HashSet}, - sync::{ - atomic::{AtomicBool, AtomicU32}, - Arc, Mutex, - }, +use std::sync::{ + atomic::{AtomicBool, AtomicU32}, + Arc, Mutex, }; static PWD_ENV: &str = "PWD"; @@ -170,7 +168,9 @@ impl EngineState { false, ), ctrlc: None, - env_vars: EnvVars::from([(DEFAULT_OVERLAY_NAME.to_string(), HashMap::new())]), + env_vars: [(DEFAULT_OVERLAY_NAME.to_string(), HashMap::new())] + .into_iter() + .collect(), previous_env_vars: HashMap::new(), config: Config::default(), pipeline_externals_state: Arc::new((AtomicU32::new(0), AtomicU32::new(0))), @@ -436,7 +436,7 @@ impl EngineState { env_vars.insert(name, val); } else { self.env_vars - .insert(overlay_name, HashMap::from([(name, val)])); + .insert(overlay_name, [(name, val)].into_iter().collect()); } } diff --git a/crates/nu-protocol/src/engine/overlay.rs b/crates/nu-protocol/src/engine/overlay.rs index 640763bd37..6d1460e87f 100644 --- a/crates/nu-protocol/src/engine/overlay.rs +++ b/crates/nu-protocol/src/engine/overlay.rs @@ -1,6 +1,6 @@ use crate::{DeclId, ModuleId, OverlayId, Type, Value, VarId}; +use ahash::{HashMap, HashMapExt}; use std::borrow::Borrow; -use std::collections::HashMap; use std::hash::{Hash, Hasher}; pub static DEFAULT_OVERLAY_NAME: &str = "zero"; diff --git a/crates/nu-protocol/src/engine/stack.rs b/crates/nu-protocol/src/engine/stack.rs index 9e4dc7b477..90cc6f36fb 100644 --- a/crates/nu-protocol/src/engine/stack.rs +++ b/crates/nu-protocol/src/engine/stack.rs @@ -1,4 +1,4 @@ -use std::collections::{HashMap, HashSet}; +use ahash::{HashMap, HashMapExt, HashSet, HashSetExt}; use crate::engine::EngineState; use crate::engine::DEFAULT_OVERLAY_NAME; @@ -154,13 +154,14 @@ impl Stack { if let Some(env_vars) = scope.get_mut(last_overlay) { env_vars.insert(var, value); } else { - scope.insert(last_overlay.into(), HashMap::from([(var, value)])); + scope.insert(last_overlay.into(), [(var, value)].into_iter().collect()); } } else { - self.env_vars.push(HashMap::from([( - last_overlay.into(), - HashMap::from([(var, value)]), - )])); + self.env_vars.push( + [(last_overlay.into(), [(var, value)].into_iter().collect())] + .into_iter() + .collect(), + ); } } else { // TODO: Remove panic @@ -394,7 +395,7 @@ impl Stack { env_hidden.insert(name.into()); } else { self.env_hidden - .insert(active_overlay.into(), HashSet::from([name.into()])); + .insert(active_overlay.into(), [name.into()].into_iter().collect()); } return true; diff --git a/crates/nu-protocol/src/value/from_value.rs b/crates/nu-protocol/src/value/from_value.rs index c69e188e66..1993c8c716 100644 --- a/crates/nu-protocol/src/value/from_value.rs +++ b/crates/nu-protocol/src/value/from_value.rs @@ -1,4 +1,4 @@ -use std::collections::HashMap; +use ahash::{HashMap, HashMapExt}; use std::path::PathBuf; use std::str::FromStr; diff --git a/crates/nu-protocol/src/value/mod.rs b/crates/nu-protocol/src/value/mod.rs index 7b2d3b8801..9916e06c1b 100644 --- a/crates/nu-protocol/src/value/mod.rs +++ b/crates/nu-protocol/src/value/mod.rs @@ -11,6 +11,7 @@ use crate::ast::{Math, Operator}; use crate::engine::EngineState; use crate::ShellError; use crate::{did_you_mean, BlockId, Config, Span, Spanned, Type, VarId}; +use ahash::HashMap; use byte_unit::ByteUnit; use chrono::{DateTime, Duration, FixedOffset}; use chrono_humanize::HumanTime; @@ -25,7 +26,6 @@ pub use range::*; use serde::{Deserialize, Serialize}; use std::{ borrow::Cow, - collections::HashMap, fmt::{Display, Formatter, Result as FmtResult}, iter, path::PathBuf, diff --git a/crates/nu-system/Cargo.toml b/crates/nu-system/Cargo.toml index dbc1233825..556c7047cd 100644 --- a/crates/nu-system/Cargo.toml +++ b/crates/nu-system/Cargo.toml @@ -31,4 +31,5 @@ mach2 = "0.4" chrono = "0.4" ntapi = "0.4" once_cell = "1.17" +ahash="0.8.3" winapi = { version = "0.3", features = ["tlhelp32", "fileapi", "handleapi", "ifdef", "ioapiset", "minwindef", "pdh", "psapi", "synchapi", "sysinfoapi", "winbase", "winerror", "winioctl", "winnt", "oleauto", "wbemcli", "rpcdce", "combaseapi", "objidl", "powerbase", "netioapi", "lmcons", "lmaccess", "lmapibuf", "memoryapi", "shellapi", "std", "securitybaseapi"] } diff --git a/crates/nu-system/src/windows.rs b/crates/nu-system/src/windows.rs index ebc85f91cc..67ad648536 100644 --- a/crates/nu-system/src/windows.rs +++ b/crates/nu-system/src/windows.rs @@ -1,6 +1,7 @@ // Attribution: a lot of this came from procs https://github.com/dalance/procs // and sysinfo https://github.com/GuillaumeGomez/sysinfo +use ahash::{HashMap, HashMapExt}; use chrono::offset::TimeZone; use chrono::{Local, NaiveDate}; use libc::c_void; @@ -13,7 +14,6 @@ use ntapi::ntrtl::{RtlGetVersion, PRTL_USER_PROCESS_PARAMETERS, RTL_USER_PROCESS use ntapi::ntwow64::{PEB32, PRTL_USER_PROCESS_PARAMETERS32, RTL_USER_PROCESS_PARAMETERS32}; use once_cell::sync::Lazy; use std::cell::RefCell; -use std::collections::HashMap; use std::ffi::OsString; use std::mem::{size_of, zeroed, MaybeUninit}; use std::os::windows::ffi::OsStringExt; diff --git a/crates/nu-table/Cargo.toml b/crates/nu-table/Cargo.toml index ad35af121a..913b0cadd9 100644 --- a/crates/nu-table/Cargo.toml +++ b/crates/nu-table/Cargo.toml @@ -18,6 +18,7 @@ nu-color-config = { path = "../nu-color-config", version = "0.81.1" } nu-ansi-term = "0.47.0" tabled = { version = "0.12", features = ["color"], default-features = false } +ahash = "0.8.3" [dev-dependencies] # nu-test-support = { path="../nu-test-support", version = "0.81.1" } diff --git a/crates/nu-table/src/table.rs b/crates/nu-table/src/table.rs index 846ea3149f..a38784841a 100644 --- a/crates/nu-table/src/table.rs +++ b/crates/nu-table/src/table.rs @@ -1,8 +1,9 @@ use crate::table_theme::TableTheme; +use ahash::HashMap; use nu_ansi_term::Style; use nu_color_config::TextStyle; use nu_protocol::TrimStrategy; -use std::{cmp::min, collections::HashMap}; +use std::cmp::min; use tabled::{ builder::Builder, grid::{ @@ -375,7 +376,7 @@ fn load_theme( let mut theme = theme.get_theme(); if !with_header { - theme.set_horizontals(HashMap::new()); + theme.set_horizontals(std::collections::HashMap::new()); } else if with_footer && table.count_rows() > 2 { if let Some(line) = theme.get_horizontal(1) { theme.insert_horizontal(table.count_rows() - 1, line); diff --git a/crates/nu-table/src/types/expanded.rs b/crates/nu-table/src/types/expanded.rs index a5a80ca741..99a5a279a5 100644 --- a/crates/nu-table/src/types/expanded.rs +++ b/crates/nu-table/src/types/expanded.rs @@ -1,7 +1,7 @@ +use ahash::{HashMap, HashMapExt}; use nu_color_config::{Alignment, StyleComputer, TextStyle}; use nu_engine::column::get_columns; use nu_protocol::{ast::PathMember, Config, Span, TableIndexMode, Value}; -use std::collections::HashMap; use std::sync::Arc; use std::{cmp::max, sync::atomic::AtomicBool}; diff --git a/crates/nu-table/src/types/mod.rs b/crates/nu-table/src/types/mod.rs index 151c78d2f2..655c119ea1 100644 --- a/crates/nu-table/src/types/mod.rs +++ b/crates/nu-table/src/types/mod.rs @@ -2,10 +2,10 @@ mod collapse; mod expanded; mod general; +use ahash::HashMap; use nu_color_config::{Alignment, StyleComputer, TextStyle}; use nu_protocol::TrimStrategy; use nu_protocol::{Config, FooterMode, ShellError, Span, Value}; -use std::collections::HashMap; use crate::{string_wrap, NuTable, TableConfig, TableTheme}; diff --git a/crates/nu-table/src/unstructured_table.rs b/crates/nu-table/src/unstructured_table.rs index 6bb4429739..d0ea2e73d9 100644 --- a/crates/nu-table/src/unstructured_table.rs +++ b/crates/nu-table/src/unstructured_table.rs @@ -1,5 +1,3 @@ -use std::collections::HashMap; - use nu_color_config::StyleComputer; use nu_protocol::{Config, Span, Value}; use tabled::{ @@ -46,7 +44,7 @@ fn build_table(val: TableValue, style_computer: &StyleComputer, theme: &TableThe let mut table = PoolTable::from(val); let mut theme = theme.get_theme_full(); - theme.set_horizontals(HashMap::default()); + theme.set_horizontals(std::collections::HashMap::default()); table.with(SetRawStyle(theme)); table.with(SetAlignment(AlignmentHorizontal::Left)); diff --git a/crates/nu_plugin_query/Cargo.toml b/crates/nu_plugin_query/Cargo.toml index 933a06cd1e..e3c7defb69 100644 --- a/crates/nu_plugin_query/Cargo.toml +++ b/crates/nu_plugin_query/Cargo.toml @@ -25,3 +25,4 @@ gjson = "0.8" scraper = { default-features = false, version = "0.16" } sxd-document = "0.3" sxd-xpath = "0.4" +ahash = "0.8.3" diff --git a/crates/nu_plugin_query/src/web_tables.rs b/crates/nu_plugin_query/src/web_tables.rs index db175c6b8c..4ccca924d7 100644 --- a/crates/nu_plugin_query/src/web_tables.rs +++ b/crates/nu_plugin_query/src/web_tables.rs @@ -1,6 +1,6 @@ use crate::query_web::css; +use ahash::{HashMap, HashMapExt}; use scraper::{element_ref::ElementRef, Html, Selector as ScraperSelector}; -use std::collections::HashMap; pub type Headers = HashMap;