Skip to content

Commit 7d64d4a

Browse files
authored
Merge branch 'master' into proxy-protocol
2 parents 4ebc7f4 + 2b83f08 commit 7d64d4a

File tree

13 files changed

+14
-18
lines changed

13 files changed

+14
-18
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- { name: Windows (MinGW), os: windows-latest, triple: x86_64-pc-windows-gnu }
1919
- { name: Windows (32-bit), os: windows-latest, triple: i686-pc-windows-msvc }
2020
version:
21-
- 1.57.0
21+
- 1.59.0
2222
- stable
2323

2424
name: ${{ matrix.target.name }} / ${{ matrix.version }}
@@ -70,12 +70,6 @@ jobs:
7070
- name: Install cargo-hack
7171
uses: taiki-e/install-action@cargo-hack
7272

73-
- name: workaround MSRV issues
74-
if: matrix.version != 'stable'
75-
run: |
76-
cargo install cargo-edit --version=0.8.0
77-
cargo add const-str@0.3 --dev -p=actix-proxy-protocol
78-
7973
- name: Generate Cargo.lock
8074
uses: actions-rs/cargo@v1
8175
with: { command: generate-lockfile }
@@ -126,7 +120,7 @@ jobs:
126120
sudo bash -c "ulimit -Sl 512 && ulimit -Hl 512 && PATH=$PATH:/usr/share/rust/.cargo/bin && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test && RUSTUP_TOOLCHAIN=${{ matrix.version }} cargo ci-test-linux"
127121
128122
- name: Clear the cargo caches
129-
if: matrix.version == 'stable' # MSRV(1.58) cargo-cache now fails to install on 1.57
123+
if: matrix.version == 'stable' # MSRV(1.58) cargo-cache now fails to install on 1.59
130124
run: |
131125
cargo install cargo-cache --version 0.6.2 --no-default-features --features ci-autoclean
132126
cargo-cache

actix-codec/CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changes
22

33
## Unreleased - 2022-xx-xx
4-
- Minimum supported Rust version (MSRV) is now 1.57.
4+
- Minimum supported Rust version (MSRV) is now 1.59.
55

66

77
## 0.5.1 - 2022-03-15

actix-macros/CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changes
22

33
## Unreleased - 2022-xx-xx
4-
- Minimum supported Rust version (MSRV) is now 1.57.
4+
- Minimum supported Rust version (MSRV) is now 1.59.
55

66

77
## 0.2.3 - 2021-10-19

actix-rt/CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Unreleased - 2022-xx-xx
44
- Add `#[track_caller]` attribute to `spawn` functions and methods. [#454]
5-
- Minimum supported Rust version (MSRV) is now 1.57.
5+
- Minimum supported Rust version (MSRV) is now 1.59.
66

77
[#454]: https://github.com/actix/actix-net/pull/454
88

actix-server/CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changes
22

33
## Unreleased - 2022-xx-xx
4-
- Minimum supported Rust version (MSRV) is now 1.57.
4+
- Minimum supported Rust version (MSRV) is now 1.59.
55

66

77
## 2.1.1 - 2022-03-09

actix-service/CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changes
22

33
## Unreleased - 2022-xx-xx
4-
- Minimum supported Rust version (MSRV) is now 1.57.
4+
- Minimum supported Rust version (MSRV) is now 1.59.
55

66

77
## 2.0.2 - 2021-12-18

actix-tls/CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changes
22

33
## Unreleased - 2022-xx-xx
4-
- Minimum supported Rust version (MSRV) is now 1.57.
4+
- Minimum supported Rust version (MSRV) is now 1.59.
55

66

77
## 3.0.4 - 2022-03-15

actix-tracing/CHANGES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changes
22

33
## Unreleased - 2022-xx-xx
4-
- Minimum supported Rust version (MSRV) is now 1.57.
4+
- Minimum supported Rust version (MSRV) is now 1.59.
55

66

77
## 0.1.0 - 2020-01-15

actix-utils/CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changes
22

33
## Unreleased - 2022-xx-xx
4+
- Minimum supported Rust version (MSRV) is now 1.59.
45

56

67
## 3.0.1 - 2022-10-21

bytestring/CHANGES.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changes
22

33
## Unreleased - 2022-xx-xx
4+
- Minimum supported Rust version (MSRV) is now 1.59.
45

56

67
## 1.2.1 - 2022-11-12

0 commit comments

Comments
 (0)