From 1f3b3d64b5c8a40506befbbbc7b73ad285a9e719 Mon Sep 17 00:00:00 2001 From: Aaron Weiss Date: Sun, 15 Jan 2017 17:06:43 -0500 Subject: [PATCH] IrcCodec is no longer paramterized by inner codec type. --- src/proto/irc.rs | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/proto/irc.rs b/src/proto/irc.rs index c9286f0..ccef4f2 100644 --- a/src/proto/irc.rs +++ b/src/proto/irc.rs @@ -6,25 +6,18 @@ use proto::message::Message; use tokio_core::io::{Codec, EasyBuf}; /// An IRC codec built around an inner codec. -pub struct IrcCodec { - inner: C, +pub struct IrcCodec { + inner: LineCodec, } -impl IrcCodec { +impl IrcCodec { /// Creates a new instance of IrcCodec wrapping a LineCodec with the specifiec encoding. - pub fn new(label: &str) -> io::Result> { - LineCodec::new(label).map(|codec| IrcCodec::from_codec(codec)) + pub fn new(label: &str) -> io::Result { + LineCodec::new(label).map(|codec| IrcCodec { inner: codec }) } } -impl IrcCodec where C: Codec { - /// Creates a new instance of IrcCodec from the specified inner codec. - pub fn from_codec(codec: C) -> IrcCodec { - IrcCodec { inner: codec } - } -} - -impl Codec for IrcCodec where C: Codec { +impl Codec for IrcCodec { type In = Message; type Out = Message;