nordic-dev.net/embassy
2
0
Fork 0
mirror of https://github.com/embassy-rs/embassy.git synced 2024-11-25 00:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: address some clippy issues

Browse Source 
Signed-off-by: Krzysztof Królczyk <Krzysztof.Krolczyk@o2.pl>
This commit is contained in:
Krzysztof Królczyk 2024-11-01 16:15:15 +01:00
parent af694d233c
commit 9634dfd6c1
No known key found for this signature in database
GPG Key ID: FDAE017682FDBEDC
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
embassy-net/src/lib.rs
View File

@ -33,14 +33,14 @@ pub use embassy_net_driver as driver;
use embassy_net_driver::{Driver, LinkState};
use embassy_sync::waitqueue::WakerRegistration;
use embassy_time::{Instant, Timer};
#[allow(unused_imports)]
use heapless::Vec;
#[cfg(feature = "dns")]
pub use smoltcp::config::DNS_MAX_SERVER_COUNT;
#[cfg(feature = "multicast")]
pub use smoltcp::iface::MulticastError;
#[allow(unused_imports)]
use smoltcp::iface::{Interface, SocketHandle, SocketSet, SocketStorage};
#[cfg(any(feature = "dns", feature = "dhcpv4"))]
use smoltcp::iface::SocketHandle;
use smoltcp::iface::{Interface, SocketSet, SocketStorage};
use smoltcp::phy::Medium;
#[cfg(feature = "dhcpv4")]
use smoltcp::socket::dhcpv4::{self, RetryConfig};
@ -379,11 +379,11 @@ fn to_smoltcp_hardware_address(addr: driver::HardwareAddress) -> (HardwareAddres
impl<'d> Stack<'d> {
fn with<R>(&self, f: impl FnOnce(&Inner) -> R) -> R {
f(&*self.inner.borrow())
f(&self.inner.borrow())
}
fn with_mut<R>(&self, f: impl FnOnce(&mut Inner) -> R) -> R {
f(&mut *self.inner.borrow_mut())
f(&mut self.inner.borrow_mut())
}
/// Get the hardware address of the network interface.
@ -642,7 +642,7 @@ impl<'d> Stack<'d> {
}
impl Inner {
#[allow(clippy::absurd_extreme_comparisons, dead_code)]
#[allow(clippy::absurd_extreme_comparisons)]
pub fn get_local_port(&mut self) -> u16 {
let res = self.next_local_port;
self.next_local_port = if res >= LOCAL_PORT_MAX { LOCAL_PORT_MIN } else { res + 1 };
@ -732,7 +732,7 @@ impl Inner {
debug!(" Default gateway: {:?}", config.gateway);
unwrap!(addrs.push(IpCidr::Ipv4(config.address)).ok());
gateway_v4 = config.gateway.into();
gateway_v4 = config.gateway;
#[cfg(feature = "dns")]
for s in &config.dns_servers {
debug!(" DNS server: {:?}", s);
@ -831,22 +831,19 @@ impl Inner {
self.state_waker.wake();
}
#[allow(unused_mut)]
let mut apply_config = false;
#[cfg(feature = "dhcpv4")]
if let Some(dhcp_handle) = self.dhcp_socket {
let socket = self.sockets.get_mut::<dhcpv4::Socket>(dhcp_handle);
if self.link_up {
let configure = if self.link_up {
if old_link_up != self.link_up {
socket.reset();
}
match socket.poll() {
None => {}
None => false,
Some(dhcpv4::Event::Deconfigured) => {
self.static_v4 = None;
apply_config = true;
true
}
Some(dhcpv4::Event::Configured(config)) => {
self.static_v4 = Some(StaticConfigV4 {
@ -854,20 +851,21 @@ impl Inner {
gateway: config.router,
dns_servers: config.dns_servers,
});
apply_config = true;
true
}
}
} else if old_link_up {
socket.reset();
self.static_v4 = None;
apply_config = true;
true
} else {
false
};
if configure {
self.apply_static_config()
}
}
if apply_config {
self.apply_static_config();
}
if let Some(poll_at) = self.iface.poll_at(timestamp, &mut self.sockets) {
let t = pin!(Timer::at(instant_from_smoltcp(poll_at)));
if t.poll(cx).is_ready() {

4
embassy-net/src/tcp.rs
View File

@ -186,7 +186,7 @@ impl<'a> TcpSocket<'a> {
});
Self {
io: TcpIo { stack: stack, handle },
io: TcpIo { stack, handle },
}
}
@ -806,7 +806,7 @@ pub mod client {
};
let remote_endpoint = (addr, remote.port());
let mut socket = TcpConnection::new(self.stack, self.state)?;
socket.socket.set_timeout(self.socket_timeout.clone());
socket.socket.set_timeout(self.socket_timeout);
socket
.socket
.connect(remote_endpoint)