Skip to content

Commit da13f32

Browse files
authored
ci: Pin to older docker version (#2639)
1 parent 5f323b7 commit da13f32

File tree

20 files changed

+37
-60
lines changed

20 files changed

+37
-60
lines changed

.github/workflows/qns.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ jobs:
127127
name: s2n-quic-qns-release
128128
path: s2n-quic-qns/
129129

130+
- uses: docker/setup-docker-action@v4
131+
with:
132+
version: version=v26.1.3
133+
130134
- name: Setup dockerfile
131135
working-directory: s2n-quic-qns
132136
run: |

dc/s2n-quic-dc/src/path/secret/receiver/tests.rs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -206,22 +206,13 @@ fn check_delayed_inner(seed: u64, delay: u16) {
206206
}
207207
}
208208

209+
#[derive(Default)]
209210
struct Model {
210211
insert_order: Vec<u64>,
211212
oracle: HashSet<u64>,
212213
subject: State,
213214
}
214215

215-
impl Default for Model {
216-
fn default() -> Self {
217-
Self {
218-
oracle: Default::default(),
219-
insert_order: Vec::new(),
220-
subject: State::new(),
221-
}
222-
}
223-
}
224-
225216
impl Model {
226217
fn insert(&mut self, op: u64) {
227218
let pid = Id::from([0; 16]);

dc/s2n-quic-dc/src/stream/client/rpc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ where
4444
let storage = response.provide_storage().await?;
4545

4646
if !storage.has_remaining_capacity() {
47-
return Err(io::Error::new(io::ErrorKind::Other, "the provided response buffer failed to provide enough capacity for the peer's response"));
47+
return Err(io::Error::other( "the provided response buffer failed to provide enough capacity for the peer's response"));
4848
}
4949

5050
let len = reader.read_into(storage).await?;

dc/s2n-quic-dc/src/stream/environment/udp.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,7 @@ where
119119
remote_addr = v4.to_ipv6_mapped().with_port(remote_addr.port()).into();
120120
}
121121
(IpAddress::Ipv6(_), IpAddress::Ipv4(_)) => {
122-
return Err(std::io::Error::new(
123-
std::io::ErrorKind::Other,
124-
"IPv6 not supported on a IPv4 socket",
125-
))
122+
return Err(std::io::Error::other("IPv6 not supported on a IPv4 socket"))
126123
}
127124
(IpAddress::Ipv6(_), IpAddress::Ipv6(_)) => {}
128125
}

dc/s2n-quic-dc/src/stream/pacer.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ impl Naive {
2525

2626
// record the time that we yielded
2727
let now = clock.get_time();
28-
let prev_yield_window = core::mem::replace(
29-
&mut self.yield_window,
30-
Some(now + core::time::Duration::from_millis(1)),
31-
);
28+
let prev_yield_window = self
29+
.yield_window
30+
.replace(now + core::time::Duration::from_millis(1));
3231

3332
// if the current time falls outside of the previous window then don't actually yield - the
3433
// application isn't sending at that rate

dc/s2n-quic-dc/src/stream/recv/shared.rs

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,10 @@ impl State {
143143
// increment the epoch at which we acquired the guard
144144
self.application_epoch.fetch_add(1, Ordering::AcqRel);
145145

146-
let inner = self.inner.lock().map_err(|_| {
147-
io::Error::new(io::ErrorKind::Other, "shared recv state has been poisoned")
148-
})?;
146+
let inner = self
147+
.inner
148+
.lock()
149+
.map_err(|_| io::Error::other("shared recv state has been poisoned"))?;
149150

150151
let initial_state = inner.receiver.state().clone();
151152

@@ -197,10 +198,7 @@ impl State {
197198
match self.inner.try_lock() {
198199
Ok(lock) => Ok(Some(lock)),
199200
Err(std::sync::TryLockError::WouldBlock) => Ok(None),
200-
Err(_) => Err(io::Error::new(
201-
io::ErrorKind::Other,
202-
"shared recv state has been poisoned",
203-
)),
201+
Err(_) => Err(io::Error::other("shared recv state has been poisoned")),
204202
}
205203
}
206204
}

dc/s2n-quic-dc/src/stream/server/tokio/tcp/manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ where
191191
.push_back(&mut self.inner.workers, idx);
192192

193193
// kick off the initial poll to register wakers with the socket
194-
self.inner.poll_worker(idx, cx, publisher, clock);
194+
let _ = self.inner.poll_worker(idx, cx, publisher, clock);
195195

196196
true
197197
}

dc/s2n-quic-dc/src/stream/server/tokio/tcp/manager/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ impl Default for Harness {
150150

151151
impl Harness {
152152
pub fn poll(&mut self) {
153-
self.manager.poll(
153+
let _ = self.manager.poll(
154154
&mut (),
155155
&publisher(&self.subscriber, &self.clock),
156156
&self.clock,

dc/s2n-quic-dc/src/stream/server/tokio/tcp/worker.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ where
116116

117117
let prev_queue_time = core::mem::replace(&mut self.queue_time, now);
118118
let prev_state = core::mem::replace(&mut self.state, WorkerState::Init);
119-
let prev_stream = core::mem::replace(&mut self.stream, Some((stream, remote_address)));
120-
let prev_ctx = core::mem::replace(&mut self.subscriber_ctx, Some(subscriber_ctx));
119+
let prev_stream = self.stream.replace((stream, remote_address));
120+
let prev_ctx = self.subscriber_ctx.replace(subscriber_ctx);
121121

122122
if let Some(remote_address) = prev_stream.map(|(socket, remote_address)| {
123123
// If linger wasn't already set or it was set to a value other than 0, then override it

quic/s2n-quic-core/src/packet/number/sliding_window.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,7 @@ impl SlidingWindow {
186186
// Our mask is the full window since it's all getting evicted.
187187
!removed
188188
};
189-
if let Some(prev_right_edge) =
190-
core::mem::replace(&mut self.right_edge, Some(packet_number))
191-
{
189+
if let Some(prev_right_edge) = self.right_edge.replace(packet_number) {
192190
Ok(EvictedSet {
193191
window: removed,
194192
right_edge: prev_right_edge,

0 commit comments

Comments
 (0)