Run rustfmt (Rust 1.28.0)

Ortham · Sep 8, 2018 · a1efe4b · a1efe4b
1 parent 32c0530
commit a1efe4b
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 27 deletions.
diff --git a/benches/load_order.rs b/benches/load_order.rs
@@ -46,10 +46,11 @@ fn write_active_plugins_file<T: AsRef<str>>(game_settings: &GameSettings, filena
         } else if game_settings.load_order_method() == LoadOrderMethod::Asterisk {
             write!(file, "*").unwrap();
         }
-        file.write_all(&WINDOWS_1252
-            .encode(filename.as_ref(), EncoderTrap::Strict)
-            .unwrap())
-            .unwrap();
+        file.write_all(
+            &WINDOWS_1252
+                .encode(filename.as_ref(), EncoderTrap::Strict)
+                .unwrap(),
+        ).unwrap();
         writeln!(file, "").unwrap();
     }
 }

diff --git a/src/load_order/asterisk_based.rs b/src/load_order/asterisk_based.rs
@@ -146,9 +146,11 @@ impl WritableLoadOrder for AsteriskBasedLoadOrder {
             if plugin.is_active() {
                 write!(writer, "*")?;
             }
-            writer.write_all(&WINDOWS_1252
-                .encode(plugin.name(), EncoderTrap::Strict)
-                .map_err(Error::EncodeError)?)?;
+            writer.write_all(
+                &WINDOWS_1252
+                    .encode(plugin.name(), EncoderTrap::Strict)
+                    .map_err(Error::EncodeError)?,
+            )?;
             writeln!(writer)?;
         }
 
@@ -163,7 +165,8 @@ impl WritableLoadOrder for AsteriskBasedLoadOrder {
         // Check that all implicitly active plugins that are present load in
         // their hardcoded order.
         let mut missing_plugins_count = 0;
-        for (i, plugin_name) in self.game_settings()
+        for (i, plugin_name) in self
+            .game_settings()
             .implicitly_active_plugins()
             .iter()
             .enumerate()

diff --git a/src/load_order/insertable.rs b/src/load_order/insertable.rs
@@ -49,7 +49,8 @@ pub trait InsertableLoadOrder: MutableLoadOrder {
     fn find_or_add(&mut self, plugin_name: &str) -> Result<usize, Error> {
         match self.index_of(plugin_name) {
             Some(i) => Ok(i),
-            None => self.add_to_load_order(plugin_name)
+            None => self
+                .add_to_load_order(plugin_name)
                 .map_err(|_| Error::InvalidPlugin(plugin_name.to_string())),
         }
     }
@@ -76,7 +77,8 @@ pub trait InsertableLoadOrder: MutableLoadOrder {
     }
 
     fn add_implicitly_active_plugins(&mut self) -> Result<(), Error> {
-        let plugin_names: Vec<String> = self.game_settings()
+        let plugin_names: Vec<String> = self
+            .game_settings()
             .implicitly_active_plugins()
             .iter()
             .filter(|p| !self.is_active(p))

diff --git a/src/load_order/readable.rs b/src/load_order/readable.rs
@@ -168,7 +168,8 @@ pub trait ReadableLoadOrderExt: ReadableLoadOrder + Sync {
     ) -> Result<(Vec<usize>, Vec<Plugin>), Error> {
         let (existing_plugin_indices, new_plugin_names): (Vec<usize>, Vec<&str>) =
             active_plugin_names.into_par_iter().partition_map(|n| {
-                match self.plugins()
+                match self
+                    .plugins()
                     .par_iter()
                     .position_any(|p| p.name_matches(n))
                 {

diff --git a/src/load_order/tests.rs b/src/load_order/tests.rs
@@ -57,10 +57,11 @@ pub fn write_active_plugins_file<T: AsRef<str>>(game_settings: &GameSettings, fi
         } else if game_settings.load_order_method() == LoadOrderMethod::Asterisk {
             write!(file, "*").unwrap();
         }
-        file.write_all(&WINDOWS_1252
-            .encode(filename.as_ref(), EncoderTrap::Strict)
-            .unwrap())
-            .unwrap();
+        file.write_all(
+            &WINDOWS_1252
+                .encode(filename.as_ref(), EncoderTrap::Strict)
+                .unwrap(),
+        ).unwrap();
         writeln!(file, "").unwrap();
     }
 }

diff --git a/src/load_order/textfile_based.rs b/src/load_order/textfile_based.rs
@@ -113,7 +113,8 @@ impl WritableLoadOrder for TextfileBasedLoadOrder {
     fn load(&mut self) -> Result<(), Error> {
         self.plugins_mut().clear();
 
-        let load_order_file_exists = self.game_settings()
+        let load_order_file_exists = self
+            .game_settings()
             .load_order_file()
             .map(|p| p.exists())
             .unwrap_or(false);
@@ -241,9 +242,11 @@ impl TextfileBasedLoadOrder {
         let file = File::create(self.game_settings().active_plugins_file())?;
         let mut writer = BufWriter::new(file);
         for plugin_name in self.active_plugin_names() {
-            writer.write_all(&WINDOWS_1252
-                .encode(&plugin_name, EncoderTrap::Strict)
-                .map_err(Error::EncodeError)?)?;
+            writer.write_all(
+                &WINDOWS_1252
+                    .encode(&plugin_name, EncoderTrap::Strict)
+                    .map_err(Error::EncodeError)?,
+            )?;
             writeln!(writer)?;
         }
 
@@ -453,10 +456,11 @@ mod tests {
             File::create(&load_order.game_settings().load_order_file().unwrap()).unwrap();
 
         for filename in &expected_filenames {
-            file.write_all(&WINDOWS_1252
-                .encode(filename.as_ref(), EncoderTrap::Strict)
-                .unwrap())
-                .unwrap();
+            file.write_all(
+                &WINDOWS_1252
+                    .encode(filename.as_ref(), EncoderTrap::Strict)
+                    .unwrap(),
+            ).unwrap();
             writeln!(file, "").unwrap();
         }
 

diff --git a/src/load_order/timestamp_based.rs b/src/load_order/timestamp_based.rs
@@ -126,7 +126,8 @@ impl WritableLoadOrder for TimestampBasedLoadOrder {
     fn save(&mut self) -> Result<(), Error> {
         let timestamps = padded_unique_timestamps(self.plugins());
 
-        let result: Result<Vec<()>, Error> = self.plugins_mut()
+        let result: Result<Vec<()>, Error> = self
+            .plugins_mut()
             .par_iter_mut()
             .zip(timestamps.into_par_iter())
             .map(|(ref mut plugin, timestamp)| plugin.set_modification_time(timestamp))
@@ -227,9 +228,11 @@ fn save_active_plugins<T: ReadableLoadOrderExt>(load_order: &mut T) -> Result<()
         if load_order.game_settings().id() == GameId::Morrowind {
             write!(writer, "GameFile{}=", index)?;
         }
-        writer.write_all(&WINDOWS_1252
-            .encode(plugin_name, EncoderTrap::Strict)
-            .map_err(Error::EncodeError)?)?;
+        writer.write_all(
+            &WINDOWS_1252
+                .encode(plugin_name, EncoderTrap::Strict)
+                .map_err(Error::EncodeError)?,
+        )?;
         writeln!(writer)?;
     }