mirror of
https://github.com/tokio-rs/bytes.git
synced 2026-08-16 00:00:15 +02:00
Update iovec dependency (#179)
Update to match master version of IoVec (0.2.0?), using IoVec/IoVecMut instead of &IoVec and &mut IoVec.
This commit is contained in:
+3
-3
@@ -113,7 +113,7 @@ pub trait Buf {
|
||||
/// with `dst` being a zero length slice.
|
||||
///
|
||||
/// [`writev`]: http://man7.org/linux/man-pages/man2/readv.2.html
|
||||
fn bytes_vec<'a>(&'a self, dst: &mut [&'a IoVec]) -> usize {
|
||||
fn bytes_vec<'a>(&'a self, dst: &mut [IoVec<'a>]) -> usize {
|
||||
if dst.is_empty() {
|
||||
return 0;
|
||||
}
|
||||
@@ -662,7 +662,7 @@ impl<'a, T: Buf + ?Sized> Buf for &'a mut T {
|
||||
(**self).bytes()
|
||||
}
|
||||
|
||||
fn bytes_vec<'b>(&'b self, dst: &mut [&'b IoVec]) -> usize {
|
||||
fn bytes_vec<'b>(&'b self, dst: &mut [IoVec<'b>]) -> usize {
|
||||
(**self).bytes_vec(dst)
|
||||
}
|
||||
|
||||
@@ -680,7 +680,7 @@ impl<T: Buf + ?Sized> Buf for Box<T> {
|
||||
(**self).bytes()
|
||||
}
|
||||
|
||||
fn bytes_vec<'b>(&'b self, dst: &mut [&'b IoVec]) -> usize {
|
||||
fn bytes_vec<'b>(&'b self, dst: &mut [IoVec<'b>]) -> usize {
|
||||
(**self).bytes_vec(dst)
|
||||
}
|
||||
|
||||
|
||||
+4
-4
@@ -1,6 +1,6 @@
|
||||
use super::{IntoBuf, Writer};
|
||||
use byteorder::ByteOrder;
|
||||
use iovec::IoVec;
|
||||
use iovec::IoVecMut;
|
||||
|
||||
use std::{cmp, io, ptr, usize};
|
||||
|
||||
@@ -188,7 +188,7 @@ pub trait BufMut {
|
||||
/// with `dst` being a zero length slice.
|
||||
///
|
||||
/// [`readv`]: http://man7.org/linux/man-pages/man2/readv.2.html
|
||||
unsafe fn bytes_vec_mut<'a>(&'a mut self, dst: &mut [&'a mut IoVec]) -> usize {
|
||||
unsafe fn bytes_vec_mut<'a>(&'a mut self, dst: &mut [IoVecMut<'a>]) -> usize {
|
||||
if dst.is_empty() {
|
||||
return 0;
|
||||
}
|
||||
@@ -645,7 +645,7 @@ impl<'a, T: BufMut + ?Sized> BufMut for &'a mut T {
|
||||
(**self).bytes_mut()
|
||||
}
|
||||
|
||||
unsafe fn bytes_vec_mut<'b>(&'b mut self, dst: &mut [&'b mut IoVec]) -> usize {
|
||||
unsafe fn bytes_vec_mut<'b>(&'b mut self, dst: &mut [IoVecMut<'b>]) -> usize {
|
||||
(**self).bytes_vec_mut(dst)
|
||||
}
|
||||
|
||||
@@ -663,7 +663,7 @@ impl<T: BufMut + ?Sized> BufMut for Box<T> {
|
||||
(**self).bytes_mut()
|
||||
}
|
||||
|
||||
unsafe fn bytes_vec_mut<'b>(&'b mut self, dst: &mut [&'b mut IoVec]) -> usize {
|
||||
unsafe fn bytes_vec_mut<'b>(&'b mut self, dst: &mut [IoVecMut<'b>]) -> usize {
|
||||
(**self).bytes_vec_mut(dst)
|
||||
}
|
||||
|
||||
|
||||
+3
-3
@@ -1,5 +1,5 @@
|
||||
use {Buf, BufMut};
|
||||
use iovec::IoVec;
|
||||
use iovec::{IoVec, IoVecMut};
|
||||
|
||||
/// A `Chain` sequences two buffers.
|
||||
///
|
||||
@@ -177,7 +177,7 @@ impl<T, U> Buf for Chain<T, U>
|
||||
self.b.advance(cnt);
|
||||
}
|
||||
|
||||
fn bytes_vec<'a>(&'a self, dst: &mut [&'a IoVec]) -> usize {
|
||||
fn bytes_vec<'a>(&'a self, dst: &mut [IoVec<'a>]) -> usize {
|
||||
let mut n = self.a.bytes_vec(dst);
|
||||
n += self.b.bytes_vec(&mut dst[n..]);
|
||||
n
|
||||
@@ -218,7 +218,7 @@ impl<T, U> BufMut for Chain<T, U>
|
||||
self.b.advance_mut(cnt);
|
||||
}
|
||||
|
||||
unsafe fn bytes_vec_mut<'a>(&'a mut self, dst: &mut [&'a mut IoVec]) -> usize {
|
||||
unsafe fn bytes_vec_mut<'a>(&'a mut self, dst: &mut [IoVecMut<'a>]) -> usize {
|
||||
let mut n = self.a.bytes_vec_mut(dst);
|
||||
n += self.b.bytes_vec_mut(&mut dst[n..]);
|
||||
n
|
||||
|
||||
Reference in New Issue
Block a user