---

yaml
---
r: 151197
b: refs/heads/try2
c: 02c45de
h: refs/heads/master
i:
  151195: 1bc4e55
v: v3

Author: nical

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a539b0d5831e6dcabff21d9c34ba55d782467961
+refs/heads/try2: 02c45dece43f9f884b5b09ceb3db26c2a056a7f4
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/run-pass/issue-4016.rs

@@ -13,7 +13,7 @@ extern crate serialize;
 
 use serialize::{json, Decodable};
 
-trait JD : Decodable<json::Decoder, json::Error> { }
+trait JD : Decodable<json::Decoder, json::DecoderError> { }
 
 fn exec<T: JD>() {
     let doc = json::from_str("").unwrap();