Increase MSRV to 1.88 (#840)

This enables the use of let chains.

Author: philipc

.github/workflows/rust.yml

@@ -44,7 +44,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Install rust
-      uses: dtolnay/rust-toolchain@1.85.0
+      uses: dtolnay/rust-toolchain@1.88.0
     - name: Build
       run: cargo build --verbose -p gimli
     - name: Test

Cargo.toml

@@ -17,7 +17,7 @@ keywords = ["DWARF", "debug", "ELF", "eh_frame"]
 license = "MIT OR Apache-2.0"
 readme = "./README.md"
 repository = "https://github.com/gimli-rs/gimli"
-rust-version = "1.85"
+rust-version = "1.88"
 
 [dependencies]
 fallible-iterator = { version = "0.3.0", default-features = false, optional = true }

README.md

@@ -31,7 +31,7 @@ To add a `gimli` dependency to your `Cargo.toml`, run:
 $ cargo add gimli
 ```
 
-The minimum supported Rust version is 1.85.
+The minimum supported Rust version is 1.88.
 
 ## Documentation
 

clippy.toml

@@ -1 +1 @@
-msrv = "1.85.0"
+msrv = "1.88.0"

src/read/dwarf.rs

@@ -1295,10 +1295,10 @@ impl<R: Reader> Unit<R> {
                         }
                     }
                     constants::DW_AT_GNU_dwo_id => {
-                        if unit.dwo_id.is_none() {
-                            if let AttributeValue::DwoId(dwo_id) = attr.value() {
-                                unit.dwo_id = Some(dwo_id);
-                            }
+                        if unit.dwo_id.is_none()
+                            && let AttributeValue::DwoId(dwo_id) = attr.value()
+                        {
+                            unit.dwo_id = Some(dwo_id);
                         }
                     }
                     _ => {}
@@ -1323,10 +1323,10 @@ impl<R: Reader> Unit<R> {
             )?),
             None => None,
         };
-        if let Some(low_pc_attr) = low_pc_attr {
-            if let Some(addr) = dwarf.attr_address(&unit, low_pc_attr)? {
-                unit.low_pc = addr;
-            }
+        if let Some(low_pc_attr) = low_pc_attr
+            && let Some(addr) = dwarf.attr_address(&unit, low_pc_attr)?
+        {
+            unit.low_pc = addr;
         }
         Ok(unit)
     }

src/read/line.rs

@@ -1706,10 +1706,10 @@ fn parse_file_v5<R: Reader>(
                 }
             }
             constants::DW_LNCT_MD5 => {
-                if let AttributeValue::Block(mut value) = value {
-                    if value.len().into_u64() == 16 {
-                        md5 = value.read_u8_array()?;
-                    }
+                if let AttributeValue::Block(mut value) = value
+                    && value.len().into_u64() == 16
+                {
+                    md5 = value.read_u8_array()?;
                 }
             }
             constants::DW_LNCT_LLVM_source => {

src/read/lookup.rs

@@ -94,16 +94,16 @@ where
     /// Can be [used with `FallibleIterator`](./index.html#using-with-fallibleiterator).
     pub fn next(&mut self) -> Result<Option<Parser::Entry>> {
         loop {
-            if let Some((ref mut input, ref header)) = self.current_set {
-                if !input.is_empty() {
-                    match Parser::parse_entry(input, header) {
-                        Ok(Some(entry)) => return Ok(Some(entry)),
-                        Ok(None) => {}
-                        Err(e) => {
-                            input.empty();
-                            self.remaining_input.empty();
-                            return Err(e);
-                        }
+            if let Some((ref mut input, ref header)) = self.current_set
+                && !input.is_empty()
+            {
+                match Parser::parse_entry(input, header) {
+                    Ok(Some(entry)) => return Ok(Some(entry)),
+                    Ok(None) => {}
+                    Err(e) => {
+                        input.empty();
+                        self.remaining_input.empty();
+                        return Err(e);
                     }
                 }
             }

src/read/op.rs

@@ -1955,10 +1955,10 @@ impl<R: Reader, S: EvaluationStorage<R>> Evaluation<R, S> {
     fn evaluate_internal(&mut self) -> Result<EvaluationResult<R>> {
         while !self.end_of_expression() {
             self.iteration += 1;
-            if let Some(max_iterations) = self.max_iterations {
-                if self.iteration > max_iterations {
-                    return Err(Error::TooManyIterations);
-                }
+            if let Some(max_iterations) = self.max_iterations
+                && self.iteration > max_iterations
+            {
+                return Err(Error::TooManyIterations);
             }
 
             let op_result = self.evaluate_one_operation()?;

src/read/unit.rs

@@ -1006,12 +1006,11 @@ where
     /// next sibling. Returns `None` if the attribute is missing or invalid.
     fn sibling(&self) -> Option<R> {
         let attr = self.attr_value(constants::DW_AT_sibling);
-        if let Ok(Some(AttributeValue::UnitRef(offset))) = attr {
-            if offset.0 > self.offset.0 {
-                if let Ok(input) = self.unit.range_from(offset..) {
-                    return Some(input);
-                }
-            }
+        if let Ok(Some(AttributeValue::UnitRef(offset))) = attr
+            && offset.0 > self.offset.0
+            && let Ok(input) = self.unit.range_from(offset..)
+        {
+            return Some(input);
         }
         None
     }
@@ -1935,22 +1934,12 @@ where
 {
     /// Try to convert this attribute's value to a u8.
     pub fn u8_value(&self) -> Option<u8> {
-        if let Some(value) = self.udata_value() {
-            if value <= u64::from(u8::MAX) {
-                return Some(value as u8);
-            }
-        }
-        None
+        self.udata_value().and_then(|val| u8::try_from(val).ok())
     }
 
     /// Try to convert this attribute's value to a u16.
     pub fn u16_value(&self) -> Option<u16> {
-        if let Some(value) = self.udata_value() {
-            if value <= u64::from(u16::MAX) {
-                return Some(value as u16);
-            }
-        }
-        None
+        self.udata_value().and_then(|val| u16::try_from(val).ok())
     }
 
     /// Try to convert this attribute's value to an unsigned integer.

src/write/unit.rs

@@ -2577,10 +2577,10 @@ pub(crate) mod convert {
                     self.parents.pop();
                 }
 
-                if let Some(id) = id {
-                    if abbrev.has_children() {
-                        self.parents.push((depth, id));
-                    }
+                if let Some(id) = id
+                    && abbrev.has_children()
+                {
+                    self.parents.push((depth, id));
                 }
 
                 let mut entry = ConvertUnitEntry {