diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
index f8bf2abda..f0e4cc8b3 100644
--- a/.github/workflows/bench.yml
+++ b/.github/workflows/bench.yml
@@ -2,8 +2,7 @@ name: Benchmark
on:
push:
- branches:
- - master
+ branches: [master]
permissions:
contents: read # to fetch code (actions/checkout)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 468c9b1df..f073f6afe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,8 @@ name: CI
on:
pull_request:
types: [opened, synchronize, reopened]
+ merge_group:
+ types: [checks_requested]
push:
branches: [master]
@@ -24,7 +26,7 @@ jobs:
- { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
- { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
version:
- - 1.65.0 # MSRV
+ - 1.68.0 # MSRV
- stable
name: ${{ matrix.target.name }} / ${{ matrix.version }}
diff --git a/actix-files/CHANGES.md b/actix-files/CHANGES.md
index 4e45ce517..31c0499ed 100644
--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 0.6.3 - 2023-01-21
diff --git a/actix-files/README.md b/actix-files/README.md
index f01fc8566..3e656c431 100644
--- a/actix-files/README.md
+++ b/actix-files/README.md
@@ -4,7 +4,7 @@
[](https://crates.io/crates/actix-files)
[](https://docs.rs/actix-files/0.6.3)
-
+
[](https://deps.rs/crate/actix-files/0.6.3)
@@ -15,4 +15,4 @@
- [API Documentation](https://docs.rs/actix-files)
- [Example Project](https://github.com/actix/examples/tree/master/basics/static-files)
-- Minimum Supported Rust Version (MSRV): 1.65
+- Minimum Supported Rust Version (MSRV): 1.68
diff --git a/actix-http-test/CHANGES.md b/actix-http-test/CHANGES.md
index 3b8c83b3c..0fc89214d 100644
--- a/actix-http-test/CHANGES.md
+++ b/actix-http-test/CHANGES.md
@@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 3.1.0 - 2023-01-21
diff --git a/actix-http-test/README.md b/actix-http-test/README.md
index 935be407f..4b286e603 100644
--- a/actix-http-test/README.md
+++ b/actix-http-test/README.md
@@ -4,7 +4,7 @@
[](https://crates.io/crates/actix-http-test)
[](https://docs.rs/actix-http-test/3.1.0)
-
+
[](https://deps.rs/crate/actix-http-test/3.1.0)
@@ -14,4 +14,4 @@
## Documentation & Resources
- [API Documentation](https://docs.rs/actix-http-test)
-- Minimum Supported Rust Version (MSRV): 1.65
+- Minimum Supported Rust Version (MSRV): 1.68
diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index a105c02c1..0dedd2c74 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -9,7 +9,7 @@
### Changed
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 3.3.1 - 2023-03-02
diff --git a/actix-http/README.md b/actix-http/README.md
index 0c5fcb6b6..ce2e5cb32 100644
--- a/actix-http/README.md
+++ b/actix-http/README.md
@@ -4,7 +4,7 @@
[](https://crates.io/crates/actix-http)
[](https://docs.rs/actix-http/3.3.1)
-
+
[](https://deps.rs/crate/actix-http/3.3.1)
@@ -14,7 +14,7 @@
## Documentation & Resources
- [API Documentation](https://docs.rs/actix-http)
-- Minimum Supported Rust Version (MSRV): 1.65
+- Minimum Supported Rust Version (MSRV): 1.68
## Example
diff --git a/actix-multipart-derive/CHANGES.md b/actix-multipart-derive/CHANGES.md
index 8a78900ec..f90b9e3cf 100644
--- a/actix-multipart-derive/CHANGES.md
+++ b/actix-multipart-derive/CHANGES.md
@@ -3,7 +3,7 @@
## Unreleased
- Update `syn` dependency to `2`.
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 0.6.0 - 2023-02-26
diff --git a/actix-multipart-derive/README.md b/actix-multipart-derive/README.md
index b077d355c..2737410f6 100644
--- a/actix-multipart-derive/README.md
+++ b/actix-multipart-derive/README.md
@@ -4,7 +4,7 @@
[](https://crates.io/crates/actix-multipart-derive)
[](https://docs.rs/actix-multipart-derive/0.5.0)
-
+
[](https://deps.rs/crate/actix-multipart-derive/0.5.0)
@@ -14,4 +14,4 @@
## Documentation & Resources
- [API Documentation](https://docs.rs/actix-multipart-derive)
-- Minimum Supported Rust Version (MSRV): 1.65
+- Minimum Supported Rust Version (MSRV): 1.68
diff --git a/actix-multipart-derive/tests/trybuild.rs b/actix-multipart-derive/tests/trybuild.rs
index 829c1d771..88aa619c6 100644
--- a/actix-multipart-derive/tests/trybuild.rs
+++ b/actix-multipart-derive/tests/trybuild.rs
@@ -1,4 +1,4 @@
-#[rustversion::stable(1.65)] // MSRV
+#[rustversion::stable(1.68)] // MSRV
#[test]
fn compile_macros() {
let t = trybuild::TestCases::new();
diff --git a/actix-multipart/CHANGES.md b/actix-multipart/CHANGES.md
index 410c8af17..1ad5865ec 100644
--- a/actix-multipart/CHANGES.md
+++ b/actix-multipart/CHANGES.md
@@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 0.6.0 - 2023-02-26
diff --git a/actix-multipart/README.md b/actix-multipart/README.md
index 3e2a7a127..66550668d 100644
--- a/actix-multipart/README.md
+++ b/actix-multipart/README.md
@@ -4,7 +4,7 @@
[](https://crates.io/crates/actix-multipart)
[](https://docs.rs/actix-multipart/0.6.0)
-
+
[](https://deps.rs/crate/actix-multipart/0.6.0)
@@ -14,4 +14,4 @@
## Documentation & Resources
- [API Documentation](https://docs.rs/actix-multipart)
-- Minimum Supported Rust Version (MSRV): 1.65
+- Minimum Supported Rust Version (MSRV): 1.68
diff --git a/actix-router/CHANGES.md b/actix-router/CHANGES.md
index 1f5552193..786ee12d9 100644
--- a/actix-router/CHANGES.md
+++ b/actix-router/CHANGES.md
@@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 0.5.1 - 2022-09-19
diff --git a/actix-router/src/resource.rs b/actix-router/src/resource.rs
index a3e89a1fe..80c0a2d68 100644
--- a/actix-router/src/resource.rs
+++ b/actix-router/src/resource.rs
@@ -501,7 +501,12 @@ impl ResourceDef {
let patterns = self
.pattern_iter()
.flat_map(move |this| other.pattern_iter().map(move |other| (this, other)))
- .map(|(this, other)| [this, other].join(""))
+ .map(|(this, other)| {
+ let mut pattern = String::with_capacity(this.len() + other.len());
+ pattern.push_str(this);
+ pattern.push_str(other);
+ pattern
+ })
.collect::>();
match patterns.len() {
diff --git a/actix-test/CHANGES.md b/actix-test/CHANGES.md
index aba27dbfc..fae8201d2 100644
--- a/actix-test/CHANGES.md
+++ b/actix-test/CHANGES.md
@@ -3,7 +3,7 @@
## Unreleased - 2023-xx-xx
- Add `TestServerConfig::workers()` setter method.
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 0.1.1 - 2023-02-26
diff --git a/actix-web-actors/CHANGES.md b/actix-web-actors/CHANGES.md
index 4799c7b67..cff27a16d 100644
--- a/actix-web-actors/CHANGES.md
+++ b/actix-web-actors/CHANGES.md
@@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 4.2.0 - 2023-01-21
diff --git a/actix-web-actors/README.md b/actix-web-actors/README.md
index fe6122115..b2c30b954 100644
--- a/actix-web-actors/README.md
+++ b/actix-web-actors/README.md
@@ -4,7 +4,7 @@
[](https://crates.io/crates/actix-web-actors)
[](https://docs.rs/actix-web-actors/4.2.0)
-
+
[](https://deps.rs/crate/actix-web-actors/4.2.0)
@@ -14,4 +14,4 @@
## Documentation & Resources
- [API Documentation](https://docs.rs/actix-web-actors)
-- Minimum Supported Rust Version (MSRV): 1.65
+- Minimum Supported Rust Version (MSRV): 1.68
diff --git a/actix-web-codegen/CHANGES.md b/actix-web-codegen/CHANGES.md
index 2c5f17226..9ff1edf6e 100644
--- a/actix-web-codegen/CHANGES.md
+++ b/actix-web-codegen/CHANGES.md
@@ -3,7 +3,7 @@
## Unreleased - 2023-xx-xx
- Update `syn` dependency to `2`.
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 4.2.0 - 2023-02-26
diff --git a/actix-web-codegen/README.md b/actix-web-codegen/README.md
index 531f44a5d..e6df8164e 100644
--- a/actix-web-codegen/README.md
+++ b/actix-web-codegen/README.md
@@ -4,7 +4,7 @@
[](https://crates.io/crates/actix-web-codegen)
[](https://docs.rs/actix-web-codegen/4.2.0)
-
+
[](https://deps.rs/crate/actix-web-codegen/4.2.0)
@@ -14,7 +14,7 @@
## Documentation & Resources
- [API Documentation](https://docs.rs/actix-web-codegen)
-- Minimum Supported Rust Version (MSRV): 1.65
+- Minimum Supported Rust Version (MSRV): 1.68
## Compile Testing
diff --git a/actix-web-codegen/tests/trybuild.rs b/actix-web-codegen/tests/trybuild.rs
index 9f0aa02f4..8e1f58a4c 100644
--- a/actix-web-codegen/tests/trybuild.rs
+++ b/actix-web-codegen/tests/trybuild.rs
@@ -1,4 +1,4 @@
-#[rustversion::stable(1.65)] // MSRV
+#[rustversion::stable(1.68)] // MSRV
#[test]
fn compile_macros() {
let t = trybuild::TestCases::new();
diff --git a/actix-web/CHANGES.md b/actix-web/CHANGES.md
index 39535d41f..518a02507 100644
--- a/actix-web/CHANGES.md
+++ b/actix-web/CHANGES.md
@@ -15,7 +15,7 @@
- Handler functions can now receive up to 16 extractor parameters.
- The `Compress` middleware no longer compresses image or video content.
- Hide sensitive header values in `HttpRequest`'s `Debug` output.
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 4.3.1 - 2023-02-26
diff --git a/actix-web/README.md b/actix-web/README.md
index cc2d9abe0..565f2b0f3 100644
--- a/actix-web/README.md
+++ b/actix-web/README.md
@@ -5,7 +5,7 @@
-[](https://crates.io/crates/actix-web) [](https://docs.rs/actix-web/4.3.1)   [](https://deps.rs/crate/actix-web/4.3.1)
[](https://github.com/actix/actix-web/actions/workflows/ci.yml) [](https://codecov.io/gh/actix/actix-web)  [](https://discord.gg/NWpN5mmg3x)
+[](https://crates.io/crates/actix-web) [](https://docs.rs/actix-web/4.3.1)   [](https://deps.rs/crate/actix-web/4.3.1)
[](https://github.com/actix/actix-web/actions/workflows/ci.yml) [](https://codecov.io/gh/actix/actix-web)  [](https://discord.gg/NWpN5mmg3x)
@@ -24,7 +24,7 @@
- SSL support using OpenSSL or Rustls
- Middlewares ([Logger, Session, CORS, etc](https://actix.rs/docs/middleware/))
- Integrates with the [`awc` HTTP client](https://docs.rs/awc/)
-- Runs on stable Rust 1.65+
+- Runs on stable Rust 1.68+
## Documentation
diff --git a/awc/CHANGES.md b/awc/CHANGES.md
index f5bddd04d..3429a84d7 100644
--- a/awc/CHANGES.md
+++ b/awc/CHANGES.md
@@ -2,7 +2,7 @@
## Unreleased - 2023-xx-xx
-- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
+- Minimum supported Rust version (MSRV) is now 1.68 due to transitive `time` dependency.
## 3.1.1 - 2023-02-26
diff --git a/awc/README.md b/awc/README.md
index 1a480df12..f2a9c7559 100644
--- a/awc/README.md
+++ b/awc/README.md
@@ -12,7 +12,7 @@
- [API Documentation](https://docs.rs/awc)
- [Example Project](https://github.com/actix/examples/tree/master/https-tls/awc-https)
-- Minimum Supported Rust Version (MSRV): 1.65
+- Minimum Supported Rust Version (MSRV): 1.68
## Example