From 95f9a12a5e3fc5759b4ba2f9ea474a4d7735d01e Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 12 Mar 2020 02:58:22 +0900 Subject: [PATCH 1/5] dev-deps: Update `env_logger` to 0.7 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 44e7f9aef..3cd6a5a61 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,7 +95,7 @@ rust-tls = { version = "0.17.0", package = "rustls", optional = true } [dev-dependencies] actix = "0.10.0-alpha.1" rand = "0.7" -env_logger = "0.6" +env_logger = "0.7" serde_derive = "1.0" brotli2 = "0.3.2" flate2 = "1.0.13" From c147b9483290a9707253d0b5c1f0c3e7d042c08d Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 12 Mar 2020 03:03:22 +0900 Subject: [PATCH 2/5] Bump up to 3.0.0-alpha.1 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3cd6a5a61..4d50f50ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-web" -version = "2.0.0" +version = "3.0.0-alpha.1" authors = ["Nikolay Kim "] description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust." readme = "README.md" From 1b28a5d48bc54490096589cc08e866ffb39594f3 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 12 Mar 2020 03:03:50 +0900 Subject: [PATCH 3/5] Update `actix-web` dependency to 3.0.0-alpha.1 --- actix-files/Cargo.toml | 4 ++-- actix-multipart/Cargo.toml | 2 +- actix-web-actors/Cargo.toml | 2 +- actix-web-codegen/Cargo.toml | 2 +- awc/Cargo.toml | 2 +- test-server/Cargo.toml | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index c37d023f6..ed887e323 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -18,7 +18,7 @@ name = "actix_files" path = "src/lib.rs" [dependencies] -actix-web = { version = "2.0.0-rc", default-features = false } +actix-web = { version = "3.0.0-alpha.1", default-features = false } actix-http = "2.0.0-alpha.2" actix-service = "1.0.1" bitflags = "1" @@ -33,4 +33,4 @@ v_htmlescape = "0.4" [dev-dependencies] actix-rt = "1.0.0" -actix-web = { version = "2.0.0-rc", features=["openssl"] } +actix-web = { version = "3.0.0-alpha.1", features=["openssl"] } diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml index 3c8fe6de1..e81b07cb7 100644 --- a/actix-multipart/Cargo.toml +++ b/actix-multipart/Cargo.toml @@ -16,7 +16,7 @@ name = "actix_multipart" path = "src/lib.rs" [dependencies] -actix-web = { version = "2.0.0", default-features = false } +actix-web = { version = "3.0.0-alpha.1", default-features = false } actix-service = "1.0.1" actix-utils = "1.0.3" bytes = "0.5.3" diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml index 7941e192c..7e24d8c99 100644 --- a/actix-web-actors/Cargo.toml +++ b/actix-web-actors/Cargo.toml @@ -17,7 +17,7 @@ path = "src/lib.rs" [dependencies] actix = "0.10.0-alpha.1" -actix-web = "2.0.0" +actix-web = "3.0.0-alpha.1" actix-http = "2.0.0-alpha.2" actix-codec = "0.2.0" bytes = "0.5.2" diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml index 0b926b807..42befc0dd 100644 --- a/actix-web-codegen/Cargo.toml +++ b/actix-web-codegen/Cargo.toml @@ -18,5 +18,5 @@ proc-macro2 = "^1" [dev-dependencies] actix-rt = "1.0.0" -actix-web = "2.0.0" +actix-web = "3.0.0-alpha.1" futures = "0.3.1" diff --git a/awc/Cargo.toml b/awc/Cargo.toml index 5f4b493f8..fde136eb0 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -55,7 +55,7 @@ rust-tls = { version = "0.17.0", package="rustls", optional = true, features = [ [dev-dependencies] actix-connect = { version = "2.0.0-alpha.2", features=["openssl"] } -actix-web = { version = "2.0.0", features=["openssl"] } +actix-web = { version = "3.0.0-alpha.1", features=["openssl"] } actix-http = { version = "2.0.0-alpha.2", features=["openssl"] } actix-http-test = { version = "1.0.0", features=["openssl"] } actix-utils = "1.0.3" diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index c34446fc8..29896898e 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -55,5 +55,5 @@ time = { version = "0.2.7", default-features = false, features = ["std"] } open-ssl = { version="0.10", package="openssl", optional = true } [dev-dependencies] -actix-web = "2.0.0" +actix-web = "3.0.0-alpha.1" actix-http = "2.0.0-alpha.2" From a6a47b95ee6ffb27d9a6ff903cfa986f02e9a6e7 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 12 Mar 2020 03:04:31 +0900 Subject: [PATCH 4/5] Exclude `actix-cors` --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 4d50f50ce..1ab2561e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ members = [ ".", "awc", "actix-http", - "actix-cors", +# "actix-cors", "actix-files", "actix-framed", # "actix-session", From 0152cedc5df4e41cd9f694ee17523b742ba67157 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 12 Mar 2020 03:24:15 +0900 Subject: [PATCH 5/5] Update changelog --- CHANGES.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index da4a77a80..460b24f57 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,7 +1,6 @@ # Changes - -## [2.0.NEXT] - 2020-01-xx +## [3.0.0-alpha.1] - 2020-03-11 ### Added @@ -10,11 +9,13 @@ ### Changed * Use `sha-1` crate instead of unmaintained `sha1` crate -* Skip empty chunks when returning response from a `Stream` #1308 +* Skip empty chunks when returning response from a `Stream` [#1308] * Update the `time` dependency to 0.2.7 * Update `actix-tls` dependency to 2.0.0-alpha.1 * Update `rustls` dependency to 0.17 +[#1308]: https://github.com/actix/actix-web/pull/1308 + ## [2.0.0] - 2019-12-25 ### Changed