Update to 2024 edition everywhere else (#2170)

* chore: switch all sub-crates to 2024 edition

It turns out we didn't use the workspace's edition everywhere, fix that.

* fix: and format again

Author: Stebalien

ipld/amt/Cargo.toml

@@ -4,7 +4,7 @@ description = "Sharded IPLD Array implementation."
 version = "0.7.4"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>", "Protocol Labs", "Filecoin Core Devs"]
-edition = "2021"
+edition.workspace = true
 repository = "https://github.com/filecoin-project/ref-fvm"
 
 [dependencies]

ipld/amt/benches/amt_benchmark.rs

@@ -2,7 +2,7 @@
 // Copyright 2019-2023 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use fvm_ipld_amt::Amt;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 

ipld/amt/fuzz/Cargo.toml

@@ -3,7 +3,7 @@ name = "ipld_amt_fuzz"
 version = "0.0.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>", "Protocol Labs", "Filecoin Core Devs"]
 publish = false
-edition = "2021"
+edition.workspace = true
 license = "MIT OR Apache-2.0"
 
 [package.metadata]

ipld/amt/src/amt.rs

@@ -98,19 +98,19 @@
 use anyhow::anyhow;
 use cid::Cid;
 use fvm_ipld_blockstore::Blockstore;
+use fvm_ipld_encoding::CborStore;
 use fvm_ipld_encoding::de::DeserializeOwned;
 use fvm_ipld_encoding::ser::Serialize;
 use fvm_ipld_encoding::serde::Deserialize;
-use fvm_ipld_encoding::CborStore;
 use itertools::sorted;
 use multihash_codetable::Code;
 
 use super::ValueMut;
 use crate::node::{CollapsedNode, Link};
-use crate::root::version::{Version as AmtVersion, V0, V3};
 use crate::root::RootImpl;
+use crate::root::version::{V0, V3, Version as AmtVersion};
 use crate::{
-    init_sized_vec, nodes_for_height, Error, Node, DEFAULT_BIT_WIDTH, MAX_HEIGHT, MAX_INDEX,
+    DEFAULT_BIT_WIDTH, Error, MAX_HEIGHT, MAX_INDEX, Node, init_sized_vec, nodes_for_height,
 };
 
 #[derive(Debug)]

ipld/amt/src/diff.rs

@@ -7,7 +7,7 @@ use std::borrow::Borrow;
 use anyhow::Context;
 use fvm_ipld_blockstore::Blockstore;
 use fvm_ipld_encoding::CborStore;
-use serde::{de::DeserializeOwned, Serialize};
+use serde::{Serialize, de::DeserializeOwned};
 
 use crate::iter::Iter;
 use crate::node::{CollapsedNode, Link};

ipld/amt/src/iter.rs

@@ -1,14 +1,14 @@
 // Copyright 2021-2023 Protocol Labs
 // Copyright 2019-2023 ChainSafe Systems
 // SPDX-License-Identifier: Apache-2.0, MIT
+use crate::MAX_INDEX;
 use crate::node::CollapsedNode;
 use crate::node::{Link, Node};
-use crate::MAX_INDEX;
-use crate::{nodes_for_height, Error};
+use crate::{Error, nodes_for_height};
 use anyhow::anyhow;
 use fvm_ipld_blockstore::Blockstore;
-use fvm_ipld_encoding::ser::Serialize;
 use fvm_ipld_encoding::CborStore;
+use fvm_ipld_encoding::ser::Serialize;
 use serde::de::DeserializeOwned;
 use std::marker::PhantomData;
 
