From 05336269f98045703b27a0fbc18fe84f06456125 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Tue, 4 Jan 2022 15:33:44 +0000
Subject: [PATCH] prepare actix-router release 0.5.0-beta.4

---
 Cargo.toml                   | 2 +-
 actix-router/CHANGES.md      | 3 +++
 actix-router/Cargo.toml      | 2 +-
 actix-web-codegen/Cargo.toml | 4 ++--
 docs/graphs/web-only.dot     | 1 +
 src/types/json.rs            | 4 ++--
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5c4abe46f..cfb7cc0ac 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -78,7 +78,7 @@ actix-utils = "3.0.0"
 actix-tls = { version = "3.0.0", default-features = false, optional = true }
 
 actix-http = "3.0.0-beta.17"
-actix-router = "0.5.0-beta.3"
+actix-router = "0.5.0-beta.4"
 actix-web-codegen = "0.5.0-beta.6"
 
 ahash = "0.7"
diff --git a/actix-router/CHANGES.md b/actix-router/CHANGES.md
index 7b8615570..66b5379fc 100644
--- a/actix-router/CHANGES.md
+++ b/actix-router/CHANGES.md
@@ -1,6 +1,9 @@
 # Changes
 
 ## Unreleased - 2021-xx-xx
+
+
+## 0.5.0-beta.4 - 2022-01-04
 - `PathDeserializer` now decodes all percent encoded characters in dynamic segments. [#2566]
 - Minimum supported Rust version (MSRV) is now 1.54.
 
diff --git a/actix-router/Cargo.toml b/actix-router/Cargo.toml
index c63448bc7..801613568 100644
--- a/actix-router/Cargo.toml
+++ b/actix-router/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-router"
-version = "0.5.0-beta.3"
+version = "0.5.0-beta.4"
 authors = [
     "Nikolay Kim <fafhrd91@gmail.com>",
     "Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com>",
diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml
index 03ff4698f..cd463cef9 100644
--- a/actix-web-codegen/Cargo.toml
+++ b/actix-web-codegen/Cargo.toml
@@ -15,10 +15,10 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
+actix-router = "0.5.0-beta.4"
+proc-macro2 = "1"
 quote = "1"
 syn = { version = "1", features = ["full", "parsing"] }
-proc-macro2 = "1"
-actix-router = "0.5.0-beta.3"
 
 [dev-dependencies]
 actix-macros = "0.2.3"
diff --git a/docs/graphs/web-only.dot b/docs/graphs/web-only.dot
index ee74c292b..b27dd0943 100644
--- a/docs/graphs/web-only.dot
+++ b/docs/graphs/web-only.dot
@@ -15,6 +15,7 @@ digraph {
 
     "actix-web" -> { "actix-web-codegen" "actix-http" "actix-router" }
     "awc" -> { "actix-http" }
+    "actix-web-codegen" -> { "actix-router" }
     "actix-web-actors" -> { "actix" "actix-web" "actix-http" }
     "actix-multipart" -> { "actix-web" }
     "actix-files" -> { "actix-web" }
diff --git a/src/types/json.rs b/src/types/json.rs
index be6078b2b..8fdbfafa4 100644
--- a/src/types/json.rs
+++ b/src/types/json.rs
@@ -11,7 +11,7 @@ use std::{
 };
 
 use bytes::BytesMut;
-use futures_core::{ready, stream::Stream as _};
+use futures_core::{ready, Stream as _};
 use serde::{de::DeserializeOwned, Serialize};
 
 use actix_http::Payload;
@@ -515,7 +515,7 @@ mod tests {
             .to_http_parts();
 
         let s = Json::<MyObject>::from_request(&req, &mut pl).await;
-        let resp = HttpResponse::from_error(s.err().unwrap());
+        let resp = HttpResponse::from_error(s.unwrap_err());
         assert_eq!(resp.status(), StatusCode::BAD_REQUEST);
 
         let body = body::to_bytes(resp.into_body()).await.unwrap();