Skip to content

Commit 527930a

Browse files
committed
update bytes to 1.11.1
1 parent d2541a8 commit 527930a

3 files changed

Lines changed: 17 additions & 20 deletions

File tree

Cargo.lock

Lines changed: 3 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

corcovado/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ windows = { version = "0.42.0", features = [
4747
[dev-dependencies]
4848
env_logger = { version = "0.4.0", default-features = false }
4949
tempdir = "0.3.7"
50-
bytes = "0.3.0"
50+
bytes = "1.11.1"
5151
criterion = { workspace = true }
5252

5353
[[test]]

corcovado/test/mod.rs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,30 @@ mod test_write_then_drop;
3434
#[cfg(target_os = "fuchsia")]
3535
mod test_fuchsia_handles;
3636

37-
use bytes::{Buf, MutBuf};
37+
use bytes::{Buf, BufMut, BytesMut};
3838
use corcovado::event::Event;
3939
use corcovado::{Events, Poll};
4040
use std::io::{self, Read, Write};
4141
use std::time::Duration;
4242

4343
pub trait TryRead {
44-
fn try_read_buf<B: MutBuf>(&mut self, buf: &mut B) -> io::Result<Option<usize>>
44+
fn try_read_buf(&mut self, buf: &mut BytesMut) -> io::Result<Option<usize>>
4545
where
4646
Self: Sized,
4747
{
48-
// Reads the length of the slice supplied by buf.mut_bytes into the buffer
49-
// This is not guaranteed to consume an entire datagram or segment.
50-
// If your protocol is msg based (instead of continuous stream) you should
51-
// ensure that your buffer is large enough to hold an entire segment (1532 bytes if not jumbo
52-
// frames)
53-
let res = self.try_read(unsafe { buf.mut_bytes() });
48+
let remaining = buf.capacity() - buf.len();
49+
if remaining == 0 {
50+
return Ok(Some(0));
51+
}
52+
buf.reserve(remaining);
53+
let dst = buf.chunk_mut();
54+
let dst_slice =
55+
unsafe { std::slice::from_raw_parts_mut(dst.as_mut_ptr(), dst.len()) };
56+
let res = self.try_read(dst_slice);
5457

5558
if let Ok(Some(cnt)) = res {
5659
unsafe {
57-
buf.advance(cnt);
60+
buf.advance_mut(cnt);
5861
}
5962
}
6063

@@ -69,7 +72,7 @@ pub trait TryWrite {
6972
where
7073
Self: Sized,
7174
{
72-
let res = self.try_write(buf.bytes());
75+
let res = self.try_write(buf.chunk());
7376

7477
if let Ok(Some(cnt)) = res {
7578
buf.advance(cnt);

0 commit comments

Comments
 (0)