bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rollup merge of #19298: nikomatsakis/unboxed-closure-parse-the-plus

Browse source 
Implements RFC 438.

Fixes #19092.

This is a [breaking-change]: change types like `&Foo+Send` or `&'a mut Foo+'a` to `&(Foo+Send)` and `&'a mut (Foo+'a)`, respectively.

r? @brson
This commit is contained in:
Alex Crichton 2014-11-26 09:44:43 -08:00
commit f4a775639c
63 changed files with 479 additions and 373 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libserialize/json.rs
View file

@ -397,7 +397,7 @@ fn fmt_number_or_null(v: f64) -> string::String {
/// A structure for implementing serialization to JSON.
pub struct Encoder<'a> {
writer: &'a mut io::Writer+'a,
writer: &'a mut (io::Writer+'a),
}
impl<'a> Encoder<'a> {
@ -601,7 +601,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+'a,
writer: &'a mut (io::Writer+'a),
curr_indent: uint,
indent: uint,
}