coverage. Improve code style

Author: Lambdaris

src/tools/compiletest/src/runtest.rs

@@ -277,19 +277,11 @@ impl<'test> TestCx<'test> {
             Ui | MirOpt => false,
             mode => panic!("unimplemented for mode {:?}", mode),
         };
-        if test_should_run {
-            self.run_if_enabled()
-        } else {
-            WillExecute::No
-        }
+        if test_should_run { self.run_if_enabled() } else { WillExecute::No }
     }
 
     fn run_if_enabled(&self) -> WillExecute {
-        if self.config.run_enabled() {
-            WillExecute::Yes
-        } else {
-            WillExecute::Disabled
-        }
+        if self.config.run_enabled() { WillExecute::Yes } else { WillExecute::Disabled }
     }
 
     fn should_run_successfully(&self, pm: Option<PassMode>) -> bool {
@@ -2742,11 +2734,7 @@ impl<'test> TestCx<'test> {
     /// The revision, ignored for incremental compilation since it wants all revisions in
     /// the same directory.
     fn safe_revision(&self) -> Option<&str> {
-        if self.config.mode == Incremental {
-            None
-        } else {
-            self.revision
-        }
+        if self.config.mode == Incremental { None } else { self.revision }
     }
 
     /// Gets the absolute path to the directory where all output for the given
@@ -2969,11 +2957,7 @@ impl<'test> TestCx<'test> {
 
     fn charset() -> &'static str {
         // FreeBSD 10.1 defaults to GDB 6.1.1 which doesn't support "auto" charset
-        if cfg!(target_os = "freebsd") {
-            "ISO-8859-1"
-        } else {
-            "UTF-8"
-        }
+        if cfg!(target_os = "freebsd") { "ISO-8859-1" } else { "UTF-8" }
     }
 
     fn run_rustdoc_test(&self) {
@@ -4775,11 +4759,7 @@ impl<'test> TestCx<'test> {
         for output_file in files {
             println!("Actual {} saved to {}", kind, output_file.display());
         }
-        if self.config.bless {
-            0
-        } else {
-            1
-        }
+        if self.config.bless { 0 } else { 1 }
     }
 
     fn check_and_prune_duplicate_outputs(

src/tools/coverage-dump/src/covfun.rs

@@ -75,8 +75,6 @@ pub(crate) fn dump_covfun_mappings(
                         println!("    true  = {}", expression_resolver.format_term(r#true));
                         println!("    false = {}", expression_resolver.format_term(r#false));
                     }
-
-                    MappingKind::MCDCDecision { .. } => {}
                     _ => (),
                 }
             }
@@ -162,29 +160,30 @@ impl<'a> Parser<'a> {
             match high {
                 0 => unreachable!("zero kind should have already been handled as a code mapping"),
                 2 => Ok(MappingKind::Skip),
-                4 | 6 => {
+                4 => {
                     let r#true = self.read_simple_term()?;
                     let r#false = self.read_simple_term()?;
-                    if high == 6 {
-                        let condition_id = self.read_uleb128_u32()?;
-                        let true_next_id = self.read_uleb128_u32()?;
-                        let false_next_id = self.read_uleb128_u32()?;
-                        Ok(MappingKind::MCDCBranch {
-                            r#true,
-                            r#false,
-                            condition_id,
-                            true_next_id,
-                            false_next_id,
-                        })
-                    } else {
-                        Ok(MappingKind::Branch { r#true, r#false })
-                    }
+                    Ok(MappingKind::Branch { r#true, r#false })
                 }
                 5 => {
                     let bitmap_idx = self.read_uleb128_u32()?;
                     let conditions_num = self.read_uleb128_u32()?;
                     Ok(MappingKind::MCDCDecision { bitmap_idx, conditions_num })
                 }
+                6 => {
+                    let r#true = self.read_simple_term()?;
+                    let r#false = self.read_simple_term()?;
+                    let condition_id = self.read_uleb128_u32()?;
+                    let true_next_id = self.read_uleb128_u32()?;
+                    let false_next_id = self.read_uleb128_u32()?;
+                    Ok(MappingKind::MCDCBranch {
+                        r#true,
+                        r#false,
+                        condition_id,
+                        true_next_id,
+                        false_next_id,
+                    })
+                }
 
                 _ => Err(anyhow!("unknown mapping kind: {raw_mapping_kind:#x}")),
             }