mirror of
https://github.com/nushell/nushell.git
synced 2025-08-09 19:57:44 +02:00
Changes HashMap to use aHash instead, giving a performance boost. (#9391)
# Description see https://github.com/nushell/nushell/issues/9390 using `ahash` instead of the default hasher. this will not affect compile time as we where already building `ahash`. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A clippy::needless_collect -A clippy::result_large_err` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass - `cargo run -- crates/nu-std/tests/run.nu` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
This commit is contained in:
@ -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('#') {
|
||||
|
@ -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())),
|
||||
|
Reference in New Issue
Block a user