Use style_edition instead of version in .rustfmt.toml and apply new c…

…hanges from nightly

.integration/src/lib.rs

@@ -20,12 +20,12 @@ mod tests {
     use aleo_std::StorageMode;
     use snarkos_node_cdn::sync_ledger_with_cdn;
     use snarkvm::prelude::{
-        block::Block,
-        store::helpers::memory::ConsensusMemory,
         FromBytes,
         Ledger,
         MainnetV0,
         Network,
+        block::Block,
+        store::helpers::memory::ConsensusMemory,
     };
 
     use tracing_test::traced_test;

.rustfmt.toml

@@ -13,4 +13,4 @@ imports_layout = "HorizontalVertical"
 imports_granularity = "Crate"
 overflow_delimited_expr = true
 reorder_impl_items = true
-version = "Two"
+style_edition = "2024"

cli/src/commands/account.rs

@@ -21,7 +21,7 @@ use snarkvm::console::{
     types::Field,
 };
 
-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 use clap::Parser;
 use colored::Colorize;
 use core::str::FromStr;

cli/src/commands/clean.rs

@@ -16,7 +16,7 @@
 use snarkos_node::bft::helpers::proposal_cache_path;
 
 use aleo_std::StorageMode;
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::Parser;
 use colored::Colorize;
 use std::path::PathBuf;

cli/src/commands/developer/decrypt.rs

@@ -21,7 +21,7 @@ use snarkvm::{
     prelude::{Record, ViewKey},
 };
 
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::Parser;
 use std::str::FromStr;
 use zeroize::Zeroize;

cli/src/commands/developer/deploy.rs

@@ -21,18 +21,18 @@ use snarkvm::{
         program::ProgramOwner,
     },
     prelude::{
-        block::Transaction,
-        deployment_cost,
-        query::Query,
-        store::{helpers::memory::ConsensusMemory, ConsensusStore},
         PrivateKey,
         ProgramID,
         VM,
+        block::Transaction,
+        deployment_cost,
+        query::Query,
+        store::{ConsensusStore, helpers::memory::ConsensusMemory},
     },
 };
 
 use aleo_std::StorageMode;
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::Parser;
 use colored::Colorize;
 use std::{path::PathBuf, str::FromStr};
