Make Writeable::write typed instead of Writeable

[rust-lightning] / src / util / ser_macros.rs

diff --git a/src/util/ser_macros.rs b/src/util/ser_macros.rs
index 80fbe7a9a0a8f76919817d76090e7b7f5e804e74..09a319fb45951a043106f9ae6d7fe4d13b94779b 100644 (file)
--- a/src/util/ser_macros.rs
+++ b/src/util/ser_macros.rs
@@ -1,7 +1,7 @@
 macro_rules! impl_writeable {
        ($st:ident, $len: expr, {$($field:ident),*}) => {
-               impl<W: Writer> Writeable<W> for $st {
-                       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+               impl Writeable for $st {
+                       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                                w.size_hint($len);
                                $( self.$field.write(w)?; )*
                                Ok(())
@@ -19,8 +19,8 @@ macro_rules! impl_writeable {
 }
 macro_rules! impl_writeable_len_match {
        ($st:ident, {$({$m: pat, $l: expr}),*}, {$($field:ident),*}) => {
-               impl<W: Writer> Writeable<W> for $st {
-                       fn write(&self, w: &mut W) -> Result<(), ::std::io::Error> {
+               impl Writeable for $st {
+                       fn write<W: Writer>(&self, w: &mut W) -> Result<(), ::std::io::Error> {
                                w.size_hint(match *self {
                                        $($m => $l,)*
                                });