Skip to content

Commit

Permalink
Json doesn't need to depend on IoError to implement Encodable #13230
Browse files Browse the repository at this point in the history
  • Loading branch information
Kroisse committed Mar 31, 2014
1 parent 1c2ccf0 commit 2deca58
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libserialize/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -732,8 +732,8 @@ impl<'a> ::Encoder<io::IoError> for PrettyEncoder<'a> {
}
}

impl<E: ::Encoder<io::IoError>> Encodable<E, io::IoError> for Json {
fn encode(&self, e: &mut E) -> EncodeResult {
impl<E: ::Encoder<S>, S> Encodable<E, S> for Json {
fn encode(&self, e: &mut E) -> Result<(), S> {
match *self {
Number(v) => v.encode(e),
String(ref v) => v.encode(e),
Expand Down

5 comments on commit 2deca58

@bors
Copy link
Contributor

@bors bors commented on 2deca58 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from erickt
at Kroisse@2deca58

@bors
Copy link
Contributor

@bors bors commented on 2deca58 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging Kroisse/rust/encodable-json = 2deca58 into auto

@bors
Copy link
Contributor

@bors bors commented on 2deca58 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kroisse/rust/encodable-json = 2deca58 merged ok, testing candidate = ba2fcc1

@bors
Copy link
Contributor

@bors bors commented on 2deca58 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 2deca58 Mar 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = ba2fcc1

Please sign in to comment.