@@ -178,7 +178,7 @@ impl Deploy {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::commands::{Command, CLI};
+    use crate::commands::{CLI, Command};
 
     #[test]
     fn clap_snarkos_deploy() {

cli/src/commands/developer/execute.rs

@@ -17,21 +17,21 @@ use super::Developer;
 use snarkvm::{
     console::network::{CanaryV0, MainnetV0, Network, TestnetV0},
     prelude::{
-        query::Query,
-        store::{helpers::memory::ConsensusMemory, ConsensusStore},
         Address,
         Identifier,
         Locator,
         PrivateKey,
         Process,
         ProgramID,
-        Value,
         VM,
+        Value,
+        query::Query,
+        store::{ConsensusStore, helpers::memory::ConsensusMemory},
     },
 };
 
 use aleo_std::StorageMode;
-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 use clap::Parser;
 use colored::Colorize;
 use std::{path::PathBuf, str::FromStr};
@@ -213,7 +213,7 @@ fn load_program<N: Network>(endpoint: &str, process: &mut Process<N>, program_id
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::commands::{Command, CLI};
+    use crate::commands::{CLI, Command};
 
     #[test]
     fn clap_snarkos_execute() {

cli/src/commands/developer/mod.rs

@@ -32,7 +32,6 @@ use snarkvm::{
     console::network::Network,
     package::Package,
     prelude::{
-        block::Transaction,
         Address,
         Ciphertext,
         Identifier,
@@ -45,10 +44,11 @@ use snarkvm::{
         ToBytes,
         Value,
         ViewKey,
+        block::Transaction,
     },
 };
 
-use anyhow::{bail, ensure, Result};
+use anyhow::{Result, bail, ensure};
 use clap::Parser;
 use colored::Colorize;
 use std::{path::PathBuf, str::FromStr};

cli/src/commands/developer/scan.rs

@@ -17,14 +17,14 @@
 
 use snarkvm::{
     console::network::{CanaryV0, MainnetV0, Network, TestnetV0},
-    prelude::{block::Block, Ciphertext, Field, FromBytes, Plaintext, PrivateKey, Record, ViewKey},
+    prelude::{Ciphertext, Field, FromBytes, Plaintext, PrivateKey, Record, ViewKey, block::Block},
 };
 
-use anyhow::{bail, ensure, Result};
+use anyhow::{Result, bail, ensure};
 use clap::Parser;
 use parking_lot::RwLock;
 use std::{
-    io::{stdout, Write},
+    io::{Write, stdout},
     str::FromStr,
     sync::Arc,
 };

cli/src/commands/developer/transfer_private.rs

@@ -17,18 +17,18 @@ use super::Developer;
 use snarkvm::{
     console::network::{CanaryV0, MainnetV0, Network, TestnetV0},
     prelude::{
-        query::Query,
-        store::{helpers::memory::ConsensusMemory, ConsensusStore},
         Address,
         Locator,
         PrivateKey,
-        Value,
         VM,
+        Value,
+        query::Query,
+        store::{ConsensusStore, helpers::memory::ConsensusMemory},
     },
 };
 
 use aleo_std::StorageMode;
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use clap::Parser;
 use std::{path::PathBuf, str::FromStr};
 use zeroize::Zeroize;

cli/src/commands/mod.rs

@@ -30,7 +30,7 @@ pub use update::*;
 
 use anstyle::{AnsiColor, Color, Style};
 use anyhow::Result;
-use clap::{builder::Styles, Parser};
+use clap::{Parser, builder::Styles};
 
 const HEADER_COLOR: Option<Color> = Some(Color::Ansi(AnsiColor::Yellow));
 const LITERAL_COLOR: Option<Color> = Some(Color::Ansi(AnsiColor::Green));

cli/src/commands/start.rs

@@ -15,7 +15,7 @@
 
 use snarkos_account::Account;
 use snarkos_display::Display;
-use snarkos_node::{bft::MEMORY_POOL_PORT, router::messages::NodeType, Node};
+use snarkos_node::{Node, bft::MEMORY_POOL_PORT, router::messages::NodeType};
 use snarkvm::{
     console::{
         account::{Address, PrivateKey},
@@ -25,15 +25,15 @@ use snarkvm::{
     ledger::{
         block::Block,
         committee::{Committee, MIN_DELEGATOR_STAKE, MIN_VALIDATOR_STAKE},
-        store::{helpers::memory::ConsensusMemory, ConsensusStore},
+        store::{ConsensusStore, helpers::memory::ConsensusMemory},
     },
     prelude::{FromBytes, ToBits, ToBytes},
     synthesizer::VM,
     utilities::to_bytes_le,
 };
 
 use aleo_std::StorageMode;
-use anyhow::{bail, ensure, Result};
+use anyhow::{Result, bail, ensure};
 use clap::Parser;
 use colored::Colorize;
 use core::str::FromStr;
@@ -44,7 +44,7 @@ use serde::{Deserialize, Serialize};
 use std::{
     net::SocketAddr,
     path::PathBuf,
-    sync::{atomic::AtomicBool, Arc},
+    sync::{Arc, atomic::AtomicBool},
 };
 use tokio::runtime::{self, Runtime};
 
@@ -767,7 +767,7 @@ fn load_or_compute_genesis<N: Network>(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::commands::{Command, CLI};
+    use crate::commands::{CLI, Command};
     use snarkvm::prelude::MainnetV0;
 
     type CurrentNetwork = MainnetV0;

cli/src/helpers/dynamic_format.rs

@@ -14,17 +14,17 @@
 // limitations under the License.
 
 use std::sync::{
-    atomic::{AtomicBool, Ordering},
     Arc,
+    atomic::{AtomicBool, Ordering},
 };
 
 use time::{
-    format_description::{self, OwnedFormatItem},
     OffsetDateTime,
+    format_description::{self, OwnedFormatItem},
 };
 use tracing::{Event, Subscriber};
 use tracing_subscriber::{
-    fmt::{format::Writer, FmtContext, FormatEvent, FormatFields},
+    fmt::{FmtContext, FormatEvent, FormatFields, format::Writer},
     registry::LookupSpan,
 };
 

cli/src/helpers/logger.rs

@@ -20,13 +20,13 @@ use std::{
     fs::File,
     io,
     path::Path,
-    sync::{atomic::AtomicBool, Arc},
+    sync::{Arc, atomic::AtomicBool},
 };
 use tokio::sync::mpsc;
 use tracing_subscriber::{
+    EnvFilter,
     layer::{Layer, SubscriberExt},
     util::SubscriberInitExt,
-    EnvFilter,
 };
 
 /// Initializes the logger.

cli/src/helpers/mod.rs

@@ -32,7 +32,7 @@ use snarkos_node::router::messages::NodeType;
 
 use colored::*;
 #[cfg(target_family = "unix")]
-use nix::sys::resource::{getrlimit, Resource};
+use nix::sys::resource::{Resource, getrlimit};
 
 /// Check if process's open files limit is above minimum and warn if not.
 #[cfg(target_family = "unix")]

cli/src/helpers/updater.rs

@@ -14,7 +14,7 @@
 // limitations under the License.
 
 use colored::Colorize;
-use self_update::{backends::github, version::bump_is_greater, Status};
+use self_update::{Status, backends::github, version::bump_is_greater};
 use std::fmt::Write;
 
 pub struct Updater;

display/src/lib.rs

@@ -28,16 +28,16 @@ use anyhow::Result;
 use crossterm::{
     event::{self, DisableMouseCapture, EnableMouseCapture, Event, KeyCode},
     execute,
-    terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
+    terminal::{EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode},
 };
 use ratatui::{
+    Frame,
+    Terminal,
     backend::{Backend, CrosstermBackend},
     layout::{Constraint, Direction, Layout},
     style::{Color, Modifier, Style},
     text::{Line, Span},
     widgets::{Block, Borders, Tabs as TabsTui},
-    Frame,
-    Terminal,
 };
 use std::{
     io,

display/src/pages/logs.rs

@@ -14,9 +14,9 @@
 // limitations under the License.
 
 use ratatui::{
+    Frame,
     layout::{Constraint, Direction, Layout, Rect},
     widgets::{Block, Borders, Paragraph},
-    Frame,
 };
 use std::collections::VecDeque;
 use tokio::sync::mpsc;

display/src/pages/overview.rs

@@ -17,11 +17,11 @@ use snarkos_node::Node;
 use snarkvm::prelude::Network;
 
 use ratatui::{
+    Frame,
     layout::{Constraint, Direction, Layout, Rect},
     style::{Color, Style},
     text::Span,
-    widgets::{canvas::Canvas, Block, Borders},
-    Frame,
+    widgets::{Block, Borders, canvas::Canvas},
 };
 
 pub(crate) struct Overview;

node/bft/events/src/batch_certified.rs

@@ -59,7 +59,7 @@ impl<N: Network> FromBytes for BatchCertified<N> {
 
 #[cfg(test)]
 pub mod prop_tests {
-    use crate::{certificate_response::prop_tests::any_batch_certificate, BatchCertified};
+    use crate::{BatchCertified, certificate_response::prop_tests::any_batch_certificate};
     use snarkvm::console::prelude::{FromBytes, ToBytes};
 
     use bytes::{Buf, BufMut, BytesMut};

node/bft/events/src/batch_propose.rs

@@ -62,15 +62,15 @@ impl<N: Network> FromBytes for BatchPropose<N> {
 
 #[cfg(test)]
 pub mod prop_tests {
-    use crate::{certificate_response::prop_tests::any_batch_header, BatchPropose};
+    use crate::{BatchPropose, certificate_response::prop_tests::any_batch_header};
     use snarkvm::{
         console::prelude::{FromBytes, ToBytes},
         ledger::committee::prop_tests::CommitteeContext,
         prelude::narwhal::Data,
     };
 
     use bytes::{Buf, BufMut, BytesMut};
-    use proptest::prelude::{any, BoxedStrategy, Strategy};
+    use proptest::prelude::{BoxedStrategy, Strategy, any};
     use test_strategy::proptest;
 
     type CurrentNetwork = snarkvm::prelude::MainnetV0;

node/bft/events/src/batch_signature.rs

@@ -56,9 +56,9 @@ impl<N: Network> FromBytes for BatchSignature<N> {
 #[cfg(test)]
 pub mod prop_tests {
     use crate::{
+        BatchSignature,
         certificate_request::prop_tests::any_field,
         challenge_response::prop_tests::any_signature,
-        BatchSignature,
     };
     use snarkvm::console::prelude::{FromBytes, ToBytes};
 

node/bft/events/src/block_request.rs

@@ -65,7 +65,7 @@ pub mod prop_tests {
     use crate::BlockRequest;
 
     use bytes::{Buf, BufMut, BytesMut};
-    use proptest::prelude::{any, BoxedStrategy, Strategy};
+    use proptest::prelude::{BoxedStrategy, Strategy, any};
     use snarkvm::utilities::{FromBytes, ToBytes};
     use test_strategy::proptest;
 

node/bft/events/src/block_response.rs

@@ -136,16 +136,16 @@ impl<N: Network> FromBytes for DataBlocks<N> {
 
 #[cfg(test)]
 pub mod prop_tests {
-    use crate::{block_request::prop_tests::any_block_request, BlockResponse, DataBlocks};
+    use crate::{BlockResponse, DataBlocks, block_request::prop_tests::any_block_request};
     use snarkvm::{
         ledger::ledger_test_helpers::sample_genesis_block,
-        prelude::{block::Block, narwhal::Data, FromBytes, TestRng, ToBytes},
+        prelude::{FromBytes, TestRng, ToBytes, block::Block, narwhal::Data},
     };
 
     use bytes::{Buf, BufMut, BytesMut};
     use proptest::{
         collection::vec,
-        prelude::{any, BoxedStrategy, Strategy},
+        prelude::{BoxedStrategy, Strategy, any},
     };
     use test_strategy::proptest;