Skip to content

Commit

Permalink
This is a squashed commit:
Browse files Browse the repository at this point in the history
- Convert MessageBody to accept Pin in poll_next

- add CHANGES and increase versions aligned to semver

- update crates to accomodate MessageBody Pin change

- fix tests and dependencies
  • Loading branch information
dunnock committed Jan 30, 2020
1 parent e50ed55 commit 20a18fb
Show file tree
Hide file tree
Showing 28 changed files with 353 additions and 210 deletions.
27 changes: 2 additions & 25 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,26 +27,6 @@ jobs:
profile: minimal
override: true

- name: Generate Cargo.lock
uses: actions-rs/cargo@v1
with:
command: generate-lockfile
- name: Cache cargo registry
uses: actions/cache@v1
with:
path: ~/.cargo/registry
key: ${{ matrix.version }}-x86_64-pc-windows-msvc-cargo-registry-trimmed-${{ hashFiles('**/Cargo.lock') }}
- name: Cache cargo index
uses: actions/cache@v1
with:
path: ~/.cargo/git
key: ${{ matrix.version }}-x86_64-pc-windows-msvc-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
- name: Cache cargo build
uses: actions/cache@v1
with:
path: target
key: ${{ matrix.version }}-x86_64-pc-windows-msvc-cargo-build-trimmed-${{ hashFiles('**/Cargo.lock') }}

- name: Install OpenSSL
run: |
vcpkg integrate install
Expand Down Expand Up @@ -74,8 +54,5 @@ jobs:
--skip=test_expect_continue
--skip=test_http10_keepalive
--skip=test_slow_request

- name: Clear the cargo caches
run: |
cargo install cargo-cache --no-default-features --features ci-autoclean
cargo-cache
--skip=test_connection_force_close
--skip=test_connection_server_close
4 changes: 3 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changes


## [2.0.NEXT] - 2020-01-xx
## [2.1.NEXT] - 2020-01-xx

### Changed

Expand All @@ -11,6 +11,8 @@

* Update the `time` dependency to 0.2.5

* Accomodate breaking change in actix-http: trait actix_http::MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next()

## [2.0.0] - 2019-12-25

### Changed
Expand Down
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "actix-web"
version = "2.0.0"
version = "3.0.0"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix web is a simple, pragmatic and extremely fast web framework for Rust."
readme = "README.md"
Expand Down Expand Up @@ -71,8 +71,8 @@ actix-threadpool = "0.3.1"
actix-tls = "1.0.0"

actix-web-codegen = "0.2.0"
actix-http = "1.0.1"
awc = { version = "1.0.1", default-features = false }
actix-http = { version = "2.0.0", path = "actix-http" }
awc = { version = "2.0.0", path = "awc", default-features = false }

bytes = "0.5.3"
derive_more = "0.99.2"
Expand Down Expand Up @@ -107,7 +107,7 @@ opt-level = 3
codegen-units = 1

[patch.crates-io]
actix-web = { path = "." }
actix-web = { path = "." }
actix-http = { path = "actix-http" }
actix-http-test = { path = "test-server" }
actix-web-codegen = { path = "actix-web-codegen" }
Expand Down
4 changes: 4 additions & 0 deletions actix-http/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@

* Update the `time` dependency to 0.2.5

* Breaking change: trait MessageBody requires Unpin and accepting Pin<&mut Self> instead of &mut self in the poll_next()

* MessageBody is not implemented for &'static [u8] anymore

### Fixed

* Allow `SameSite=None` cookies to be sent in a response.
Expand Down
14 changes: 7 additions & 7 deletions actix-http/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "actix-http"
version = "1.0.1"
version = "2.0.0"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "Actix http primitives"
readme = "README.md"
Expand Down Expand Up @@ -40,10 +40,10 @@ failure = ["fail-ure"]
secure-cookies = ["ring"]

[dependencies]
actix-service = "1.0.1"
actix-service = "1.0.5"
actix-codec = "0.2.0"
actix-connect = "1.0.1"
actix-utils = "1.0.3"
actix-connect = "1.0.2"
actix-utils = "1.0.6"
actix-rt = "1.0.0"
actix-threadpool = "0.3.1"
actix-tls = { version = "1.0.0", optional = true }
Expand Down Expand Up @@ -89,9 +89,9 @@ flate2 = { version = "1.0.13", optional = true }
fail-ure = { version = "0.1.5", package="failure", optional = true }

[dev-dependencies]
actix-server = "1.0.0"
actix-connect = { version = "1.0.0", features=["openssl"] }
actix-http-test = { version = "1.0.0", features=["openssl"] }
actix-server = "1.0.1"
actix-connect = { version = "1.0.2", features=["openssl"] }
actix-http-test = { version = "2.0.0", path = "../test-server", features=["openssl"] }
actix-tls = { version = "1.0.0", features=["openssl"] }
futures = "0.3.1"
env_logger = "0.6"
Expand Down
Loading

0 comments on commit 20a18fb

Please sign in to comment.