diff --git a/src/libboard_artiq/Cargo.toml b/src/libboard_artiq/Cargo.toml index ddc5bbde..b201deb8 100644 --- a/src/libboard_artiq/Cargo.toml +++ b/src/libboard_artiq/Cargo.toml @@ -12,6 +12,7 @@ build_zynq = { path = "../libbuild_zynq" } [dependencies] log = "0.4" log_buffer = { version = "1.2" } +crc = { version = "1.7", default-features = false } io = { path = "../libio", features = ["byteorder"] } libboard_zynq = { git = "https://git.m-labs.hk/M-Labs/zynq-rs.git"} diff --git a/src/libboard_artiq/src/drtioaux.rs b/src/libboard_artiq/src/drtioaux.rs index d43f6921..576973c4 100644 --- a/src/libboard_artiq/src/drtioaux.rs +++ b/src/libboard_artiq/src/drtioaux.rs @@ -2,7 +2,7 @@ use core::slice; use crc; -use io::{ProtoRead, ProtoWrite, Cursor, Error as IoError}; +use io::{proto::ProtoRead, proto::ProtoWrite, Cursor, Error as IoError}; use mem::mem::DRTIOAUX_MEM; use pl::csr::DRTIOAUX; use drtioaux_proto::Error as ProtocolError; diff --git a/src/libboard_artiq/src/drtioaux_proto.rs b/src/libboard_artiq/src/drtioaux_proto.rs index 9dba05ce..e6ad5820 100644 --- a/src/libboard_artiq/src/drtioaux_proto.rs +++ b/src/libboard_artiq/src/drtioaux_proto.rs @@ -1,4 +1,4 @@ -use io::{Read, ProtoRead, Write, ProtoWrite, Error as IoError}; +use io::{Read, proto::ProtoRead, Write, proto::ProtoWrite, Error as IoError}; #[derive(Debug)] pub enum Error { @@ -58,7 +58,7 @@ pub enum Packet { impl Packet { pub fn read_from(reader: &mut R) -> Result> - where R: Read + ?Sized + where R: io::Read + ?Sized { Ok(match reader.read_u8()? { 0x00 => Packet::EchoRequest, diff --git a/src/libboard_artiq/src/lib.rs b/src/libboard_artiq/src/lib.rs index c9217afb..ebb4d3e1 100644 --- a/src/libboard_artiq/src/lib.rs +++ b/src/libboard_artiq/src/lib.rs @@ -3,8 +3,6 @@ extern crate log; extern crate crc; -extern crate failure; -extern crate failure_derive; extern crate libboard_zynq; extern crate libconfig; extern crate libcortex_a9;