M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

libio: read/write traits from libio not core_io

Browse Source
This commit is contained in:
mwojcik 2021-08-26 14:59:04 +02:00
parent 10cbea72a2
commit cb3f0a404c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libio/cursor.rs
View File

@ -1,4 +1,4 @@
use {Read, Write}; use ::{Read, Write};
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct Cursor<T> { pub struct Cursor<T> {
@ -50,7 +50,7 @@ impl<T: AsRef<[u8]>> Read for Cursor<T> {
} }
} }
impl<'a> Write for Cursor<&'a mut [u8]> { impl Write for Cursor<&mut [u8]> {
type WriteError = !; type WriteError = !;
type FlushError = !; type FlushError = !;

6
src/libio/proto.rs
View File

@ -3,7 +3,7 @@ use byteorder::{ByteOrder, NativeEndian};
use alloc::vec; use alloc::vec;
use alloc::string::String; use alloc::string::String;
use core_io::{Read, Write, Error as IoError}; use ::{Read, Write, Error as IoError};
#[allow(dead_code)] #[allow(dead_code)]
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
@ -142,7 +142,7 @@ pub trait ProtoWrite {
} }
impl<T> ProtoRead for T where T: Read + ?Sized { impl<T> ProtoRead for T where T: Read + ?Sized {
type ReadError = IoError; type ReadError = IoError<T::ReadError>;
fn read_exact(&mut self, buf: &mut [u8]) -> Result<(), Self::ReadError> { fn read_exact(&mut self, buf: &mut [u8]) -> Result<(), Self::ReadError> {
T::read_exact(self, buf) T::read_exact(self, buf)
@ -150,7 +150,7 @@ impl<T> ProtoRead for T where T: Read + ?Sized {
} }
impl<T> ProtoWrite for T where T: Write + ?Sized { impl<T> ProtoWrite for T where T: Write + ?Sized {
type WriteError = IoError; type WriteError = IoError<T::WriteError>;
fn write_all(&mut self, buf: &[u8]) -> Result<(), Self::WriteError> { fn write_all(&mut self, buf: &[u8]) -> Result<(), Self::WriteError> {
T::write_all(self, buf) T::write_all(self, buf)