max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #530

Browse Source 
530: Do not use exported Result to mitigate problems with clap. r=Dirbaio a=matoushybl



Co-authored-by: Matous Hybl <hyblmatous@gmail.com>
This commit is contained in:
bors[bot] 2021-12-08 21:20:26 +00:00 committed by GitHub
commit 4f4b19d920
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/std/src/bin/net.rs
View File

@ -4,7 +4,10 @@ use clap::Parser;
use embassy::executor::{Executor, Spawner}; use embassy::executor::{Executor, Spawner};
use embassy::io::AsyncWriteExt; use embassy::io::AsyncWriteExt;
use embassy::util::Forever; use embassy::util::Forever;
use embassy_net::*; use embassy_net::{
Config, Configurator, DhcpConfigurator, Ipv4Address, Ipv4Cidr, StackResources,
StaticConfigurator, TcpSocket,
};
use heapless::Vec; use heapless::Vec;
use log::*; use log::*;

6
examples/std/src/tuntap.rs
View File

@ -141,10 +141,12 @@ impl TunTapDevice {
} }
use core::task::Waker; use core::task::Waker;
use embassy_net::{DeviceCapabilities, LinkState, Packet, PacketBox, PacketBoxExt, PacketBuf}; use embassy_net::{
Device, DeviceCapabilities, LinkState, Packet, PacketBox, PacketBoxExt, PacketBuf,
};
use std::task::Context; use std::task::Context;
impl crate::Device for TunTapDevice { impl Device for TunTapDevice {
fn is_transmit_ready(&mut self) -> bool { fn is_transmit_ready(&mut self) -> bool {
true true
} }