From 97fc7de6754c8b5c383d7d5e3f9e26b3bbfb08fb Mon Sep 17 00:00:00 2001 From: Anthony Rubick <68485672+AnthonyMichaelTDM@users.noreply.github.com> Date: Sun, 9 Jul 2023 20:07:09 -0700 Subject: fix: minor code cleanup and pedantic lints (#134) --- src/config/conversation.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/config/conversation.rs') diff --git a/src/config/conversation.rs b/src/config/conversation.rs index 8343400..b9a0793 100644 --- a/src/config/conversation.rs +++ b/src/config/conversation.rs @@ -43,11 +43,12 @@ impl Conversation { self.tokens = num_tokens_from_messages(&self.build_emssages("")); } + #[allow(clippy::unnecessary_wraps)] pub fn add_message(&mut self, input: &str, output: &str) -> Result<()> { let mut need_add_msg = true; if self.messages.is_empty() { if let Some(role) = self.role.as_ref() { - self.messages.extend(role.build_emssages(input)); + self.messages.extend(role.build_messages(input)); need_add_msg = false; } } @@ -67,15 +68,15 @@ impl Conversation { pub fn echo_messages(&self, content: &str) -> String { let messages = self.build_emssages(content); - serde_yaml::to_string(&messages).unwrap_or("Unable to echo message".into()) + serde_yaml::to_string(&messages).unwrap_or_else(|_| "Unable to echo message".into()) } pub fn build_emssages(&self, content: &str) -> Vec { - let mut messages = self.messages.to_vec(); + let mut messages = self.messages.clone(); let mut need_add_msg = true; if messages.is_empty() { if let Some(role) = self.role.as_ref() { - messages = role.build_emssages(content); + messages = role.build_messages(content); need_add_msg = false; } }; -- cgit v1.2.3