Skip to content

Commit eebc744

Browse files
authored
Update Rust to 1.86.0 (#701)
1 parent 1369185 commit eebc744

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
docker_container_repo_dir=/app
55

66
# Common docker options
7-
rust_docker_container := public.ecr.aws/docker/library/rust:1.85.1
7+
rust_docker_container := public.ecr.aws/docker/library/rust:1.86.0
88

99
docker_opts_shared := --rm -v "$(PWD)":$(docker_container_repo_dir) -w $(docker_container_repo_dir)
1010
rust_docker_run := docker run -v $(PWD):/$(docker_container_repo_dir) -w $(docker_container_repo_dir) -it -e TEST_ALL_PLUGINS -e CARGO_HOME=/app/.cargo $(rust_docker_container)

wp_api/src/api_error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ impl WpSupportsLocalization for RequestExecutionErrorReason {
571571
RequestExecutionErrorReason::MisconfiguredHttpAuthenticationError { .. } => {
572572
WpMessages::misconfigured_http_authentication_error()
573573
}
574-
RequestExecutionErrorReason::MisconfiguredRateLimitError { .. } => {
574+
RequestExecutionErrorReason::MisconfiguredRateLimitError => {
575575
WpMessages::misconfigured_rate_limit_error()
576576
}
577577
RequestExecutionErrorReason::HttpForbiddenError { hostname } => {

wp_api/src/middleware.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ mod tests {
442442
Err(RequestExecutionError::RequestExecutionFailed {
443443
status_code: Some(429),
444444
redirects: None,
445-
reason: RequestExecutionErrorReason::MisconfiguredRateLimitError {},
445+
reason: RequestExecutionErrorReason::MisconfiguredRateLimitError,
446446
})
447447
));
448448
}

wp_api/src/parsed_url.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ impl UrlExtension for Url {
5858
I::Item: AsRef<str>,
5959
{
6060
// Drop the trailing slash, so that `foo/` and `bar` turn into `foo/bar` instead of `foo//bar`.
61-
if let Some(segments) = self.path_segments() {
62-
if segments.last() == Some("") {
61+
if let Some(mut segments) = self.path_segments() {
62+
if segments.next_back() == Some("") {
6363
self.path_segments_mut()?.pop();
6464
}
6565
}

0 commit comments

Comments
 (0)