Merge branch 'master' into resource-msgb

Cargo.toml

@@ -89,7 +89,7 @@ derive_more = "0.99.5"
 encoding_rs = "0.8"
 futures-core = { version = "0.3.7", default-features = false }
 futures-util = { version = "0.3.7", default-features = false }
-itoa = "0.4"
+itoa = "1"
 language-tags = "0.3"
 once_cell = "1.5"
 log = "0.4"

actix-http-test/Cargo.toml

@@ -48,7 +48,7 @@ serde_json = "1.0"
 slab = "0.4"
 serde_urlencoded = "0.7"
 tls-openssl = { version = "0.10.9", package = "openssl", optional = true }
-tokio = { version = "1.2", features = ["sync"] }
+tokio = { version = "1.8", features = ["sync"] }
 
 [dev-dependencies]
 actix-web = { version = "4.0.0-beta.15", default-features = false, features = ["cookies"] }

actix-http/Cargo.toml

@@ -59,7 +59,7 @@ h2 = "0.3.9"
 http = "0.2.5"
 httparse = "1.5.1"
 httpdate = "1.0.1"
-itoa = "0.4"
+itoa = "1"
 language-tags = "0.3"
 local-channel = "0.1"
 log = "0.4"
@@ -67,7 +67,7 @@ mime = "0.3"
 percent-encoding = "2.1"
 pin-project-lite = "0.2"
 rand = "0.8"
-sha-1 = "0.9"
+sha-1 = "0.10"
 smallvec = "1.6.1"
 
 # tls
@@ -96,7 +96,7 @@ serde_json = "1.0"
 static_assertions = "1"
 tls-openssl = { package = "openssl", version = "0.10.9" }
 tls-rustls = { package = "rustls", version = "0.20.0" }
-tokio = { version = "1.2", features = ["net", "rt", "macros"] }
+tokio = { version = "1.8", features = ["net", "rt", "macros"] }
 
 [[example]]
 name = "ws"

actix-http/src/header/shared/quality.rs

@@ -87,7 +87,7 @@ impl fmt::Display for Quality {
 
                     // 0 is already handled so it's not possible to have a trailing 0 in this range
                     // we can just write the integer
-                    itoa::fmt(f, x)
+                    itoa_fmt(f, x)
                 } else if x < 100 {
                     // x in is range 10–99
 
@@ -95,21 +95,21 @@ impl fmt::Display for Quality {
 
                     if x % 10 == 0 {
                         // trailing 0, divide by 10 and write
-                        itoa::fmt(f, x / 10)
+                        itoa_fmt(f, x / 10)
                     } else {
-                        itoa::fmt(f, x)
+                        itoa_fmt(f, x)
                     }
                 } else {
                     // x is in range 100–999
 
                     if x % 100 == 0 {
                         // two trailing 0s, divide by 100 and write
-                        itoa::fmt(f, x / 100)
+                        itoa_fmt(f, x / 100)
                     } else if x % 10 == 0 {
                         // one trailing 0, divide by 10 and write
-                        itoa::fmt(f, x / 10)
+                        itoa_fmt(f, x / 10)
                     } else {
-                        itoa::fmt(f, x)
+                        itoa_fmt(f, x)
                     }
                 }
             }
@@ -117,6 +117,12 @@ impl fmt::Display for Quality {
     }
 }
 
+/// Write integer to a `fmt::Write`.
+pub fn itoa_fmt<W: fmt::Write, V: itoa::Integer>(mut wr: W, value: V) -> fmt::Result {
+    let mut buf = itoa::Buffer::new();
+    wr.write_str(buf.format(value))
+}
+
 #[derive(Debug, Clone, Display, Error)]
 #[display(fmt = "quality out of bounds")]
 #[non_exhaustive]

actix-multipart/Cargo.toml

@@ -30,5 +30,5 @@ twoway = "0.2"
 actix-rt = "2.2"
 actix-http = "3.0.0-beta.16"
 futures-util = { version = "0.3.7", default-features = false, features = ["alloc"] }
-tokio = { version = "1", features = ["sync"] }
+tokio = { version = "1.8", features = ["sync"] }
 tokio-stream = "0.1"

actix-router/Cargo.toml

@@ -21,7 +21,7 @@ default = ["http"]
 
 [dependencies]
 bytestring = ">=0.1.5, <2"
-firestorm = "0.4"
+firestorm = "0.5"
 http = { version = "0.2.3", optional = true }
 log = "0.4"
 regex = "1.5"
@@ -29,7 +29,7 @@ serde = "1"
 
 [dev-dependencies]
 criterion = { version = "0.3", features = ["html_reports"] }
-firestorm = { version = "0.4", features = ["enable_system_time"] }
+firestorm = { version = "0.5", features = ["enable_system_time"] }
 http = "0.2.5"
 serde = { version = "1", features = ["derive"] }
 

actix-test/Cargo.toml

@@ -45,4 +45,4 @@ serde_json = "1"
 serde_urlencoded = "0.7"
 tls-openssl = { package = "openssl", version = "0.10.9", optional = true }
 tls-rustls = { package = "rustls", version = "0.20.0", optional = true }
-tokio = { version = "1.2", features = ["sync"] }
+tokio = { version = "1.8", features = ["sync"] }

actix-web-actors/Cargo.toml

@@ -23,7 +23,7 @@ bytes = "1"
 bytestring = "1"
 futures-core = { version = "0.3.7", default-features = false }
 pin-project-lite = "0.2"
-tokio = { version = "1", features = ["sync"] }
+tokio = { version = "1.8", features = ["sync"] }
 
 [dev-dependencies]
 actix-rt = "2.2"

awc/Cargo.toml

@@ -74,7 +74,7 @@ futures-core = { version = "0.3.7", default-features = false, features = ["alloc
 futures-util = { version = "0.3.7", default-features = false, features = ["alloc", "sink"] }
 h2 = "0.3.9"
 http = "0.2.5"
-itoa = "0.4"
+itoa = "1"
 log =" 0.4"
 mime = "0.3"
 percent-encoding = "2.1"
@@ -83,7 +83,7 @@ rand = "0.8"
 serde = "1.0"
 serde_json = "1.0"
 serde_urlencoded = "0.7"
-tokio = { version = "1", features = ["sync"] }
+tokio = { version = "1.8", features = ["sync"] }
 
 cookie = { version = "0.15", features = ["percent-encode"], optional = true }