prepare actix-threadpool release

Merge pull request #27 from ignatenkobrain/license
Include license files into all sub-crates
2025-08-14 03:08:24 +02:00 · 2019-06-05 08:09:46 +06:00 · 2019-06-01 16:48:42 +06:00 · 2019-06-01 16:47:56 +06:00 · 2019-05-30 20:38:44 +02:00 · 2019-05-30 20:30:43 +02:00
28 changed files with 42 additions and 9 deletions
--- a/actix-codec/LICENSE-APACHE
+++ b/actix-codec/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-codec/LICENSE-MIT
+++ b/actix-codec/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-connect/LICENSE-APACHE
+++ b/actix-connect/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-connect/LICENSE-MIT
+++ b/actix-connect/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-rt/LICENSE-APACHE
+++ b/actix-rt/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-rt/LICENSE-MIT
+++ b/actix-rt/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-server-config/LICENSE-APACHE
+++ b/actix-server-config/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-server-config/LICENSE-MIT
+++ b/actix-server-config/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-server/CHANGES.md
+++ b/actix-server/CHANGES.md
@@ -1,5 +1,12 @@
 # Changes

+## [0.5.1] - 2019-05-18
+
+### Changed
+
+* ServerBuilder::shutdown_timeout() accepts u64
+
+
 ## [0.5.0] - 2019-05-12

 ### Added
--- a/actix-server/Cargo.toml
+++ b/actix-server/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-server"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix server - General purpose tcp server"
 keywords = ["network", "framework", "async", "futures"]
--- a/actix-server/LICENSE-APACHE
+++ b/actix-server/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-server/LICENSE-MIT
+++ b/actix-server/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-server/src/builder.rs
+++ b/actix-server/src/builder.rs
@@ -128,8 +128,8 @@ impl ServerBuilder {
    /// dropped.
    ///
    /// By default shutdown timeout sets to 30 seconds.
-    pub fn shutdown_timeout(mut self, sec: u16) -> Self {
-        self.shutdown_timeout = Duration::from_secs(u64::from(sec));
+    pub fn shutdown_timeout(mut self, sec: u64) -> Self {
+        self.shutdown_timeout = Duration::from_secs(sec);
        self
    }

--- a/actix-service/LICENSE-APACHE
+++ b/actix-service/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-service/LICENSE-MIT
+++ b/actix-service/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-test-server/LICENSE-APACHE
+++ b/actix-test-server/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-test-server/LICENSE-MIT
+++ b/actix-test-server/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-threadpool/CHANGES.md
+++ b/actix-threadpool/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes

+## [0.1.1] - 2019-06-05
+
+* Update parking_lot
+
 ## [0.1.0] - 2019-03-28

 * Move threadpool to separate crate
--- a/actix-threadpool/Cargo.toml
+++ b/actix-threadpool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-threadpool"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
 description = "Actix thread pool for sync code"
 keywords = ["actix", "network", "framework", "async", "futures"]
@@ -20,7 +20,7 @@ path = "src/lib.rs"
 [dependencies]
 derive_more = "0.14"
 futures = "0.1.25"
-parking_lot = "0.7"
+parking_lot = "0.8"
 lazy_static = "1.2"
 log = "0.4"
 num_cpus = "1.10"
--- a/actix-threadpool/LICENSE-APACHE
+++ b/actix-threadpool/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-threadpool/LICENSE-MIT
+++ b/actix-threadpool/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-tower/LICENSE-APACHE
+++ b/actix-tower/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-tower/LICENSE-MIT
+++ b/actix-tower/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/actix-utils/LICENSE-APACHE
+++ b/actix-utils/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/actix-utils/LICENSE-MIT
+++ b/actix-utils/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/router/LICENSE-APACHE
+++ b/router/LICENSE-APACHE
@@ -0,0 +1 @@
+../LICENSE-APACHE
--- a/router/LICENSE-MIT
+++ b/router/LICENSE-MIT
@@ -0,0 +1 @@
+../LICENSE-MIT
--- a/router/src/router.rs
+++ b/router/src/router.rs
@@ -19,26 +19,26 @@ impl<T, U> Router<T, U> {
        }
    }

-    pub fn recognize<R, P>(&self, reosurce: &mut R) -> Option<(&T, ResourceId)>
+    pub fn recognize<R, P>(&self, resource: &mut R) -> Option<(&T, ResourceId)>
    where
        R: Resource<P>,
        P: ResourcePath,
    {
        for item in self.0.iter() {
-            if item.0.match_path(reosurce.resource_path()) {
+            if item.0.match_path(resource.resource_path()) {
                return Some((&item.1, ResourceId(item.0.id())));
            }
        }
        None
    }

-    pub fn recognize_mut<R, P>(&mut self, reosurce: &mut R) -> Option<(&mut T, ResourceId)>
+    pub fn recognize_mut<R, P>(&mut self, resource: &mut R) -> Option<(&mut T, ResourceId)>
    where
        R: Resource<P>,
        P: ResourcePath,
    {
        for item in self.0.iter_mut() {
-            if item.0.match_path(reosurce.resource_path()) {
+            if item.0.match_path(resource.resource_path()) {
                return Some((&mut item.1, ResourceId(item.0.id())));
            }
        }
Author	SHA1	Message	Date
Nikolay Kim	7051888289	prepare actix-threadpool release	2019-06-05 08:09:46 +06:00
Nikolay Kim	0caa47fc47	Merge pull request #27 from ignatenkobrain/license Include license files into all sub-crates	2019-06-01 16:48:42 +06:00
Nikolay Kim	6d1cbb2d2f	Merge pull request #26 from ignatenkobrain/master chore: Update parking_lot to 0.8	2019-06-01 16:47:56 +06:00
Igor Gnatenko	ca289ddf7f	Include license files into all sub-crates Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>	2019-05-30 20:38:44 +02:00
Igor Gnatenko	ad9a197916	chore: Update parking_lot to 0.8 Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>	2019-05-30 20:30:43 +02:00
Nikolay Kim	c1b183e1ce	Merge branch 'master' of github.com:actix/actix-net	2019-05-18 10:56:51 -07:00
Nikolay Kim	87bc3dacd9	use u64 for shutdown_timeout	2019-05-18 10:56:41 -07:00
Nikolay Kim	0156f479a0	Merge pull request #19 from pka/patch-1 Fix typo	2019-05-15 13:12:26 -07:00
Pirmin Kalberer	139fa3b9a2	Fix typo	2019-05-15 20:51:24 +02:00