Merge branch 'release-2.0' into json_deserialize

2020-11-21 16:25:14 -08:00
parent 271e650662 fade03b54e
commit 420c3e2483
17 changed files with 630 additions and 271 deletions
--- a/src/test/simple.rs
+++ b/src/test/simple.rs
@@ -157,13 +157,13 @@ fn non_ascii_header() {
    test::set_handler("/non_ascii_header", |_unit| {
        test::make_response(200, "OK", vec!["Wörse: Hädör"], vec![])
    });
-    let resp = get("test://host/non_ascii_header")
+    let result = get("test://host/non_ascii_header")
        .set("Bäd", "Headör")
        .call();
    assert!(
-        matches!(resp, Err(Error::BadHeader)),
-        "expected Some(&BadHeader), got {:?}",
-        resp
+        matches!(result, Err(ref e) if e.kind() == ErrorKind::BadHeader),
+        "expected Err(BadHeader), got {:?}",
+        result
    );
 }