From 17631cd8a127b5382fcf374c2753d2a0ca2cb5f0 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Mon, 6 Dec 2021 21:09:51 +0600
Subject: [PATCH] Fix dealloc for vec representation

---
 ntex-bytes/CHANGELOG.md | 4 ++++
 ntex-bytes/Cargo.toml   | 2 +-
 ntex-bytes/src/bytes.rs | 8 ++++----
 ntex-router/src/lib.rs  | 3 +++
 ntex/Cargo.toml         | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ntex-bytes/CHANGELOG.md b/ntex-bytes/CHANGELOG.md
index 569b1712..d10c784f 100644
--- a/ntex-bytes/CHANGELOG.md
+++ b/ntex-bytes/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [0.1.7] (2021-12-06)
+
+* Fix dealloc for vec representation
+
 ## [0.1.6] (2021-12-03)
 
 * Better api usability
diff --git a/ntex-bytes/Cargo.toml b/ntex-bytes/Cargo.toml
index 6b4ac6ec..492c14a9 100644
--- a/ntex-bytes/Cargo.toml
+++ b/ntex-bytes/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-bytes"
-version = "0.1.6"
+version = "0.1.7"
 license = "MIT"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Carl Lerche <me@carllerche.com>"]
 description = "Types and traits for working with bytes (bytes crate fork)"
diff --git a/ntex-bytes/src/bytes.rs b/ntex-bytes/src/bytes.rs
index 40221a52..7a26be64 100644
--- a/ntex-bytes/src/bytes.rs
+++ b/ntex-bytes/src/bytes.rs
@@ -390,7 +390,7 @@ impl Bytes {
     #[inline]
     pub const fn new() -> Bytes {
         Bytes {
-            inner: Inner::empty(),
+            inner: Inner::empty_inline(),
         }
     }
 
@@ -1846,7 +1846,7 @@ impl Inner {
     }
 
     #[inline]
-    const fn empty() -> Inner {
+    const fn empty_inline() -> Inner {
         Inner {
             arc: unsafe { NonNull::new_unchecked(KIND_INLINE as *mut Shared) },
             ptr: 0 as *mut u8,
@@ -2336,7 +2336,7 @@ impl Inner {
             }
 
             Inner {
-                arc: NonNull::new_unchecked(arc as *mut Shared),
+                arc: NonNull::new_unchecked(arc),
                 ..*self
             }
         }
@@ -2575,7 +2575,7 @@ fn release_shared_vec(ptr: *mut SharedVec) {
         let cap = (*ptr).cap;
         (*ptr).pool.release(cap);
         ptr::drop_in_place(ptr);
-        Vec::from_raw_parts(ptr, 0, cap);
+        Vec::<u8>::from_raw_parts(ptr as *mut u8, 0, cap);
     }
 }
 
diff --git a/ntex-router/src/lib.rs b/ntex-router/src/lib.rs
index 04bd4bbf..746d7742 100644
--- a/ntex-router/src/lib.rs
+++ b/ntex-router/src/lib.rs
@@ -13,6 +13,9 @@ pub use self::path::{Path, PathIter};
 pub use self::resource::ResourceDef;
 pub use self::router::{Router, RouterBuilder};
 
+#[doc(hidden)]
+pub struct ResourceInfo;
+
 pub trait Resource<T: ResourcePath> {
     fn path(&self) -> &str;
 
diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml
index c487245f..bee6bd83 100644
--- a/ntex/Cargo.toml
+++ b/ntex/Cargo.toml
@@ -49,7 +49,7 @@ ntex-router = "0.5.1"
 ntex-service = "0.2.1"
 ntex-macros = "0.1.3"
 ntex-util = "0.1.1"
-ntex-bytes = "0.1.6"
+ntex-bytes = "0.1.7"
 
 base64 = "0.13"
 bitflags = "1.3"