From 83243ffec34d1df118c66a4acc1bb9218fc9e217 Mon Sep 17 00:00:00 2001 From: Aaron Weiss Date: Sat, 25 Apr 2015 23:13:56 -0400 Subject: [PATCH] ToMessage now consumes the struct in the conversion. --- src/client/data/command.rs | 4 ++-- src/client/data/message.rs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/client/data/command.rs b/src/client/data/command.rs index 2664bb5..1ca2cba 100644 --- a/src/client/data/command.rs +++ b/src/client/data/command.rs @@ -151,8 +151,8 @@ pub enum Command { impl ToMessage for Command { /// Converts a Command into a Message. - fn to_message(&self) -> Message { - match *self { + fn to_message(self) -> Message { + match self { Command::PASS(ref p) => Message::new(None, "PASS", None, Some(&p)), Command::NICK(ref n) => Message::new(None, "NICK", None, Some(&n)), Command::USER(ref u, ref m, ref r) => diff --git a/src/client/data/message.rs b/src/client/data/message.rs index be64b39..a54e3f0 100644 --- a/src/client/data/message.rs +++ b/src/client/data/message.rs @@ -56,8 +56,8 @@ impl Message { } impl ToMessage for Message { - fn to_message(&self) -> Message { - self.clone() + fn to_message(self) -> Message { + self } } @@ -96,11 +96,11 @@ impl FromStr for Message { /// A trait representing the ability to be converted into a Message. pub trait ToMessage { /// Converts this to a Message. - fn to_message(&self) -> Message; + fn to_message(self) -> Message; } impl<'a> ToMessage for &'a str { - fn to_message(&self) -> Message { + fn to_message(self) -> Message { self.parse().unwrap() } }