Skip to content

Commit e41cf30

Browse files
committed
ci, dev: update flake.lock, bump rust version
Signed-off-by: Élyse Viard <[email protected]>
1 parent afe570c commit e41cf30

File tree

8 files changed

+21
-24
lines changed

8 files changed

+21
-24
lines changed

editoast/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
##############
22
# Cargo chef #
33
##############
4-
FROM lukemathwalker/cargo-chef:0.1.68-rust-1.82-alpine3.20 AS chef
4+
FROM lukemathwalker/cargo-chef:0.1.68-rust-1.84-alpine3.20 AS chef
55
WORKDIR /editoast
66

77
#######################

editoast/editoast_osrdyne_client/src/mock_client.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ pub(crate) struct MockClient {
1010
}
1111

1212
impl MockClient {
13-
pub async fn get_workers_statuses<'a, T>(
13+
pub async fn get_workers_statuses<T>(
1414
&self,
1515
keys: &[T],
1616
) -> Result<HashMap<String, WorkerStatus>, crate::Error>

editoast/src/core/mocking.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ impl<'a> StubRequestBuilder<'a> {
213213
}
214214
}
215215

216-
impl<'a> StubResponseBuilder<'a> {
216+
impl StubResponseBuilder<'_> {
217217
/// Sets the body of the mocked response
218218
///
219219
/// If none is set, `AsCoreRequest::fetch` will return an `Err(CoreError::NoResponseContent)`

flake.lock

+14-14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gateway/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
##############
44
# Cargo chef #
55
##############
6-
FROM lukemathwalker/cargo-chef:0.1.68-rust-1.82-alpine3.20 AS chef
6+
FROM lukemathwalker/cargo-chef:0.1.68-rust-1.84-alpine3.20 AS chef
77
WORKDIR /gateway
88

99
#######################

gateway/actix_auth/src/request_auth.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ impl RequestAuthExt for actix_web::dev::ServiceResponse {
7070
}
7171
}
7272

73-
impl<'a> RequestAuthExt for actix_web::guard::GuardContext<'a> {
73+
impl RequestAuthExt for actix_web::guard::GuardContext<'_> {
7474
fn get_request_auth(&self) -> Option<RequestAuth> {
7575
RequestAuth::from_extensions(&self.req_data())
7676
}

osrdyne/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
##############
44
# Cargo chef #
55
##############
6-
FROM lukemathwalker/cargo-chef:0.1.68-rust-1.82-alpine3.20 AS chef
6+
FROM lukemathwalker/cargo-chef:0.1.68-rust-1.84-alpine3.20 AS chef
77
WORKDIR /osrdyne
88

99
#######################

osrdyne/src/target_tracker.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,7 @@ impl TargetTracker {
121121
if now < transition_time {
122122
return Some(status);
123123
}
124-
status = match new_status {
125-
Some(status) => status,
126-
None => return None,
127-
};
124+
status = new_status?;
128125
}
129126
}
130127

0 commit comments

Comments
 (0)