|
@@ -1,3 +1,4 @@
|
|
|
+#![allow(clippy::option_map_unit_fn)]
|
|
|
mod utils;
|
|
|
|
|
|
use std::collections::BTreeMap;
|
|
@@ -57,10 +58,10 @@ fn main() {
|
|
|
});
|
|
|
config.map(|config| {
|
|
|
println!("DHCP config: {:?}", config);
|
|
|
- match config.address {
|
|
|
- Some(cidr) => if cidr != prev_cidr {
|
|
|
+ if let Some(cidr) = config.address {
|
|
|
+ if cidr != prev_cidr {
|
|
|
iface.update_ip_addrs(|addrs| {
|
|
|
- addrs.iter_mut().nth(0)
|
|
|
+ addrs.iter_mut().next()
|
|
|
.map(|addr| {
|
|
|
*addr = IpCidr::Ipv4(cidr);
|
|
|
});
|
|
@@ -68,11 +69,10 @@ fn main() {
|
|
|
prev_cidr = cidr;
|
|
|
println!("Assigned a new IPv4 address: {}", cidr);
|
|
|
}
|
|
|
- _ => {}
|
|
|
}
|
|
|
|
|
|
config.router.map(|router| iface.routes_mut()
|
|
|
- .add_default_ipv4_route(router.into())
|
|
|
+ .add_default_ipv4_route(router)
|
|
|
.unwrap()
|
|
|
);
|
|
|
iface.routes_mut()
|