Skip to content

Commit

Permalink
Update to [email protected]
Browse files Browse the repository at this point in the history
  • Loading branch information
ryankurte committed Feb 14, 2022
1 parent 3e4e505 commit e3e2350
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ version = "0.10.1"
all-features = true

[features]
std = [ "log" ]
std = [ ]
nonblocking = [ ]
mock = [ "embedded-hal-mock" ]
helpers = [ "structopt", "humantime", "std", "pcap-file", "libc", "byteorder", "rolling-stats" ]
default = []

[dependencies]
embedded-hal = "=1.0.0-alpha.6"
embedded-hal = "1.0.0-alpha.7"
nb = "1.0.0"

log = { version = "0.4.14", optional = true, default_features = false }
Expand Down
2 changes: 1 addition & 1 deletion src/blocking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use core::time::Duration;

use embedded_hal::delay::blocking::DelayUs;

#[cfg(feature = "log")]
#[cfg(not(feature = "defmt"))]
use log::debug;

#[cfg(feature = "defmt")]
Expand Down
5 changes: 4 additions & 1 deletion src/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,10 @@ pub fn do_echo<T, I, E>(
options: EchoOptions,
) -> Result<usize, BlockingError<E>>
where
T: Receive<Info = I, Error = E> + Transmit<Error = E> + Power<Error = E> + DelayUs<Error = E>,
T: Receive<Info = I, Error = E>
+ Transmit<Error = E>
+ Power<Error = E>
+ DelayUs<Error = E>,
I: ReceiveInfo + std::fmt::Debug,
E: std::fmt::Debug,
{
Expand Down
3 changes: 2 additions & 1 deletion src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ use std::convert::Infallible;
use std::fmt::Debug;
use std::vec::Vec;

use log::{debug};

use embedded_hal::delay::blocking::DelayUs;

extern crate embedded_hal_mock;
use embedded_hal_mock::common::Generic;

use crate::{
Expand Down

0 comments on commit e3e2350

Please sign in to comment.