{ pub(crate) payload: Payload
,
pub(crate) head: Message ,
+ P: ResourcePath,
+ {
+ profile_method!(recognize);
+
+ for item in self.routes.iter() {
+ if item.0.capture_match_info(resource.resource_path()) {
+ return Some((&item.1, ResourceId(item.0.id())));
+ }
+ }
+
+ None
+ }
+
+ pub fn recognize_mut ,
+ P: ResourcePath,
+ {
+ profile_method!(recognize_mut);
+
+ for item in self.routes.iter_mut() {
+ if item.0.capture_match_info(resource.resource_path()) {
+ return Some((&mut item.1, ResourceId(item.0.id())));
+ }
+ }
+
+ None
+ }
+
+ pub fn recognize_fn ,
+ P: ResourcePath,
+ {
+ profile_method!(recognize_checked);
+
+ for item in self.routes.iter() {
+ if item.0.capture_match_info_fn(resource, &check, &item.2) {
+ return Some((&item.1, ResourceId(item.0.id())));
+ }
+ }
+
+ None
+ }
+
+ pub fn recognize_mut_fn ,
+ P: ResourcePath,
+ {
+ profile_method!(recognize_mut_checked);
+
+ for item in self.routes.iter_mut() {
+ if item.0.capture_match_info_fn(resource, &check, &item.2) {
+ return Some((&mut item.1, ResourceId(item.0.id())));
+ }
+ }
+
+ None
+ }
+}
+
+pub struct RouterBuilder
[](https://deps.rs/crate/actix-multipart/0.4.0-beta.5)
@@ -14,4 +14,4 @@
## Documentation & Resources
- [API Documentation](https://docs.rs/actix-multipart)
-- Minimum Supported Rust Version (MSRV): 1.46.0
+- Minimum Supported Rust Version (MSRV): 1.51.0
diff --git a/actix-router/CHANGES.md b/actix-router/CHANGES.md
new file mode 100644
index 000000000..804f7778d
--- /dev/null
+++ b/actix-router/CHANGES.md
@@ -0,0 +1,124 @@
+# Changes
+
+## Unreleased - 2021-xx-xx
+* Introduce `ResourceDef::join`. [#380]
+* Disallow prefix routes with tail segments. [#379]
+* Enforce path separators on dynamic prefixes. [#378]
+* Improve malformed path error message. [#384]
+* Prefix segments now always end with with a segment delimiter or end-of-input. [#2355]
+* Prefix segments with trailing slashes define a trailing empty segment. [#2355]
+* Minimum supported Rust version (MSRV) is now 1.51.
+
+[#378]: https://github.com/actix/actix-net/pull/378
+[#379]: https://github.com/actix/actix-net/pull/379
+[#380]: https://github.com/actix/actix-net/pull/380
+[#384]: https://github.com/actix/actix-net/pull/384
+[#2355]: https://github.com/actix/actix-web/pull/2355
+
+
+## 0.5.0-beta.1 - 2021-07-20
+* Fix a bug in multi-patterns where static patterns are interpreted as regex. [#366]
+* Introduce `ResourceDef::pattern_iter` to get an iterator over all patterns in a multi-pattern resource. [#373]
+* Fix segment interpolation leaving `Path` in unintended state after matching. [#368]
+* Fix `ResourceDef` `PartialEq` implementation. [#373]
+* Re-work `IntoPatterns` trait, adding a `Patterns` enum. [#372]
+* Implement `IntoPatterns` for `bytestring::ByteString`. [#372]
+* Rename `Path::{len => segment_count}` to be more descriptive of it's purpose. [#370]
+* Rename `ResourceDef::{resource_path => resource_path_from_iter}`. [#371]
+* `ResourceDef::resource_path_from_iter` now takes an `IntoIterator`. [#373]
+* Rename `ResourceDef::{resource_path_named => resource_path_from_map}`. [#371]
+* Rename `ResourceDef::{is_prefix_match => find_match}`. [#373]
+* Rename `ResourceDef::{match_path => capture_match_info}`. [#373]
+* Rename `ResourceDef::{match_path_checked => capture_match_info_fn}`. [#373]
+* Remove `ResourceDef::name_mut` and introduce `ResourceDef::set_name`. [#373]
+* Rename `Router::{*_checked => *_fn}`. [#373]
+* Return type of `ResourceDef::name` is now `Option<&str>`. [#373]
+* Return type of `ResourceDef::pattern` is now `Option<&str>`. [#373]
+
+[#368]: https://github.com/actix/actix-net/pull/368
+[#366]: https://github.com/actix/actix-net/pull/366
+[#368]: https://github.com/actix/actix-net/pull/368
+[#370]: https://github.com/actix/actix-net/pull/370
+[#371]: https://github.com/actix/actix-net/pull/371
+[#372]: https://github.com/actix/actix-net/pull/372
+[#373]: https://github.com/actix/actix-net/pull/373
+
+
+## 0.4.0 - 2021-06-06
+* When matching path parameters, `%25` is now kept in the percent-encoded form; no longer decoded to `%`. [#357]
+* Path tail patterns now match new lines (`\n`) in request URL. [#360]
+* Fixed a safety bug where `Path` could return a malformed string after percent decoding. [#359]
+* Methods `Path::{add, add_static}` now take `impl Into
[](https://deps.rs/crate/actix-web-actors/4.0.0-beta.6)
@@ -14,4 +14,4 @@
## Documentation & Resources
- [API Documentation](https://docs.rs/actix-web-actors)
-- Minimum supported Rust version: 1.46 or later
+- Minimum supported Rust version: 1.51 or later
diff --git a/actix-web-codegen/CHANGES.md b/actix-web-codegen/CHANGES.md
index a8a901f72..f0a56b30f 100644
--- a/actix-web-codegen/CHANGES.md
+++ b/actix-web-codegen/CHANGES.md
@@ -1,6 +1,10 @@
# Changes
## Unreleased - 2021-xx-xx
+* In routing macros, paths are now validated at compile time. [#2350]
+* Minimum supported Rust version (MSRV) is now 1.51.
+
+[#2350]: https://github.com/actix/actix-web/pull/2350
## 0.5.0-beta.3 - 2021-06-17
diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml
index 4d0fd5e26..66f7acf6d 100644
--- a/actix-web-codegen/Cargo.toml
+++ b/actix-web-codegen/Cargo.toml
@@ -17,6 +17,7 @@ proc-macro = true
quote = "1"
syn = { version = "1", features = ["full", "parsing"] }
proc-macro2 = "1"
+actix-router = "0.5.0-beta.1"
[dev-dependencies]
actix-rt = "2.2"
diff --git a/actix-web-codegen/README.md b/actix-web-codegen/README.md
index 96e4cb51f..e69cfbbe5 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/0.5.0-beta.3)
-[](https://blog.rust-lang.org/2020/03/12/Rust-1.46.html)
+[](https://blog.rust-lang.org/2020/03/12/Rust-1.51.html)
[](https://deps.rs/crate/actix-web-codegen/0.5.0-beta.3)
@@ -14,7 +14,7 @@
## Documentation & Resources
- [API Documentation](https://docs.rs/actix-web-codegen)
-- Minimum supported Rust version: 1.46 or later.
+- Minimum supported Rust version: 1.51 or later.
## Compile Testing
diff --git a/actix-web-codegen/src/route.rs b/actix-web-codegen/src/route.rs
index 747042527..c2f851a0e 100644
--- a/actix-web-codegen/src/route.rs
+++ b/actix-web-codegen/src/route.rs
@@ -3,6 +3,7 @@ extern crate proc_macro;
use std::collections::HashSet;
use std::convert::TryFrom;
+use actix_router::ResourceDef;
use proc_macro::TokenStream;
use proc_macro2::{Span, TokenStream as TokenStream2};
use quote::{format_ident, quote, ToTokens, TokenStreamExt};
@@ -101,6 +102,7 @@ impl Args {
match arg {
NestedMeta::Lit(syn::Lit::Str(lit)) => match path {
None => {
+ let _ = ResourceDef::new(lit.value());
path = Some(lit);
}
_ => {
diff --git a/actix-web-codegen/tests/trybuild.rs b/actix-web-codegen/tests/trybuild.rs
index 12e848cf3..54bc1caec 100644
--- a/actix-web-codegen/tests/trybuild.rs
+++ b/actix-web-codegen/tests/trybuild.rs
@@ -1,4 +1,4 @@
-#[rustversion::stable(1.46)] // MSRV
+#[rustversion::stable(1.51)] // MSRV
#[test]
fn compile_macros() {
let t = trybuild::TestCases::new();
@@ -10,6 +10,7 @@ fn compile_macros() {
t.compile_fail("tests/trybuild/route-missing-method-fail.rs");
t.compile_fail("tests/trybuild/route-duplicate-method-fail.rs");
t.compile_fail("tests/trybuild/route-unexpected-method-fail.rs");
+ t.compile_fail("tests/trybuild/route-malformed-path-fail.rs");
t.pass("tests/trybuild/docstring-ok.rs");
}
diff --git a/actix-web-codegen/tests/trybuild/route-malformed-path-fail.rs b/actix-web-codegen/tests/trybuild/route-malformed-path-fail.rs
new file mode 100644
index 000000000..1258a6f2f
--- /dev/null
+++ b/actix-web-codegen/tests/trybuild/route-malformed-path-fail.rs
@@ -0,0 +1,33 @@
+use actix_web_codegen::get;
+
+#[get("/{")]
+async fn zero() -> &'static str {
+ "malformed resource def"
+}
+
+#[get("/{foo")]
+async fn one() -> &'static str {
+ "malformed resource def"
+}
+
+#[get("/{}")]
+async fn two() -> &'static str {
+ "malformed resource def"
+}
+
+#[get("/*")]
+async fn three() -> &'static str {
+ "malformed resource def"
+}
+
+#[get("/{tail:\\d+}*")]
+async fn four() -> &'static str {
+ "malformed resource def"
+}
+
+#[get("/{a}/{b}/{c}/{d}/{e}/{f}/{g}/{h}/{i}/{j}/{k}/{l}/{m}/{n}/{o}/{p}/{q}")]
+async fn five() -> &'static str {
+ "malformed resource def"
+}
+
+fn main() {}
diff --git a/actix-web-codegen/tests/trybuild/route-malformed-path-fail.stderr b/actix-web-codegen/tests/trybuild/route-malformed-path-fail.stderr
new file mode 100644
index 000000000..93c510109
--- /dev/null
+++ b/actix-web-codegen/tests/trybuild/route-malformed-path-fail.stderr
@@ -0,0 +1,42 @@
+error: custom attribute panicked
+ --> $DIR/route-malformed-path-fail.rs:3:1
+ |
+3 | #[get("/{")]
+ | ^^^^^^^^^^^^
+ |
+ = help: message: pattern "{" contains malformed dynamic segment
+
+error: custom attribute panicked
+ --> $DIR/route-malformed-path-fail.rs:8:1
+ |
+8 | #[get("/{foo")]
+ | ^^^^^^^^^^^^^^^
+ |
+ = help: message: pattern "{foo" contains malformed dynamic segment
+
+error: custom attribute panicked
+ --> $DIR/route-malformed-path-fail.rs:13:1
+ |
+13 | #[get("/{}")]
+ | ^^^^^^^^^^^^^
+ |
+ = help: message: Wrong path pattern: "/{}" regex parse error:
+ ((?s-m)^/(?P<>[^/]+))$
+ ^
+ error: empty capture group name
+
+error: custom attribute panicked
+ --> $DIR/route-malformed-path-fail.rs:23:1
+ |
+23 | #[get("/{tail:\\d+}*")]
+ | ^^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = help: message: custom regex is not supported for tail match
+
+error: custom attribute panicked
+ --> $DIR/route-malformed-path-fail.rs:28:1
+ |
+28 | #[get("/{a}/{b}/{c}/{d}/{e}/{f}/{g}/{h}/{i}/{j}/{k}/{l}/{m}/{n}/{o}/{p}/{q}")]
+ | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+ |
+ = help: message: Only 16 dynamic segments are allowed, provided: 17
diff --git a/awc/README.md b/awc/README.md
index dd08c6e10..fe91383ca 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/HEAD/security/awc_https)
-- Minimum Supported Rust Version (MSRV): 1.46.0
+- Minimum Supported Rust Version (MSRV): 1.51.0
## Example
diff --git a/clippy.toml b/clippy.toml
index eb66960ac..829dd1c59 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1 +1 @@
-msrv = "1.46"
+msrv = "1.51"
diff --git a/docs/graphs/net-only.dot b/docs/graphs/net-only.dot
index bee0185ab..8a58ec2b8 100644
--- a/docs/graphs/net-only.dot
+++ b/docs/graphs/net-only.dot
@@ -4,7 +4,7 @@ digraph {
subgraph cluster_net {
label="actix-net"
"actix-codec" "actix-macros" "actix-rt" "actix-server" "actix-service"
- "actix-tls" "actix-tracing" "actix-utils" "actix-router"
+ "actix-tls" "actix-tracing" "actix-utils"
}
subgraph cluster_other {
@@ -25,7 +25,6 @@ digraph {
"actix-tls" -> { "tokio-util" }[color="#009900"]
"actix-server" -> { "actix-service" "actix-rt" "actix-utils" "tokio" }
"actix-rt" -> { "actix-macros" "tokio" }
- "actix-router" -> { "bytestring" }
"local-channel" -> { "local-waker" }
diff --git a/docs/graphs/web-focus.dot b/docs/graphs/web-focus.dot
index 2c6e2779b..63b3eaa82 100644
--- a/docs/graphs/web-focus.dot
+++ b/docs/graphs/web-focus.dot
@@ -10,6 +10,7 @@ digraph {
"web-actors"
"web-codegen"
"http-test"
+ "router"
{ rank=same; "multipart" "web-actors" "http-test" };
{ rank=same; "files" "awc" "web" };
@@ -36,7 +37,7 @@ digraph {
"rt" -> { "macros" }
{ rank=same; "utils" "codec" };
- { rank=same; "rt" "macros" "service" "router" };
+ { rank=same; "rt" "macros" "service" };
// actix
diff --git a/docs/graphs/web-only.dot b/docs/graphs/web-only.dot
index b0decd818..ee74c292b 100644
--- a/docs/graphs/web-only.dot
+++ b/docs/graphs/web-only.dot
@@ -10,9 +10,10 @@ digraph {
"actix-web-codegen"
"actix-http-test"
"actix-test"
+ "actix-router"
}
- "actix-web" -> { "actix-web-codegen" "actix-http" }
+ "actix-web" -> { "actix-web-codegen" "actix-http" "actix-router" }
"awc" -> { "actix-http" }
"actix-web-actors" -> { "actix" "actix-web" "actix-http" }
"actix-multipart" -> { "actix-web" }
diff --git a/src/app.rs b/src/app.rs
index 5cff20568..da5b45f3a 100644
--- a/src/app.rs
+++ b/src/app.rs
@@ -334,7 +334,7 @@ where
U: AsRef