OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #13230 : Kroisse/rust/encodable-json, r=erickt 

The implementation of `Encodable<E, S>` for `Json` doesn't need to assume `S` to be `IoError`, only the default encoders for `Json` are depend on it. So this can be parametrize to increase flexiblity. If not, types that implement `Encoder<E>` where `E` is not `IoError` can't be worked with `Json`.
This commit is contained in:
bors 2014-03-31 11:11:40 -07:00
parent c821cacfed 2deca5840e
commit ba2fcc1d34
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libserialize/json.rs
View File

@ -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),