Merge pull request #1083 from HaoboGu/main

Bump `heapless` version to v0.9

Author: Dirbaio

Cargo.toml

@@ -2,7 +2,7 @@
 name = "smoltcp"
 version = "0.12.0"
 edition = "2021"
-rust-version = "1.81"
+rust-version = "1.87"
 authors = ["whitequark <whitequark@whitequark.org>"]
 description = "A TCP/IP stack designed for bare-metal, real-time systems without a heap."
 documentation = "https://docs.rs/smoltcp/"
@@ -27,7 +27,7 @@ libc = { version = "0.2.18", optional = true }
 bitflags = { version = "1.0", default-features = false }
 defmt = { version = "0.3.8", optional = true, features = ["ip_in_core"] }
 cfg-if = "1.0.0"
-heapless = "0.8"
+heapless = "0.9"
 
 [dev-dependencies]
 env_logger = "0.10"
@@ -43,7 +43,7 @@ idna = { version = "=1.0.1" }
 std = ["managed/std", "alloc"]
 alloc = ["managed/alloc", "defmt?/alloc"]
 verbose = []
-defmt = ["dep:defmt", "heapless/defmt-03"]
+defmt = ["dep:defmt", "heapless/defmt"]
 "medium-ethernet" = ["socket"]
 "medium-ip" = ["socket"]
 "medium-ieee802154" = ["socket", "proto-sixlowpan"]

README.md

@@ -12,7 +12,7 @@ include complicated compile-time computations, such as macro or type tricks, eve
 at cost of performance degradation.
 
 _smoltcp_ does not need heap allocation *at all*, is [extensively documented][docs],
-and compiles on stable Rust 1.81 and later.
+and compiles on stable Rust 1.87 and later.
 
 _smoltcp_ achieves [~Gbps of throughput](#examplesbenchmarkrs) when tested against
 the Linux TCP stack in loopback mode.

ci.sh

@@ -4,7 +4,7 @@ set -eox pipefail
 
 export DEFMT_LOG=trace
 
-MSRV="1.81.0"
+MSRV="1.87.0"
 
 RUSTC_VERSIONS=(
     $MSRV

src/iface/interface/ipv4.rs

@@ -126,10 +126,7 @@ impl InterfaceInner {
                 // NOTE: according to the standard, the total length needs to be
                 // recomputed, as well as the checksum. However, we don't really use
                 // the IPv4 header after the packet is reassembled.
-                match f.assemble() {
-                    Some(payload) => payload,
-                    None => return None,
-                }
+                f.assemble()?
             } else {
                 ipv4_packet.payload()
             }
@@ -198,7 +195,7 @@ impl InterfaceInner {
             if self
                 .routes
                 .lookup(&IpAddress::Ipv4(ipv4_repr.dst_addr), self.now)
-                .map_or(true, |router_addr| !self.has_ip_addr(router_addr))
+                .is_none_or(|router_addr| !self.has_ip_addr(router_addr))
             {
                 net_trace!("Rejecting IPv4 packet; no matching routes");
 

src/iface/interface/ipv6.rs

@@ -228,7 +228,7 @@ impl InterfaceInner {
             if self
                 .routes
                 .lookup(&IpAddress::Ipv6(ipv6_repr.dst_addr), self.now)
-                .map_or(true, |router_addr| !self.has_ip_addr(router_addr))
+                .is_none_or(|router_addr| !self.has_ip_addr(router_addr))
             {
                 net_trace!("Rejecting IPv6 packet; no matching routes");
 

src/iface/interface/sixlowpan.rs

@@ -68,10 +68,7 @@ impl InterfaceInner {
             }
             #[cfg(feature = "proto-sixlowpan-fragmentation")]
             SixlowpanPacket::FragmentHeader => {
-                match self.process_sixlowpan_fragment(ieee802154_repr, payload, f) {
-                    Some(payload) => payload,
-                    None => return None,
-                }
+                self.process_sixlowpan_fragment(ieee802154_repr, payload, f)?
             }
             SixlowpanPacket::IphcHeader => {
                 match Self::sixlowpan_to_ipv6(

src/lib.rs

@@ -65,7 +65,7 @@
 //!
 //! # Minimum Supported Rust Version (MSRV)
 //!
-//! This crate is guaranteed to compile on stable Rust 1.81 and up with any valid set of features.
+//! This crate is guaranteed to compile on stable Rust 1.87 and up with any valid set of features.
 //! It *might* compile on older versions but that may change in any new patch release.
 //!
 //! The exception is when using the `defmt` feature, in which case `defmt`'s MSRV applies, which

src/phy/sys/tuntap_interface.rs

@@ -18,10 +18,7 @@ impl AsRawFd for TunTapInterfaceDesc {
 impl TunTapInterfaceDesc {
     pub fn new(name: &str, medium: Medium) -> io::Result<TunTapInterfaceDesc> {
         let lower = unsafe {
-            let lower = libc::open(
-                "/dev/net/tun\0".as_ptr() as *const libc::c_char,
-                libc::O_RDWR | libc::O_NONBLOCK,
-            );
+            let lower = libc::open(c"/dev/net/tun".as_ptr(), libc::O_RDWR | libc::O_NONBLOCK);
             if lower == -1 {
                 return Err(io::Error::last_os_error());
             }

src/socket/dhcpv4.rs

@@ -743,7 +743,7 @@ impl<'a> Socket<'a> {
     ///
     /// The socket has an internal "configuration changed" flag. If
     /// set, this function returns the configuration and resets the flag.
-    pub fn poll(&mut self) -> Option<Event> {
+    pub fn poll(&mut self) -> Option<Event<'_>> {
         if !self.config_changed {
             None
         } else if let ClientState::Renewing(state) = &self.state {

src/socket/dns.rs

@@ -248,7 +248,7 @@ impl<'a> Socket<'a> {
 
         let mut mdns = MulticastDns::Disabled;
         #[cfg(feature = "socket-mdns")]
-        if name.split(|&c| c == b'.').last().unwrap() == b"local" {
+        if name.split(|&c| c == b'.').next_back().unwrap() == b"local" {
             net_trace!("Starting a mDNS query");
             mdns = MulticastDns::Enabled;
         }