From 9901141b5f44ceb455aaecab845738fb3fab86c4 Mon Sep 17 00:00:00 2001 From: xmppftw Date: Thu, 19 Dec 2024 18:14:18 +0100 Subject: [PATCH] parsers: Rename Message::get_best_owned to get_best_cloned --- parsers/ChangeLog | 4 ++-- parsers/src/message.rs | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/parsers/ChangeLog b/parsers/ChangeLog index 9697a51a9803ddc8d700859b90860e1ae459ba1b..8f0f9619c3eba4c5d793d76e5e9181eb98f56124 100644 --- a/parsers/ChangeLog +++ b/parsers/ChangeLog @@ -51,8 +51,8 @@ XXXX-YY-ZZ RELEASER the size of these elements (!472). - Add Message::extract_valid_payload method to warn in case of failure and return simply Option instead of Result> (!497) - - Add Message::get_best_body_owned and Message::get_best_subject_owned - for best developer experience when performance is not an issue (!497) + - Add Message::get_best_body_cloned and Message::get_best_subject_cloned + to clone automatically when performance is not an issue (!497) Version 0.21.0: 2024-07-25 Emmanuel Gil Peyrot diff --git a/parsers/src/message.rs b/parsers/src/message.rs index f7c77c41975531e5126f62baa2e341c7fc53f487..32448adf2b2439cf2c3daecfe5b4e541ed61365b 100644 --- a/parsers/src/message.rs +++ b/parsers/src/message.rs @@ -183,7 +183,7 @@ impl Message { map.iter().map(|(lang, value)| (lang.clone(), value)).next() } - fn get_best_owned>( + fn get_best_cloned>( map: &BTreeMap, preferred_langs: Vec<&str>, ) -> Option<(Lang, T)> { @@ -205,9 +205,9 @@ impl Message { Message::get_best::(&self.bodies, preferred_langs) } - /// Owned variant of [`Message::get_best_body`] - pub fn get_best_body_owned(&self, preferred_langs: Vec<&str>) -> Option<(Lang, Body)> { - Message::get_best_owned::(&self.bodies, preferred_langs) + /// Cloned variant of [`Message::get_best_body`] + pub fn get_best_body_cloned(&self, preferred_langs: Vec<&str>) -> Option<(Lang, Body)> { + Message::get_best_cloned::(&self.bodies, preferred_langs) } /// Returns the best matching subject from a list of languages. @@ -221,9 +221,9 @@ impl Message { Message::get_best::(&self.subjects, preferred_langs) } - /// Owned variant of [`Message::get_best_subject`] - pub fn get_best_subject_owned(&self, preferred_langs: Vec<&str>) -> Option<(Lang, Subject)> { - Message::get_best_owned::(&self.subjects, preferred_langs) + /// Cloned variant of [`Message::get_best_subject`] + pub fn get_best_subject_cloned(&self, preferred_langs: Vec<&str>) -> Option<(Lang, Subject)> { + Message::get_best_cloned::(&self.subjects, preferred_langs) } /// Try to extract the given payload type from the message's payloads. @@ -499,9 +499,9 @@ mod tests { assert_eq!(subject, &Subject::from_str("Hello world!").unwrap()); } - // Test owned variant. + // Test cloned variant. { - let (lang, subject) = message.get_best_subject_owned(vec!["en"]).unwrap(); + let (lang, subject) = message.get_best_subject_cloned(vec!["en"]).unwrap(); assert_eq!(lang, ""); assert_eq!(subject, Subject::from_str("Hello world!").unwrap()); } @@ -546,9 +546,9 @@ mod tests { assert_eq!(body, &Body::from_str("Hello world!").unwrap()); } - // Test owned variant. + // Test cloned variant. { - let (lang, body) = message.get_best_body_owned(vec!["ja"]).unwrap(); + let (lang, body) = message.get_best_body_cloned(vec!["ja"]).unwrap(); assert_eq!(lang, ""); assert_eq!(body, Body::from_str("Hello world!").unwrap()); }