Change Extensions::insert() method according doc #345

ntex-rs · Apr 29, 2024 · 58c436c · 58c436c
1 parent c9c85f2
commit 58c436c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/ntex-util/CHANGES.md b/ntex-util/CHANGES.md
@@ -1,8 +1,8 @@
 # Changes
 
-## [1.1.0] - 2024-03-xx
+## [1.1.0] - 2024-04-xx
 
-* Added server worker's management utils
+* Change Extensions::insert() method according doc #345
 
 ## [1.0.1] - 2024-01-19
 
@@ -12,7 +12,7 @@
 
 * Release
 
-## [1.0.0-b.1] - 2024-01-xx
+## [1.0.0-b.1] - 2024-01-08
 
 * Remove unnecessary 'static
 

diff --git a/ntex-util/Cargo.toml b/ntex-util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-util"
-version = "1.0.1"
+version = "1.1.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Utilities for ntex framework"
 keywords = ["network", "framework", "async", "futures"]

diff --git a/ntex-util/src/services/extensions.rs b/ntex-util/src/services/extensions.rs
@@ -19,8 +19,10 @@ impl Extensions {
     ///
     /// If a extension of this type already existed, it will
     /// be returned.
-    pub fn insert<T: 'static>(&mut self, val: T) {
-        self.map.insert(TypeId::of::<T>(), Box::new(val));
+    pub fn insert<T: 'static>(&mut self, val: T) -> Option<T> {
+        self.map
+            .insert(TypeId::of::<T>(), Box::new(val))
+            .and_then(|item| item.downcast::<T>().map(|boxed| *boxed).ok())
     }
 
     /// Check if container contains entry
@@ -89,6 +91,7 @@ fn test_remove() {
 
     map.insert::<i8>(123);
     assert!(map.get::<i8>().is_some());
+    assert_eq!(map.insert::<i8>(10), Some(123));
 
     map.remove::<i8>();
     assert!(map.get::<i8>().is_none());