@@ -276,8 +276,8 @@ where
 mod tests {
     use crate::Amt;
     use crate::MAX_INDEX;
-    use fvm_ipld_blockstore::tracking::TrackingBlockstore;
     use fvm_ipld_blockstore::MemoryBlockstore;
+    use fvm_ipld_blockstore::tracking::TrackingBlockstore;
     use fvm_ipld_encoding::BytesDe;
     use quickcheck_macros::quickcheck;
 

ipld/amt/src/lib.rs

@@ -17,7 +17,7 @@ mod value_mut;
 
 pub(crate) use self::amt::AmtImpl;
 pub use self::amt::{Amt, Amtv0};
-pub use self::diff::{diff, Change, ChangeType};
+pub use self::diff::{Change, ChangeType, diff};
 pub use self::error::Error;
 pub(crate) use self::node::Node;
 pub use self::value_mut::ValueMut;

ipld/amt/src/node.rs

@@ -7,14 +7,14 @@ use std::convert::{TryFrom, TryInto};
 use anyhow::anyhow;
 use cid::Cid;
 use fvm_ipld_blockstore::Blockstore;
-use fvm_ipld_encoding::{strict_bytes, BytesSer, CborStore};
+use fvm_ipld_encoding::{BytesSer, CborStore, strict_bytes};
 use multihash_codetable::Code;
 use once_cell::unsync::OnceCell;
 use serde::de::{self, DeserializeOwned};
-use serde::{ser, Deserialize, Serialize};
+use serde::{Deserialize, Serialize, ser};
 
 use super::ValueMut;
-use crate::{bmap_bytes, init_sized_vec, nodes_for_height, Error};
+use crate::{Error, bmap_bytes, init_sized_vec, nodes_for_height};
 
 /// This represents a link to another Node
 #[derive(Debug)]
@@ -317,7 +317,7 @@ where
                     Some(Link::Dirty(Box::new(node)))
                 }
                 Some(Link::Dirty(node)) => {
-                    return node.set(bs, height - 1, bit_width, i % nfh, val)
+                    return node.set(bs, height - 1, bit_width, i % nfh, val);
                 }
             };
 

ipld/amt/src/root.rs

@@ -8,7 +8,7 @@ use serde::de::{self, Deserialize};
 use serde::ser::{self, Serialize};
 
 use crate::node::CollapsedNode;
