Offline, privacy-first grammar checker. Fast, open-source, Rust-powered
perf(core): avoid cloning in `DictWordMetadata::append` (#2912)
Steve Kurch7148d2bd5bf6
diff --git a/harper-core/src/dict_word_metadata.rs b/harper-core/src/dict_word_metadata.rsindex d70a1c28c..97cc96591 100644--- a/harper-core/src/dict_word_metadata.rs+++ b/harper-core/src/dict_word_metadata.rs@@ -185,35 +185,9 @@ impl DictWordMetadata {/// Produce a copy of `self` with the known properties of `other` set.pub fn or(&self, other: &Self) -> Self {- macro_rules! merge {- ($a:expr, $b:expr) => {- match ($a, $b) {- (Some(a), Some(b)) => Some(a.or(&b)),- (Some(a), None) => Some(a),- (None, Some(b)) => Some(b),- (None, None) => None,- }- };- }-- Self {- noun: merge!(self.noun, other.noun),- pronoun: merge!(self.pronoun, other.pronoun),- verb: merge!(self.verb, other.verb),- adjective: merge!(self.adjective, other.adjective),- adverb: merge!(self.adverb, other.adverb),- conjunction: merge!(self.conjunction, other.conjunction),- determiner: merge!(self.determiner, other.determiner),- affix: merge!(self.affix, other.affix),- preposition: self.preposition || other.preposition,- dialects: self.dialects | other.dialects,- orth_info: self.orth_info | other.orth_info,- swear: self.swear.or(other.swear),- common: self.common || other.common,- derived_from: self.derived_from.or(other.derived_from),- pos_tag: self.pos_tag.or(other.pos_tag),- np_member: self.np_member.or(other.np_member),- }+ let mut clone = self.clone();+ clone.merge(other);+ clone}/// Given a UPOS tag, discard any metadata that would disagree with the given POS tag.@@ -757,8 +731,35 @@ impl DictWordMetadata {}/// Same thing as [`Self::or`], except in-place rather than a clone.- pub fn append(&mut self, other: &Self) -> &mut Self {- *self = self.or(other);+ pub fn merge(&mut self, other: &Self) -> &mut Self {+ macro_rules! merge {+ ($a:expr, $b:expr) => {+ match ($a, $b) {+ (Some(a), Some(b)) => Some(a.or(&b)),+ (Some(a), None) => Some(a),+ (None, Some(b)) => Some(b),+ (None, None) => None,+ }+ };+ }++ self.noun = merge!(self.noun, other.noun);+ self.pronoun = merge!(self.pronoun, other.pronoun);+ self.verb = merge!(self.verb, other.verb);+ self.adjective = merge!(self.adjective, other.adjective);+ self.adverb = merge!(self.adverb, other.adverb);+ self.conjunction = merge!(self.conjunction, other.conjunction);+ self.determiner = merge!(self.determiner, other.determiner);+ self.affix = merge!(self.affix, other.affix);+ self.preposition |= other.preposition;+ self.dialects |= other.dialects;+ self.orth_info |= other.orth_info;+ self.swear = self.swear.or(other.swear);+ self.common |= other.common;+ self.derived_from = self.derived_from.or(other.derived_from);+ self.pos_tag = self.pos_tag.or(other.pos_tag);+ self.np_member = self.np_member.or(other.np_member);+self}}diff --git a/harper-core/src/spell/merged_dictionary.rs b/harper-core/src/spell/merged_dictionary.rsindex 3c144e176..b18436c87 100644--- a/harper-core/src/spell/merged_dictionary.rs+++ b/harper-core/src/spell/merged_dictionary.rs@@ -95,10 +95,27 @@ impl Dictionary for MergedDictionary {}fn get_word_metadata(&self, word: &[char]) -> Option<Cow<'_, DictWordMetadata>> {- self.children+ let mut meta_iter = self+ .children.iter()- .filter_map(|d| d.get_word_metadata(word))- .reduce(|acc, md| Cow::Owned(acc.or(&md)))+ .filter_map(|d| d.get_word_metadata(word));++ let first = meta_iter.next()?;++ // Check if multiple entries were found for the word.+ if let Some(second) = meta_iter.next() {+ // If so, merge them.+ let mut first = first.into_owned();+ first.merge(&second);+ meta_iter.for_each(|additional_md| {+ first.merge(&additional_md);+ });++ Some(Cow::Owned(first))+ } else {+ // If not, return the sole found entry.+ Some(first)+ }}fn words_iter(&self) -> Box<dyn Iterator<Item = &'_ [char]> + Send + '_> {diff --git a/harper-core/src/spell/rune/attribute_list.rs b/harper-core/src/spell/rune/attribute_list.rsindex 575b739a1..1dcb85ea5 100644--- a/harper-core/src/spell/rune/attribute_list.rs+++ b/harper-core/src/spell/rune/attribute_list.rs@@ -72,7 +72,7 @@ impl AttributeList {let Some(property) = self.properties.get(attr) else {continue;};- base_metadata.append(&property.metadata);+ base_metadata.merge(&property.metadata);}// Second pass: Process all affix rules to generate derived forms@@ -83,7 +83,7 @@ impl AttributeList {};// Add any base metadata from this affix rule- base_metadata.append(&expansion.base_metadata);+ base_metadata.merge(&expansion.base_metadata);// Track new words generated by this affix rulelet mut new_words: HashMap<CharString, DictWordMetadata> = HashMap::new();@@ -107,7 +107,7 @@ impl AttributeList {));} else {// Apply target metadata immediately- metadata.append(&target.metadata);+ metadata.merge(&target.metadata);}}}@@ -150,7 +150,7 @@ impl AttributeList {);// Update the metadata of the expanded wordlet target_metadata = word_map.get_metadata_mut_chars(&new_word).unwrap();- target_metadata.append(&metadata);+ target_metadata.merge(&metadata);target_metadata.derived_from =Some(WordId::from_word_chars(&annotated_word.letters));}@@ -161,7 +161,7 @@ impl AttributeList {if let Some(existing_metadata) = word_map.get_metadata_mut_chars(&key) {// Merge with existing metadata- existing_metadata.append(&value);+ existing_metadata.merge(&value);} else {// Add new entryword_map.insert(WordMapEntry {@@ -178,7 +178,7 @@ impl AttributeList {// Merge with any existing metadata for this wordif let Some(existing_metadata) = word_map.get_with_chars(&annotated_word.letters) {- full_metadata.append(&existing_metadata.metadata);+ full_metadata.merge(&existing_metadata.metadata);}// Store the final metadata for the base word@@ -199,7 +199,7 @@ impl AttributeList {word_map.get_metadata_mut_chars(&letters).unwrap()- .append(&metadata);+ .merge(&metadata);}}