From 14307b2ca94a8402bfffc43deae05652bcad0ac9 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Tue, 18 Aug 2020 17:48:48 +0100
Subject: [PATCH] alias utils/dispatcher module

---
 actix-utils/CHANGES.md                       | 2 ++
 actix-utils/src/{framed.rs => dispatcher.rs} | 2 ++
 actix-utils/src/lib.rs                       | 5 ++++-
 3 files changed, 8 insertions(+), 1 deletion(-)
 rename actix-utils/src/{framed.rs => dispatcher.rs} (99%)

diff --git a/actix-utils/CHANGES.md b/actix-utils/CHANGES.md
index b75c03d3..9ae7f456 100644
--- a/actix-utils/CHANGES.md
+++ b/actix-utils/CHANGES.md
@@ -4,6 +4,8 @@
 
 * Upgrade `tokio-util` to `0.3`.
 * Remove unsound custom Cell and use `std::cell::RefCell` instead, as well as `actix-service`.
+* Provide correctly spelled `LocalWaker::is_registered` method and deprecate the replaced.
+* Alias `framed` module as `dispatcher`.
 
 ## [1.0.6] - 2020-01-08
 
diff --git a/actix-utils/src/framed.rs b/actix-utils/src/dispatcher.rs
similarity index 99%
rename from actix-utils/src/framed.rs
rename to actix-utils/src/dispatcher.rs
index fef70ff0..15d3ccf7 100644
--- a/actix-utils/src/framed.rs
+++ b/actix-utils/src/dispatcher.rs
@@ -1,5 +1,7 @@
 //! Framed dispatcher service and related utilities
+
 #![allow(type_alias_bounds)]
+
 use std::pin::Pin;
 use std::task::{Context, Poll};
 use std::{fmt, mem};
diff --git a/actix-utils/src/lib.rs b/actix-utils/src/lib.rs
index be013729..b9d245fa 100644
--- a/actix-utils/src/lib.rs
+++ b/actix-utils/src/lib.rs
@@ -1,11 +1,12 @@
 //! Actix utils - various helper services
+
 #![deny(rust_2018_idioms)]
 #![allow(clippy::type_complexity)]
 
 pub mod condition;
 pub mod counter;
+pub mod dispatcher;
 pub mod either;
-pub mod framed;
 pub mod inflight;
 pub mod keepalive;
 pub mod mpsc;
@@ -15,3 +16,5 @@ pub mod stream;
 pub mod task;
 pub mod time;
 pub mod timeout;
+
+pub use dispatcher as framed;