ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

formatter: replace HashMap by Vec for rules

Browse source 
We only ever iterate over the map, we never look up by key.
This commit is contained in:
Martin von Zweigbergk 2023-01-10 08:36:24 -08:00 committed by Martin von Zweigbergk
parent fcbc791c3d
commit 25422b2abd
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/formatter.rs
View file

@ -82,6 +82,8 @@ where
}
}
type Rules = Vec<(Vec<String>, Style)>;
/// Creates `Formatter` instances with preconfigured parameters.
#[derive(Clone, Debug)]
pub struct FormatterFactory {
@ -91,9 +93,7 @@ pub struct FormatterFactory {
#[derive(Clone, Debug)]
enum FormatterFactoryKind {
PlainText,
Color {
rules: Arc<HashMap<Vec<String>, Style>>,
},
Color { rules: Arc<Rules> },
}
impl FormatterFactory {
@ -169,14 +169,14 @@ impl Style {
pub struct ColorFormatter<W> {
output: W,
rules: Arc<HashMap<Vec<String>, Style>>,
rules: Arc<Rules>,
labels: Vec<String>,
cached_styles: HashMap<Vec<String>, Style>,
current_style: Style,
}
impl<W: Write> ColorFormatter<W> {
pub fn new(output: W, rules: Arc<HashMap<Vec<String>, Style>>) -> ColorFormatter<W> {
pub fn new(output: W, rules: Arc<Rules>) -> ColorFormatter<W> {
ColorFormatter {
output,
rules,
@ -270,8 +270,8 @@ impl<W: Write> ColorFormatter<W> {
}
}
fn rules_from_config(config: &config::Config) -> HashMap<Vec<String>, Style> {
let mut result = HashMap::new();
fn rules_from_config(config: &config::Config) -> Rules {
let mut result = vec![];
if let Ok(table) = config.get_table("colors") {
for (key, value) in table {
let labels = key
@ -286,7 +286,7 @@ fn rules_from_config(config: &config::Config) -> HashMap<Vec<String>, Style> {
bold: None,
underlined: None,
};
result.insert(labels, style);
result.push((labels, style));
}
config::ValueKind::Table(style_table) => {
let mut style = Style::default();
@ -310,7 +310,7 @@ fn rules_from_config(config: &config::Config) -> HashMap<Vec<String>, Style> {
style.underlined = Some(*value);
}
}
result.insert(labels, style);
result.push((labels, style));
}
_ => {}
}