Bladeren bron

Fix fmt check on Travis

Isaac Woods 6 jaren geleden
bovenliggende
commit
6a9ff8c98d
3 gewijzigde bestanden met toevoegingen van 12 en 6 verwijderingen
  1. 2 0
      .gitignore
  2. 1 1
      .travis.yml
  3. 9 5
      src/rsdp.rs

+ 2 - 0
.gitignore

@@ -1,3 +1,5 @@
 /target
 **/*.rs.bk
 Cargo.lock
+/example_os/target
+/example_os/build

+ 1 - 1
.travis.yml

@@ -24,7 +24,7 @@ before_script:
   - rustup component add rustfmt-preview
 
 script:
-  - cargo fmt --all -- --write-mode=check
+  - cargo fmt --all -- --check
   - cargo build
   - cargo test
 

+ 9 - 5
src/rsdp.rs

@@ -49,7 +49,8 @@ impl Rsdp {
 
         // Check the fields present in all versions against `checksum`
         let mut sum: usize = 0;
-        sum += self.signature
+        sum += self
+            .signature
             .iter()
             .map(|&b| usize::from(b))
             .sum::<usize>();
@@ -119,14 +120,17 @@ mod tests {
             reserved: [u8; 3],
         ) -> Rsdp {
             let checksum = checksum.unwrap_or(
-                ((0isize - signature.iter().map(|&b| isize::from(b)).sum::<isize>()
+                ((0isize
+                    - signature.iter().map(|&b| isize::from(b)).sum::<isize>()
                     - oem_id.iter().map(|&b| isize::from(b)).sum::<isize>()
-                    - revision as isize - rsdt_address as isize) & 0b1111_1111)
-                    as u8,
+                    - revision as isize
+                    - rsdt_address as isize) & 0b1111_1111) as u8,
             );
 
             let ext_checksum = ext_checksum.unwrap_or(
-                ((0isize - length as isize - xsdt_address as isize
+                ((0isize
+                    - length as isize
+                    - xsdt_address as isize
                     - reserved.iter().map(|&b| isize::from(b)).sum::<isize>())
                     & 0b1111_1111) as u8,
             );