-use crate::{init_sized_vec, Node, DEFAULT_BIT_WIDTH};
+use crate::{DEFAULT_BIT_WIDTH, Node, init_sized_vec};
 
 pub(crate) mod version {
     #[derive(PartialEq, Eq, Debug)]

ipld/amt/tests/amt_tests.rs

@@ -5,9 +5,9 @@
 use fvm_ipld_amt::{Amt, Amtv0, Error, MAX_INDEX};
 use fvm_ipld_blockstore::tracking::{BSStats, TrackingBlockstore};
 use fvm_ipld_blockstore::{Blockstore, MemoryBlockstore};
+use fvm_ipld_encoding::BytesDe;
 use fvm_ipld_encoding::de::DeserializeOwned;
 use fvm_ipld_encoding::ser::Serialize;
-use fvm_ipld_encoding::BytesDe;
 use std::fmt::Debug;
 
 fn assert_get<V, BS>(a: &Amt<V, BS>, i: u64, v: &V)

ipld/amt/tests/diff_tests.rs

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0, MIT
 
 use anyhow::*;
-use fvm_ipld_amt::{diff, Amt, Change};
+use fvm_ipld_amt::{Amt, Change, diff};
 use fvm_ipld_blockstore::MemoryBlockstore;
 use itertools::Itertools;
 use quickcheck::Arbitrary;

ipld/bitfield/Cargo.toml

@@ -4,7 +4,7 @@ description = "Bitfield logic for use in Filecoin actors"
 version = "0.7.2"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>", "Protocol Labs", "Filecoin Core Devs"]
-edition = "2021"
+edition.workspace = true
 repository = "https://github.com/filecoin-project/ref-fvm"
 
 [dependencies]

ipld/bitfield/benches/benchmarks/main.rs

@@ -7,7 +7,7 @@ mod examples;
 use std::fs;
 use std::path::Path;
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use examples::{example1, example2};
 use fvm_ipld_bitfield::BitField;
 use gperftools::profiler::PROFILER;

ipld/bitfield/src/lib.rs

@@ -15,7 +15,7 @@ mod unvalidated;
 use std::collections::BTreeSet;
 use std::ops::Range;
 
-use iter::{ranges_from_bits, RangeIterator};
+use iter::{RangeIterator, ranges_from_bits};
 pub(crate) use range::RangeSize;
 pub use rleplus::Error;
 use thiserror::Error;

ipld/bitfield/src/rleplus/mod.rs

@@ -69,15 +69,15 @@ mod writer;
 use std::borrow::Cow;
 
 #[cfg(feature = "enable-arbitrary")]
-use arbitrary::{size_hint, Arbitrary, Unstructured};
+use arbitrary::{Arbitrary, Unstructured, size_hint};
 pub use error::Error;
 use fvm_ipld_encoding::strict_bytes;
 pub use reader::BitReader;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 pub use writer::BitWriter;
 
 use super::BitField;
-use crate::{RangeSize, MAX_ENCODED_SIZE};
+use crate::{MAX_ENCODED_SIZE, RangeSize};
 
 impl Serialize for BitField {
     fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>

ipld/bitfield/tests/bitfield_tests.rs

@@ -4,7 +4,7 @@
 
 use std::collections::HashSet;
 
-use fvm_ipld_bitfield::{bitfield, BitField, UnvalidatedBitField};
+use fvm_ipld_bitfield::{BitField, UnvalidatedBitField, bitfield};
 use rand::{Rng, SeedableRng};
 use rand_xorshift::XorShiftRng;
 
@@ -112,32 +112,44 @@ fn subtract_more() {
 
 #[test]
 fn contains_any() {
-    assert!(!BitField::try_from_bits(vec![0, 4])
-        .unwrap()
-        .contains_any(&BitField::try_from_bits(vec![1, 3, 5]).unwrap()));
-
-    assert!(BitField::try_from_bits(vec![0, 2, 5, 6])
-        .unwrap()
-        .contains_any(&BitField::try_from_bits(vec![1, 3, 5]).unwrap()));
-
-    assert!(BitField::try_from_bits(vec![1, 2, 3])
-        .unwrap()
-        .contains_any(&BitField::try_from_bits(vec![1, 2, 3]).unwrap()));
+    assert!(
+        !BitField::try_from_bits(vec![0, 4])
+            .unwrap()
+            .contains_any(&BitField::try_from_bits(vec![1, 3, 5]).unwrap())
+    );
+
+    assert!(
+        BitField::try_from_bits(vec![0, 2, 5, 6])
+            .unwrap()
+            .contains_any(&BitField::try_from_bits(vec![1, 3, 5]).unwrap())
+    );
+
+    assert!(
+        BitField::try_from_bits(vec![1, 2, 3])
+            .unwrap()
+            .contains_any(&BitField::try_from_bits(vec![1, 2, 3]).unwrap())
+    );
 }
 
 #[test]
 fn contains_all() {
-    assert!(!BitField::try_from_bits(vec![0, 2, 4])
-        .unwrap()
-        .contains_all(&BitField::try_from_bits(vec![0, 2, 4, 5]).unwrap()));
-
-    assert!(BitField::try_from_bits(vec![0, 2, 4, 5])
-        .unwrap()
-        .contains_all(&BitField::try_from_bits(vec![0, 2, 4]).unwrap()));
-
-    assert!(BitField::try_from_bits(vec![1, 2, 3])
-        .unwrap()
-        .contains_all(&BitField::try_from_bits(vec![1, 2, 3]).unwrap()));
+    assert!(
+        !BitField::try_from_bits(vec![0, 2, 4])
+            .unwrap()
+            .contains_all(&BitField::try_from_bits(vec![0, 2, 4, 5]).unwrap())
+    );
+
+    assert!(
+        BitField::try_from_bits(vec![0, 2, 4, 5])
+            .unwrap()
+            .contains_all(&BitField::try_from_bits(vec![0, 2, 4]).unwrap())
+    );
+
+    assert!(
+        BitField::try_from_bits(vec![1, 2, 3])
+            .unwrap()
+            .contains_all(&BitField::try_from_bits(vec![1, 2, 3]).unwrap())
+    );
 }
 
 #[test]

ipld/blockstore/Cargo.toml

@@ -4,7 +4,7 @@ description = "Sharded IPLD Blockstore."
 version = "0.3.1"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>", "Protocol Labs", "Filecoin Core Devs"]
-edition = "2021"
+edition.workspace = true
 repository = "https://github.com/filecoin-project/ref-fvm"
 
 [dependencies]

ipld/car/Cargo.toml

@@ -3,7 +3,7 @@ name = "fvm_ipld_car"
 description = "IPLD CAR handling library"
 version = "0.9.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>", "Protocol Labs", "Filecoin Core Devs"]
-edition = "2021"
+edition.workspace = true
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/filecoin-project/ref-fvm"
 

ipld/car/src/lib.rs

@@ -172,7 +172,7 @@ pub fn load_car_unchecked(s: &impl Blockstore, reader: impl io::Read) -> Result<
 #[cfg(test)]
 mod tests {
     use fvm_ipld_blockstore::MemoryBlockstore;
-    use fvm_ipld_encoding::{to_vec, DAG_CBOR};
+    use fvm_ipld_encoding::{DAG_CBOR, to_vec};
     use multihash_codetable::{Code::Blake2b256, MultihashDigest};
 
     use super::*;

ipld/car/src/util.rs

@@ -19,7 +19,7 @@ pub(crate) fn ld_read(reader: &mut impl io::Read) -> Result<Option<Vec<u8>>, Err
                 Ok(None)
             } else {
                 Err(Error::Io(e))
-            }
+            };
         }
         Err(ReadError::Decode(e)) => return Err(Error::ParsingError(e.to_string())),
         Err(e) => return Err(Error::Other(e.to_string())),

