re-enable cargo-fmt

examples/sparse_http_reqwest.rs

@@ -1,4 +1,4 @@
-use crates_index::{SparseIndex};
+use crates_index::SparseIndex;
 
 ///
 /// **important**:<br>
@@ -18,18 +18,18 @@ fn main() {
     print_crate(&mut index);
 }
 
-fn print_crate(index: &mut SparseIndex){
+fn print_crate(index: &mut SparseIndex) {
     match index.crate_from_cache(CRATE_TO_FETCH) {
         Ok(krate) => {
             println!("{:?}", krate.highest_normal_version().unwrap().version());
         }
         Err(_err) => {
-            println!("could not find crate {}",CRATE_TO_FETCH)
+            println!("could not find crate {}", CRATE_TO_FETCH)
         }
     }
 }
 
-fn update(index: &mut SparseIndex){
+fn update(index: &mut SparseIndex) {
     let req = index.make_cache_request(CRATE_TO_FETCH).unwrap().body(()).unwrap();
 
     let (parts, _) = req.into_parts();
@@ -41,9 +41,7 @@ fn update(index: &mut SparseIndex){
 
     let res = client.execute(req).unwrap();
 
-    let mut builder = http::Response::builder()
-        .status(res.status())
-        .version(res.version());
+    let mut builder = http::Response::builder().status(res.status()).version(res.version());
 
     builder
         .headers_mut()
@@ -54,4 +52,4 @@ fn update(index: &mut SparseIndex){
     let res = builder.body(body.to_vec()).unwrap();
 
     index.parse_cache_response(CRATE_TO_FETCH, res, true).unwrap();
-}
+}

examples/sparse_http_ureq.rs

@@ -1,5 +1,5 @@
+use crates_index::SparseIndex;
 use std::io;
-use crates_index::{SparseIndex};
 
 ///
 /// **important**:<br>
@@ -19,27 +19,28 @@ fn main() {
     print_crate(&mut index);
 }
 
-fn print_crate(index: &mut SparseIndex){
+fn print_crate(index: &mut SparseIndex) {
     match index.crate_from_cache(CRATE_TO_FETCH) {
         Ok(krate) => {
             println!("{:?}", krate.highest_normal_version().unwrap().version());
         }
         Err(_err) => {
-            println!("could not find crate {}",CRATE_TO_FETCH)
+            println!("could not find crate {}", CRATE_TO_FETCH)
         }
     }
 }
 
-fn update(index: &mut SparseIndex){
+fn update(index: &mut SparseIndex) {
     let request: ureq::Request = index.make_cache_request(CRATE_TO_FETCH).unwrap().into();
 
     let response: http::Response<String> = request
         .call()
-        .map_err(|_e| io::Error::new(io::ErrorKind::InvalidInput, "connection error")).unwrap()
+        .map_err(|_e| io::Error::new(io::ErrorKind::InvalidInput, "connection error"))
+        .unwrap()
         .into();
 
     let (parts, body) = response.into_parts();
     let response = http::Response::from_parts(parts, body.into_bytes());
 
     index.parse_cache_response(CRATE_TO_FETCH, response, true).unwrap();
-}
+}

examples/update_and_get_latest.rs

@@ -3,12 +3,16 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     let mut index = crates_index::Index::new_cargo_default()?;
     println!("Updating index…");
     index.update()?;
-    
+
     let limit = 10;
     println!("The most recent {limit} changes:\n");
     for change in index.changes()?.take(limit) {
         let change = change?;
-        println!("{name} changed in {commit}", name = change.crate_name(), commit = change.commit_hex());
+        println!(
+            "{name} changed in {commit}",
+            name = change.crate_name(),
+            commit = change.commit_hex()
+        );
     }
     Ok(())
-}
+}

rustfmt.toml

@@ -1 +1,2 @@
-disable_all_formatting = true
+max_width = 120
+disable_all_formatting = false

src/bare_index/changes.rs

@@ -68,7 +68,15 @@ impl<'repo> Iterator for ChangesIter<'repo> {
             };
             let parent_tree = parent.tree().ok()?;
             let time = SystemTime::UNIX_EPOCH + Duration::from_secs(self.current.time().ok()?.seconds.max(0) as _);
-            Self::tree_additions(&self.repo, &mut self.out, time, &self.current.id(), &self.current_tree, &parent_tree).ok()?;
+            Self::tree_additions(
+                &self.repo,
+                &mut self.out,
+                time,
+                &self.current.id(),
+                &self.current_tree,
+                &parent_tree,
+            )
+            .ok()?;
             self.current_tree = parent_tree;
             self.current = parent;
         }
@@ -78,7 +86,11 @@ impl<'repo> Iterator for ChangesIter<'repo> {
 
 impl<'repo> ChangesIter<'repo> {
     pub(crate) fn new(index: &'repo Index) -> Result<Self, GixError> {
-        let current = index.repo.find_object(index.head_commit)?.peel_to_kind(gix::object::Kind::Commit)?.into_commit();
+        let current = index
+            .repo
+            .find_object(index.head_commit)?
+            .peel_to_kind(gix::object::Kind::Commit)?
+            .into_commit();
         let current_tree = current.tree()?;
 
         Ok(Self {
@@ -90,7 +102,13 @@ impl<'repo> ChangesIter<'repo> {
     }
 
     fn get_parent(&self) -> Result<Option<gix::Commit<'repo>>, GixError> {
-        match self.current.parent_ids().next().map(|id| id.try_object()).transpose()?.flatten()
+        match self
+            .current
+            .parent_ids()
+            .next()
+            .map(|id| id.try_object())
+            .transpose()?
+            .flatten()
         {
             Some(obj) => Ok(Some(obj.try_into_commit()?)),
             None => {
@@ -134,13 +152,12 @@ impl<'repo> ChangesIter<'repo> {
                 // Recurse only into crate subdirs, and they all happen to be 1 or 2 letters long
                 let is_crates_subdir = name.len() <= 2 && name.iter().copied().all(valid_crate_name_char);
                 let old_obj = if is_crates_subdir {
-                    old.bisect_entry(name, true)
-                        .map(|entry| entry.attach(repo))
+                    old.bisect_entry(name, true).map(|entry| entry.attach(repo))
                 } else {
                     None
                 }
-                    .map(|o| o.object())
-                    .transpose()?;
+                .map(|o| o.object())
+                .transpose()?;
                 let old_tree = match old_obj.and_then(|o| o.try_into_tree().ok()) {
                     Some(t) => t,
                     None => repo.empty_tree(),
@@ -168,7 +185,10 @@ fn valid_crate_name_char(c: u8) -> bool {
 }
 
 fn oid_and_branch_from_commit_message(msg: &str) -> Option<(gix::ObjectId, &str)> {
-    let hash_start = msg.split_once("Previous HEAD was ")?.1.trim_start_matches(|c: char| !c.is_ascii_hexdigit());
+    let hash_start = msg
+        .split_once("Previous HEAD was ")?
+        .1
+        .trim_start_matches(|c: char| !c.is_ascii_hexdigit());
     let (hash_str, rest) = hash_start.split_once(|c: char| !c.is_ascii_hexdigit())?;
     let hash = gix::ObjectId::from_hex(hash_str.as_bytes()).ok()?;
     let snapshot_start = rest.find("snapshot-")?;
@@ -179,7 +199,7 @@ fn oid_and_branch_from_commit_message(msg: &str) -> Option<(gix::ObjectId, &str)
 
 #[cfg(test)]
 pub(crate) mod test {
-    use super::{oid_and_branch_from_commit_message};
+    use super::oid_and_branch_from_commit_message;
 
     #[test]
     fn changes_parse_split_message() {
@@ -191,7 +211,7 @@ More information about this change can be found [online] and on [this issue].
 [online]: https://internals.rust-lang.org/t/cargos-crate-index-upcoming-squash-into-one-commit/8440
 [this issue]: https://github.com/rust-lang/crates-io-cargo-teams/issues/47",
         )
-            .unwrap();
+        .unwrap();
         assert_eq!("4181c62812c70fafb2b56cbbd66c31056671b445", id.to_string());
         assert_eq!("snapshot-2021-07-02", branch);
     }

src/bare_index/config.rs

@@ -15,10 +15,7 @@ fn read_cargo_config<T>(
 ) -> Result<Option<T>, Error> {
     use std::borrow::Cow;
 
-    if let Some(mut path) = root
-        .map(PathBuf::from)
-        .or_else(|| std::env::current_dir().ok())
-    {
+    if let Some(mut path) = root.map(PathBuf::from).or_else(|| std::env::current_dir().ok()) {
         loop {
             path.push(".cargo/config.toml");
             if let Some(toml) = try_read_toml(&path)? {