2 files changed, 86 insertions, 1 deletions
diff --git a/src/encoder/mod.rs b/src/encoder/mod.rs
index 21185f4..35e7212 100644
--- a/src/encoder/mod.rs
+++ b/src/encoder/mod.rs
@@ -6,6 +6,7 @@ use std::mem;
 use {Value, Table};
 
 #[cfg(feature = "rustc-serialize")] mod rustc_serialize;
+#[cfg(feature = "serde")] mod serde;
 
 /// A structure to transform Rust values into TOML values.
 ///
@@ -170,7 +171,7 @@ pub fn encode<T: ::rustc_serialize::Encodable>(t: &T) -> Value {
 #[cfg(all(not(feature = "rustc-serialize"), feature = "serde"))]
 pub fn encode<T: ::serde::Serialize>(t: &T) -> Value {
     let mut e = Encoder::new();
-    t.deserialize(&mut e).unwrap();
+    t.serialize(&mut e).unwrap();
     Value::Table(e.toml)
 }
 
diff --git a/src/encoder/serde.rs b/src/encoder/serde.rs
new file mode 100644
index 0000000..87a742e
--- /dev/null
+++ b/src/encoder/serde.rs
@@ -0,0 +1,84 @@
+use serde::ser;
+use Value;
+use super::{Encoder, Error};
+
+impl ser::Serializer for Encoder {
+    type Error = Error;
+
+    fn visit_bool(&mut self, v: bool) -> Result<(), Error> {
+        self.emit_value(Value::Boolean(v))
+    }
+    fn visit_i64(&mut self, v: i64) -> Result<(), Error> {
+        self.emit_value(Value::Integer(v))
+    }
+    fn visit_u64(&mut self, v: u64) -> Result<(), Error> {
+        self.visit_i64(v as i64)
+    }
+    fn visit_f64(&mut self, v: f64) -> Result<(), Error> {
+        self.emit_value(Value::Float(v))
+    }
+    fn visit_str(&mut self, value: &str) -> Result<(), Error> {
+        self.emit_value(Value::String(value.to_string()))
+    }
+    fn visit_unit(&mut self) -> Result<(), Error> {
+        Ok(())
+    }
+    fn visit_none(&mut self) -> Result<(), Error> {
+        self.emit_none()
+    }
+    fn visit_some<V>(&mut self, value: V) -> Result<(), Error>
+        where V: ser::Serialize
+    {
+        value.serialize(self)
+    }
+    fn visit_seq<V>(&mut self, mut visitor: V) -> Result<(), Error>
+        where V: ser::SeqVisitor
+    {
+        self.seq(|me| {
+            while try!(visitor.visit(me)).is_some() {}
+            Ok(())
+        })
+    }
+    fn visit_seq_elt<T>(&mut self, value: T) -> Result<(), Error>
+        where T: ser::Serialize
+    {
+        value.serialize(self)
+    }
+    fn visit_map<V>(&mut self, mut visitor: V) -> Result<(), Error>
+        where V: ser::MapVisitor
+    {
+        self.table(|me| {
+            while try!(visitor.visit(me)).is_some() {}
+            Ok(())
+        })
+    }
+    fn visit_map_elt<K, V>(&mut self, key: K, value: V) -> Result<(), Error>
+        where K: ser::Serialize, V: ser::Serialize
+    {
+        try!(self.table_key(|me| key.serialize(me)));
+        try!(value.serialize(self));
+        Ok(())
+    }
+}
+
+impl ser::Serialize for Value {
+    fn serialize<E>(&self, e: &mut E) -> Result<(), E::Error>
+        where E: ser::Serializer
+    {
+        match *self {
+            Value::String(ref s) => e.visit_str(s),
+            Value::Integer(i) => e.visit_i64(i),
+            Value::Float(f) => e.visit_f64(f),
+            Value::Boolean(b) => e.visit_bool(b),
+            Value::Datetime(ref s) => e.visit_str(s),
+            Value::Array(ref a) => {
+                e.visit_seq(ser::impls::SeqIteratorVisitor::new(a.iter(),
+                                                                Some(a.len())))
+            }
+            Value::Table(ref t) => {
+                e.visit_map(ser::impls::MapIteratorVisitor::new(t.iter(),
+                                                                Some(t.len())))
+            }
+        }
+    }
+}