ipld/car/tests/car_file_test.rs

@@ -6,7 +6,7 @@ use std::fs::File;
 use std::io::BufReader;
 
 use fvm_ipld_blockstore::MemoryBlockstore;
-use fvm_ipld_car::{load_car, CarReader};
+use fvm_ipld_car::{CarReader, load_car};
 
 #[test]
 fn load_into_blockstore() {

ipld/encoding/Cargo.toml

@@ -4,7 +4,7 @@ description = "Sharded IPLD encoding."
 version = "0.5.3"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>", "Protocol Labs", "Filecoin Core Devs"]
-edition = "2021"
+edition.workspace = true
 repository = "https://github.com/filecoin-project/ref-fvm"
 
 [dependencies]

ipld/encoding/src/bytes.rs

@@ -188,7 +188,7 @@ pub use strict_bytes as serde_bytes;
 mod test {
     use serde::{Deserialize, Serialize};
 
-    use crate::{from_slice, strict_bytes, to_vec, BytesDe, BytesSer};
+    use crate::{BytesDe, BytesSer, from_slice, strict_bytes, to_vec};
 
     #[test]
     fn round_trip() {

ipld/encoding/src/ipld_block.rs

@@ -5,7 +5,7 @@ use std::fmt::{Debug, Formatter};
 use serde::de::value;
 use {serde, serde_ipld_dagcbor};
 
-use crate::{CodecProtocol, Error, RawBytes, CBOR, DAG_CBOR, IPLD_RAW};
+use crate::{CBOR, CodecProtocol, DAG_CBOR, Error, IPLD_RAW, RawBytes};
 
 #[derive(PartialEq, Eq, Clone, Default)]
 pub struct IpldBlock {

ipld/encoding/src/vec.rs

@@ -5,8 +5,8 @@
 use std::fmt;
 use std::marker::PhantomData;
 
-use serde::de::{self, SeqAccess, Visitor};
 use serde::Deserialize;
+use serde::de::{self, SeqAccess, Visitor};
 
 /// Helper visitor to match Go's default behaviour of serializing uninitialized slices as null.
 /// This will be able to deserialize null as empty Vectors of the type.

ipld/hamt/Cargo.toml

@@ -4,7 +4,7 @@ description = "Sharded IPLD HashMap implementation."
 version = "0.10.4"
 license = "MIT OR Apache-2.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>", "Protocol Labs", "Filecoin Core Devs"]
-edition = "2021"
+edition.workspace = true
 repository = "https://github.com/filecoin-project/ref-fvm"
 
 [dependencies]

ipld/hamt/benches/hamt_benchmark.rs

@@ -4,7 +4,7 @@
 
 extern crate serde;
 
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, black_box, criterion_group, criterion_main};
 use fvm_ipld_encoding::tuple::*;
 use fvm_ipld_hamt::Hamt;
 

ipld/hamt/fuzz/Cargo.toml

@@ -3,7 +3,7 @@ name = "ipld_hamt-fuzz"
 version = "0.0.0"
 authors = ["ChainSafe Systems <info@chainsafe.io>", "Protocol Labs", "Filecoin Core Devs"]
 publish = false
-edition = "2021"
+edition.workspace = true
 license = "MIT OR Apache-2.0"
 
 [package.metadata]

ipld/hamt/src/hamt.rs

@@ -16,7 +16,7 @@ use serde::{Serialize, Serializer};
 use crate::iter::IterImpl;
 use crate::node::Node;
 use crate::pointer::version::Version;
-use crate::{pointer::version, Config, Error, Hash, HashAlgorithm, Sha256};
+use crate::{Config, Error, Hash, HashAlgorithm, Sha256, pointer::version};
 
 /// Implementation of the HAMT data structure for IPLD.
 ///