about summary refs log tree commit diff
path: root/src/libserialize
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2014-08-27 21:46:52 -0400
committerNiko Matsakis <niko@alum.mit.edu>2014-08-27 21:46:52 -0400
commit1b487a890695e7d6dfbfe5dcd7d4fa0e8ca8003f (patch)
tree552fabade603ab0d148a49ae3cf1abd3f399740a /src/libserialize
parent3ee047ae1ffab454270bc1859b3beef3556ef8f9 (diff)
downloadrust-1b487a890695e7d6dfbfe5dcd7d4fa0e8ca8003f.tar.gz
rust-1b487a890695e7d6dfbfe5dcd7d4fa0e8ca8003f.zip
Implement generalized object and type parameter bounds (Fixes #16462)
Diffstat (limited to 'src/libserialize')
-rw-r--r--src/libserialize/json.rs4
-rw-r--r--src/libserialize/lib.rs1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index cfc915c7d0a..d70b6b4d57b 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -382,7 +382,7 @@ fn fmt_number_or_null(v: f64) -> String {
 
 /// A structure for implementing serialization to JSON.
 pub struct Encoder<'a> {
-    writer: &'a mut io::Writer,
+    writer: &'a mut io::Writer+'a,
 }
 
 impl<'a> Encoder<'a> {
@@ -594,7 +594,7 @@ impl<'a> ::Encoder<io::IoError> for Encoder<'a> {
 /// Another encoder for JSON, but prints out human-readable JSON instead of
 /// compact data
 pub struct PrettyEncoder<'a> {
-    writer: &'a mut io::Writer,
+    writer: &'a mut io::Writer+'a,
     curr_indent: uint,
     indent: uint,
 }
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index 5c35ad85233..44ea56f4c73 100644
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -24,6 +24,7 @@ Core encoding and decoding interfaces.
        html_root_url = "http://doc.rust-lang.org/master/",
        html_playground_url = "http://play.rust-lang.org/")]
 #![feature(macro_rules, managed_boxes, default_type_params, phase)]
+#![feature(issue_5723_bootstrap)]
 
 // test harness access
 #[cfg(test)]