Update rustfmt.toml to current edition and format

I think we were previously using an invalid value (note difference in
capitalisation) for the `use_small_heuristics` value. This should fix that.

Author: IsaacWoods

acpi/src/mcfg.rs

@@ -1,4 +1,7 @@
-use crate::{sdt::{SdtHeader, Signature}, AcpiTable};
+use crate::{
+    sdt::{SdtHeader, Signature},
+    AcpiTable,
+};
 use core::{mem, slice};
 
 /// Describes a set of regions of physical memory used to access the PCIe configuration space. A
@@ -58,8 +61,6 @@ where
     }
 }
 
-
-
 /// Configuration entry describing a valid bus range for the given PCI segment group.
 pub struct PciConfigEntry {
     pub segment_group: u16,
@@ -104,7 +105,6 @@ unsafe impl AcpiTable for Mcfg {
     }
 }
 
-
 impl Mcfg {
     /// Returns a slice containing each of the entries in the MCFG table. Where possible, `PlatformInfo.interrupt_model` should
     /// be enumerated instead.

aml/src/namespace.rs

@@ -163,13 +163,13 @@ impl Namespace {
         &mut self,
         path: AmlName,
         scope: &AmlName,
-        target: AmlName
+        target: AmlName,
     ) -> Result<AmlHandle, AmlError> {
         let path = path.resolve(scope)?;
         let target = target.resolve(scope)?;
 
         let handle = self.get_handle(&target)?;
-        
+
         let (level, last_seg) = self.get_level_for_path_mut(&path)?;
         match level.values.insert(last_seg, handle) {
             None => Ok(handle),
@@ -748,20 +748,20 @@ mod tests {
 
         assert_eq!(namespace.add_level((AmlName::from_str("\\FOO")).unwrap(), LevelType::Scope), Ok(()));
 
-        assert!(
-            namespace.add_value_at_resolved_path(
-            AmlName::from_str("BAR").unwrap(),
-            &AmlName::from_str("\\FOO").unwrap(),
-            AmlValue::Integer(100))
-            .is_ok()
-        );
-        assert!(
-            namespace.add_alias_at_resolved_path(
+        assert!(namespace
+            .add_value_at_resolved_path(
+                AmlName::from_str("BAR").unwrap(),
+                &AmlName::from_str("\\FOO").unwrap(),
+                AmlValue::Integer(100)
+            )
+            .is_ok());
+        assert!(namespace
+            .add_alias_at_resolved_path(
                 AmlName::from_str("BARA").unwrap(),
                 &AmlName::from_str("\\FOO").unwrap(),
-                AmlName::from_str("BAR").unwrap())
-                .is_ok()
-        );
+                AmlName::from_str("BAR").unwrap()
+            )
+            .is_ok());
         assert!(namespace.get_by_path(&AmlName::from_str("\\FOO.BARA").unwrap()).is_ok());
         assert_eq!(
             namespace.get_handle(&AmlName::from_str("\\FOO.BARA").unwrap()),

aml/src/term_object.rs

@@ -868,7 +868,7 @@ where
                 if let Ok((_name, _handle)) = handle {
                     match target {
                         Target::Null => { /* just return the result of the check */ }
-                        _ => {return (Err(Propagate::Err(AmlError::Unimplemented)), context) },
+                        _ => return (Err(Propagate::Err(AmlError::Unimplemented)), context),
                     }
                 }
                 (Ok(result), context)

rustfmt.toml

@@ -1,10 +1,10 @@
 unstable_features = true
-edition = "2018"
+edition = "2021"
 
 imports_granularity='Crate'
 imports_layout = "HorizontalVertical"
 use_field_init_shorthand = true
 use_try_shorthand = true
 format_code_in_doc_comments = true
 max_width = 115
-use_small_heuristics = "max"
+use_small_heuristics = "Max"