tools: rustfmt

Author: fw-immunant

tools/merge_rust/src/main.rs

@@ -1,10 +1,10 @@
-use std::collections::HashMap;
-use std::fs::{self, File};
-use std::path::PathBuf;
+use clap::Parser;
 use rust_util::collect::FileCollector;
 use rust_util::item_span::item_spans;
 use serde_json;
-use clap::Parser;
+use std::collections::HashMap;
+use std::fs::{self, File};
+use std::path::PathBuf;
 
 /// Merge updated item definitions into a Rust codebase.
 #[derive(Parser)]
@@ -21,8 +21,7 @@ fn main() {
     let new_snippet_json_path = args.new_snippets_file;
 
     let new_snippets_file = File::open(&new_snippet_json_path).unwrap();
-    let new_snippets: HashMap<String, String> =
-        serde_json::from_reader(new_snippets_file).unwrap();
+    let new_snippets: HashMap<String, String> = serde_json::from_reader(new_snippets_file).unwrap();
 
     let mut fc = FileCollector::default();
     fc.parse(&src_root_path, vec![], true).unwrap();
@@ -32,7 +31,7 @@ fn main() {
 
         let mut rewrites = Vec::new();
         for (item_path, lo, hi) in item_spans(mod_path.to_owned(), ast) {
-            let old_snippet = &old_src[lo .. hi];
+            let old_snippet = &old_src[lo..hi];
             let item_path_str = item_path.join("::");
             if let Some(new_snippet) = new_snippets.get(&item_path_str) {
                 if new_snippet != old_snippet {
@@ -49,9 +48,15 @@ fn main() {
         let mut new_src = String::with_capacity(old_src.len());
         let mut pos = 0;
         for &(lo, hi, new_snippet) in &rewrites {
-            assert!(lo >= pos, "overlapping rewrites: previous rewrite ended at {}, \
-                but current rewrite covers {} .. {}", pos, lo, hi);
-            new_src.push_str(&old_src[pos .. lo]);
+            assert!(
+                lo >= pos,
+                "overlapping rewrites: previous rewrite ended at {}, \
+                but current rewrite covers {} .. {}",
+                pos,
+                lo,
+                hi
+            );
+            new_src.push_str(&old_src[pos..lo]);
             new_src.push_str(new_snippet);
             pos = hi;
         }