From 78594a72bdd5705531e0974a65685e770f7832b9 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Tue, 14 Jul 2020 03:16:26 +0100 Subject: [PATCH 1/4] prepare awc v2.0.0-beta.1 release --- awc/CHANGES.md | 4 ++++ awc/Cargo.toml | 6 +++--- test-server/Cargo.toml | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/awc/CHANGES.md b/awc/CHANGES.md index 6d5a81b5e..19154d35d 100644 --- a/awc/CHANGES.md +++ b/awc/CHANGES.md @@ -1,5 +1,9 @@ # Changes +## [2.0.0-beta.1] - 2020-07-14 +### Changed +* Update `actix-http` dependency to 2.0.0-beta.1 + ## [2.0.0-alpha.2] - 2020-05-21 ### Changed diff --git a/awc/Cargo.toml b/awc/Cargo.toml index b36e735ca..e0f89c8dc 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "awc" -version = "2.0.0-alpha.2" +version = "2.0.0-beta.1" authors = ["Nikolay Kim "] description = "Actix http client." readme = "README.md" @@ -36,7 +36,7 @@ compress = ["actix-http/compress"] [dependencies] actix-codec = "0.2.0" actix-service = "1.0.1" -actix-http = "2.0.0-alpha.4" +actix-http = "2.0.0-beta.1" actix-rt = "1.0.0" base64 = "0.12" @@ -56,7 +56,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 = "3.0.0-alpha.3", features = ["openssl"] } -actix-http = { version = "2.0.0-alpha.4", features = ["openssl"] } +actix-http = { version = "2.0.0-beta.1", features = ["openssl"] } actix-http-test = { version = "2.0.0-alpha.1", features = ["openssl"] } actix-utils = "1.0.3" actix-server = "1.0.0" diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index 2c526e672..aeb40daee 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -2,7 +2,7 @@ name = "actix-http-test" version = "2.0.0-alpha.1" authors = ["Nikolay Kim "] -description = "Actix http test server" +description = "Actix HTTP test server" readme = "README.md" keywords = ["http", "web", "framework", "async", "futures"] homepage = "https://actix.rs" @@ -53,4 +53,4 @@ open-ssl = { version = "0.10", package = "openssl", optional = true } [dev-dependencies] actix-web = "3.0.0-alpha.3" -actix-http = "2.0.0-alpha.4" +actix-http = "2.0.0-beta.1" From 1382094c152d9d201513ae280934d58fc5158b40 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Tue, 14 Jul 2020 11:19:56 +0900 Subject: [PATCH 2/4] Avoid using deprecated `/` in license field --- Cargo.toml | 2 +- actix-files/Cargo.toml | 2 +- actix-http/Cargo.toml | 2 +- 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 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8c4719b92..146c4004f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ documentation = "https://docs.rs/actix-web/" categories = ["network-programming", "asynchronous", "web-programming::http-server", "web-programming::websocket"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [package.metadata.docs.rs] diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index 12fd03ce1..b7ba75960 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -9,7 +9,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-web.git" documentation = "https://docs.rs/actix-files/" categories = ["asynchronous", "web-programming::http-server"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index a9bec59de..232b5c3f0 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -11,7 +11,7 @@ documentation = "https://docs.rs/actix-http/" categories = ["network-programming", "asynchronous", "web-programming::http-server", "web-programming::websocket"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [package.metadata.docs.rs] diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml index c5f315d75..f6d6a37a1 100644 --- a/actix-multipart/Cargo.toml +++ b/actix-multipart/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["http", "web", "framework", "async", "futures"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-web.git" documentation = "https://docs.rs/actix-multipart/" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml index 746aca2d5..7383b2032 100644 --- a/actix-web-actors/Cargo.toml +++ b/actix-web-actors/Cargo.toml @@ -8,7 +8,7 @@ keywords = ["actix", "http", "web", "framework", "async"] homepage = "https://actix.rs" repository = "https://github.com/actix/actix-web.git" documentation = "https://docs.rs/actix-web-actors/" -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml index 178eeeb7e..10c33ea74 100644 --- a/actix-web-codegen/Cargo.toml +++ b/actix-web-codegen/Cargo.toml @@ -7,7 +7,7 @@ homepage = "https://actix.rs" repository = "https://github.com/actix/actix-web" documentation = "https://docs.rs/actix-web-codegen" authors = ["Nikolay Kim "] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/awc/Cargo.toml b/awc/Cargo.toml index b36e735ca..563c5cae5 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -11,7 +11,7 @@ documentation = "https://docs.rs/awc/" categories = ["network-programming", "asynchronous", "web-programming::http-client", "web-programming::websocket"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" edition = "2018" [lib] diff --git a/test-server/Cargo.toml b/test-server/Cargo.toml index 2c526e672..1cdf77031 100644 --- a/test-server/Cargo.toml +++ b/test-server/Cargo.toml @@ -11,7 +11,7 @@ documentation = "https://docs.rs/actix-http-test/" categories = ["network-programming", "asynchronous", "web-programming::http-server", "web-programming::websocket"] -license = "MIT/Apache-2.0" +license = "MIT OR Apache-2.0" exclude = [".gitignore", ".cargo/config"] edition = "2018" From ad7c6d26332395e4693a68da8c15de799b259ca5 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Wed, 15 Jul 2020 00:44:44 +0100 Subject: [PATCH 3/4] prepare actix-web v3.0.0-beta.1 release (#1600) --- CHANGES.md | 14 ++++---------- Cargo.toml | 6 +++--- actix-web-codegen/CHANGES.md | 11 ++++++----- actix-web-codegen/Cargo.toml | 4 ++-- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8f15eea15..149ff8fcb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,38 +1,32 @@ # Changes -## [Unreleased] +## Unreleased - 2020-xx-xx + +## 3.0.0-beta.1 - 2020-07-13 ### Added - * Re-export `actix_rt::main` as `actix_web::main`. * `HttpRequest::match_pattern` and `ServiceRequest::match_pattern` for extracting the matched resource pattern. * `HttpRequest::match_name` and `ServiceRequest::match_name` for extracting matched resource name. ### Changed - * Fix actix_http::h1::dispatcher so it returns when HW_BUFFER_SIZE is reached. Should reduce peak memory consumption during large uploads. [#1550] * Migrate cookie handling to `cookie` crate. Actix-web no longer requires `ring` dependency. * MSRV is now 1.41.1 ### Fixed - * `NormalizePath` improved consistency when path needs slashes added _and_ removed. -## [3.0.0-alpha.3] - 2020-05-21 +## 3.0.0-alpha.3 - 2020-05-21 ### Added - * Add option to create `Data` from `Arc` [#1509] ### Changed - * Resources and Scopes can now access non-overridden data types set on App (or containing scopes) when setting their own data. [#1486] - * Fix audit issue logging by default peer address [#1485] - * Bump minimum supported Rust version to 1.40 - * Replace deprecated `net2` crate with `socket2` [#1485]: https://github.com/actix/actix-web/pull/1485 diff --git a/Cargo.toml b/Cargo.toml index 146c4004f..49de9fd96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-web" -version = "3.0.0-alpha.3" +version = "3.0.0-beta.1" authors = ["Nikolay Kim "] description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust." readme = "README.md" @@ -76,9 +76,9 @@ actix-macros = "0.1.0" actix-threadpool = "0.3.1" actix-tls = "2.0.0-alpha.1" -actix-web-codegen = "0.2.2" +actix-web-codegen = "0.3.0-beta.1" actix-http = "2.0.0-alpha.4" -awc = { version = "2.0.0-alpha.2", default-features = false } +awc = { version = "2.0.0-beta.1", default-features = false } bytes = "0.5.3" derive_more = "0.99.2" diff --git a/actix-web-codegen/CHANGES.md b/actix-web-codegen/CHANGES.md index 8259aaac2..242c5f8de 100644 --- a/actix-web-codegen/CHANGES.md +++ b/actix-web-codegen/CHANGES.md @@ -1,18 +1,20 @@ # Changes -## [Unreleased] - XXXX-XX-XX +## Unreleased - 2020-xx-xx -* Add main entry-point macro that uses re-exported runtime. + +## 0.3.0-beta.1 - 2020-07-14 +* Add main entry-point macro that uses re-exported runtime. [#1559] + +[#1559]: https://github.com/actix/actix-web/pull/1559 ## [0.2.2] - 2020-05-23 - * Add resource middleware on actix-web-codegen [#1467] [#1467]: https://github.com/actix/actix-web/pull/1467 ## [0.2.1] - 2020-02-25 - * Add `#[allow(missing_docs)]` attribute to generated structs [#1368] * Allow the handler function to be named as `config` [#1290] @@ -26,7 +28,6 @@ ## [0.1.3] - 2019-10-14 * Bump up `syn` & `quote` to 1.0 - * Provide better error message ## [0.1.2] - 2019-06-04 diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml index 10c33ea74..070c09899 100644 --- a/actix-web-codegen/Cargo.toml +++ b/actix-web-codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-web-codegen" -version = "0.2.2" +version = "0.3.0-beta.1" description = "Actix web proc macros" readme = "README.md" homepage = "https://actix.rs" @@ -20,5 +20,5 @@ proc-macro2 = "1" [dev-dependencies] actix-rt = "1.0.0" -actix-web = "3.0.0-alpha.3" +actix-web = "3.0.0-beta.1" futures-util = { version = "0.3.5", default-features = false } From 2fd96c03e5a2d93671412252d864859e5de1b345 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 16 Jul 2020 11:38:57 +0100 Subject: [PATCH 4/4] prepare beta.1 release for multipart/files/actors (#1605) --- actix-files/CHANGES.md | 5 +++-- actix-files/Cargo.toml | 8 ++++---- actix-multipart/CHANGES.md | 12 +++++++----- actix-multipart/Cargo.toml | 6 +++--- actix-web-actors/CHANGES.md | 5 ++++- actix-web-actors/Cargo.toml | 6 +++--- 6 files changed, 24 insertions(+), 18 deletions(-) diff --git a/actix-files/CHANGES.md b/actix-files/CHANGES.md index 5d1845e37..75d616ff9 100644 --- a/actix-files/CHANGES.md +++ b/actix-files/CHANGES.md @@ -1,11 +1,12 @@ # Changes -## [unreleased] - xxx +## [Unreleased] - 2020-xx-xx +## [0.3.0-beta.1] - 2020-07-15 * Update `v_htmlescape` to 0.10 +* Update `actix-web` and `actix-http` dependencies to beta.1 ## [0.3.0-alpha.1] - 2020-05-23 - * Update `actix-web` and `actix-http` dependencies to alpha * Fix some typos in the docs * Bump minimum supported Rust version to 1.40 diff --git a/actix-files/Cargo.toml b/actix-files/Cargo.toml index b7ba75960..379ba8f89 100644 --- a/actix-files/Cargo.toml +++ b/actix-files/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-files" -version = "0.3.0-alpha.1" +version = "0.3.0-beta.1" authors = ["Nikolay Kim "] description = "Static files support for actix web." readme = "README.md" @@ -17,8 +17,8 @@ name = "actix_files" path = "src/lib.rs" [dependencies] -actix-web = { version = "3.0.0-alpha.3", default-features = false } -actix-http = "2.0.0-alpha.4" +actix-web = { version = "3.0.0-beta.1", default-features = false } +actix-http = "2.0.0-beta.1" actix-service = "1.0.1" bitflags = "1" bytes = "0.5.3" @@ -33,4 +33,4 @@ v_htmlescape = "0.10" [dev-dependencies] actix-rt = "1.0.0" -actix-web = { version = "3.0.0-alpha.3", features = ["openssl"] } +actix-web = { version = "3.0.0-beta.1", features = ["openssl"] } diff --git a/actix-multipart/CHANGES.md b/actix-multipart/CHANGES.md index df3cecf71..261836223 100644 --- a/actix-multipart/CHANGES.md +++ b/actix-multipart/CHANGES.md @@ -1,15 +1,17 @@ # Changes -## [0.3.0-alpha.1] - 2020-05-25 +## Unreleased - 2020-xx-xx + +## 0.3.0-beta.1 - 2020-07-15 +* Update `actix-web` to 3.0.0-beta.1 + + +## 0.3.0-alpha.1 - 2020-05-25 * Update `actix-web` to 3.0.0-alpha.3 - * Bump minimum supported Rust version to 1.40 - * Minimize `futures` dependencies - * Remove the unused `time` dependency - * Fix missing `std::error::Error` implement for `MultipartError`. ## [0.2.0] - 2019-12-20 diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml index f6d6a37a1..7e81035cc 100644 --- a/actix-multipart/Cargo.toml +++ b/actix-multipart/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-multipart" -version = "0.3.0-alpha.1" +version = "0.3.0-beta.1" authors = ["Nikolay Kim "] description = "Multipart support for actix web framework." readme = "README.md" @@ -16,7 +16,7 @@ name = "actix_multipart" path = "src/lib.rs" [dependencies] -actix-web = { version = "3.0.0-alpha.3", default-features = false } +actix-web = { version = "3.0.0-beta.1", default-features = false } actix-service = "1.0.1" actix-utils = "1.0.3" bytes = "0.5.3" @@ -29,4 +29,4 @@ twoway = "0.2" [dev-dependencies] actix-rt = "1.0.0" -actix-http = "2.0.0-alpha.4" +actix-http = "2.0.0-beta.1" diff --git a/actix-web-actors/CHANGES.md b/actix-web-actors/CHANGES.md index 8fd48f77c..868f17e2a 100644 --- a/actix-web-actors/CHANGES.md +++ b/actix-web-actors/CHANGES.md @@ -2,10 +2,13 @@ ## [Unreleased] - 2020-xx-xx + +## [3.0.0-beta.1] - 2020-xx-xx +* Update `actix-web` & `actix-http` dependencies to beta.1 * Bump minimum supported Rust version to 1.40 -## [3.0.0-alpha.1] - 2020-05-08 +## [3.0.0-alpha.1] - 2020-05-08 * Update the actix-web dependency to 3.0.0-alpha.1 * Update the actix dependency to 0.10.0-alpha.2 * Update the actix-http dependency to 2.0.0-alpha.3 diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml index 7383b2032..8de679da5 100644 --- a/actix-web-actors/Cargo.toml +++ b/actix-web-actors/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "actix-web-actors" -version = "3.0.0-alpha.1" +version = "3.0.0-beta.1" authors = ["Nikolay Kim "] description = "Actix actors support for actix web framework." readme = "README.md" @@ -17,8 +17,8 @@ path = "src/lib.rs" [dependencies] actix = "0.10.0-alpha.2" -actix-web = { version = "3.0.0-alpha.3", default-features = false } -actix-http = "2.0.0-alpha.4" +actix-web = { version = "3.0.0-beta.1", default-features = false } +actix-http = "2.0.0-beta.1" actix-codec = "0.2.0" bytes = "0.5.2" futures-channel = { version = "0.3.5", default-features = false }