aboutsummaryrefslogtreecommitdiff
path: root/embassy-net
diff options
context:
space:
mode:
authorDario Nieuwenhuis <[email protected]>2021-02-12 01:48:21 +0100
committerDario Nieuwenhuis <[email protected]>2021-02-12 01:48:21 +0100
commit7d3878466cfecde17f5e707d65503435394f7ae5 (patch)
treedbf205bd4c2d7c71e95f51c11d7fe13e403d61b4 /embassy-net
parenta7d1d02be022b6dd1e5170780b509057f150ca9d (diff)
reexport smoltcp error/result
Diffstat (limited to 'embassy-net')
-rw-r--r--embassy-net/src/device.rs2
-rw-r--r--embassy-net/src/lib.rs1
-rw-r--r--embassy-net/src/tcp_socket.rs2
3 files changed, 3 insertions, 2 deletions
diff --git a/embassy-net/src/device.rs b/embassy-net/src/device.rs
index 95a62e792..ea23635c7 100644
--- a/embassy-net/src/device.rs
+++ b/embassy-net/src/device.rs
@@ -2,10 +2,10 @@ use core::task::{Poll, Waker};
2use smoltcp::phy::Device as SmolDevice; 2use smoltcp::phy::Device as SmolDevice;
3use smoltcp::phy::DeviceCapabilities; 3use smoltcp::phy::DeviceCapabilities;
4use smoltcp::time::Instant as SmolInstant; 4use smoltcp::time::Instant as SmolInstant;
5use smoltcp::Result;
6 5
7use crate::fmt::*; 6use crate::fmt::*;
8use crate::{Packet, PacketBox, PacketBuf}; 7use crate::{Packet, PacketBox, PacketBuf};
8use crate::Result;
9 9
10#[derive(PartialEq, Eq, Clone, Copy)] 10#[derive(PartialEq, Eq, Clone, Copy)]
11pub enum LinkState { 11pub enum LinkState {
diff --git a/embassy-net/src/lib.rs b/embassy-net/src/lib.rs
index fe1d529d8..de2f2ea74 100644
--- a/embassy-net/src/lib.rs
+++ b/embassy-net/src/lib.rs
@@ -28,3 +28,4 @@ pub use smoltcp::time::Instant as SmolInstant;
28pub use smoltcp::wire::{IpAddress, IpCidr, Ipv4Address, Ipv4Cidr}; 28pub use smoltcp::wire::{IpAddress, IpCidr, Ipv4Address, Ipv4Cidr};
29pub type Interface = smoltcp::iface::Interface<'static, device::DeviceAdapter>; 29pub type Interface = smoltcp::iface::Interface<'static, device::DeviceAdapter>;
30pub type SocketSet = smoltcp::socket::SocketSet<'static>; 30pub type SocketSet = smoltcp::socket::SocketSet<'static>;
31pub use smoltcp::{Error, Result}; \ No newline at end of file
diff --git a/embassy-net/src/tcp_socket.rs b/embassy-net/src/tcp_socket.rs
index eab8189de..84f096525 100644
--- a/embassy-net/src/tcp_socket.rs
+++ b/embassy-net/src/tcp_socket.rs
@@ -9,10 +9,10 @@ use smoltcp::socket::TcpSocket as SyncTcpSocket;
9use smoltcp::socket::{TcpSocketBuffer, TcpState}; 9use smoltcp::socket::{TcpSocketBuffer, TcpState};
10use smoltcp::time::Duration; 10use smoltcp::time::Duration;
11use smoltcp::wire::IpEndpoint; 11use smoltcp::wire::IpEndpoint;
12use smoltcp::{Error, Result};
13 12
14use super::stack::Stack; 13use super::stack::Stack;
15use crate::fmt::*; 14use crate::fmt::*;
15use crate::{Error, Result};
16 16
17pub struct TcpSocket<'a> { 17pub struct TcpSocket<'a> {
18 handle: SocketHandle, 18 handle: SocketHandle,