Format with imports_granularity = "Module"

This is the result of running `cargo +nightly fmt` with the unstable
`rustfmt` option `imports_granularity = "Module"`.

Personally, I find this style much easier to use:

- The lack of deep nesting makes it easier for me to understand the
  imports at a glance.
- Because most imports are on a single line, I can add/remove them
  easier. Copy-pasting between files is easier.

Of course, this option is unstable, meaning that it has no effect on a
stable `rustfmt`. Luckily, the default value for `imports_granularity`
is `Preserve`, which means that the formatting done here will be
preserved by future `cargo fmt` calls:

  https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#imports_granularity

This applies to both on the stable and nightly channels.

Author: mgeisler

mls-rs/benches/group_add.rs

@@ -3,15 +3,11 @@
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 use criterion::{BatchSize, BenchmarkId, Criterion};
-use mls_rs::{
-    client_builder::MlsConfig,
-    identity::{
-        basic::{BasicCredential, BasicIdentityProvider},
-        SigningIdentity,
-    },
-    mls_rules::{CommitOptions, DefaultMlsRules},
-    CipherSuite, CipherSuiteProvider, Client, CryptoProvider,
-};
+use mls_rs::client_builder::MlsConfig;
+use mls_rs::identity::basic::{BasicCredential, BasicIdentityProvider};
+use mls_rs::identity::SigningIdentity;
+use mls_rs::mls_rules::{CommitOptions, DefaultMlsRules};
+use mls_rs::{CipherSuite, CipherSuiteProvider, Client, CryptoProvider};
 use mls_rs_crypto_openssl::OpensslCryptoProvider;
 
 fn bench(c: &mut Criterion) {

mls-rs/benches/group_commit.rs

@@ -3,7 +3,8 @@
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 use criterion::{BatchSize, BenchmarkId, Criterion};
-use mls_rs::{test_utils::benchmarks::load_group_states, CipherSuite};
+use mls_rs::test_utils::benchmarks::load_group_states;
+use mls_rs::CipherSuite;
 
 fn bench(c: &mut Criterion) {
     let cipher_suite = CipherSuite::CURVE25519_AES128;

mls-rs/benches/group_receive_commit.rs

@@ -3,7 +3,8 @@
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
 use criterion::{BatchSize, BenchmarkId, Criterion};
-use mls_rs::{test_utils::benchmarks::load_group_states, CipherSuite};
+use mls_rs::test_utils::benchmarks::load_group_states;
+use mls_rs::CipherSuite;
 
 fn bench(c: &mut Criterion) {
     let cipher_suite = CipherSuite::CURVE25519_AES128;

mls-rs/benches/group_serialize.rs

@@ -2,7 +2,8 @@
 // Copyright by contributors to this project.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-use mls_rs::{test_utils::benchmarks::load_group_states, CipherSuite};
+use mls_rs::test_utils::benchmarks::load_group_states;
+use mls_rs::CipherSuite;
 
 use criterion::{BenchmarkId, Criterion};
 

mls-rs/examples/basic_server_usage.rs

@@ -2,20 +2,14 @@
 // Copyright by contributors to this project.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-use mls_rs::{
-    client_builder::MlsConfig,
-    error::MlsError,
-    external_client::{
-        builder::MlsConfig as ExternalMlsConfig, ExternalClient, ExternalReceivedMessage,
-        ExternalSnapshot,
-    },
-    group::{CachedProposal, ReceivedMessage},
-    identity::{
-        basic::{BasicCredential, BasicIdentityProvider},
-        SigningIdentity,
-    },
-    CipherSuite, CipherSuiteProvider, Client, CryptoProvider, ExtensionList, MlsMessage,
-};
+use mls_rs::client_builder::MlsConfig;
+use mls_rs::error::MlsError;
+use mls_rs::external_client::builder::MlsConfig as ExternalMlsConfig;
+use mls_rs::external_client::{ExternalClient, ExternalReceivedMessage, ExternalSnapshot};
+use mls_rs::group::{CachedProposal, ReceivedMessage};
+use mls_rs::identity::basic::{BasicCredential, BasicIdentityProvider};
+use mls_rs::identity::SigningIdentity;
+use mls_rs::{CipherSuite, CipherSuiteProvider, Client, CryptoProvider, ExtensionList, MlsMessage};
 use mls_rs_core::crypto::SignatureSecretKey;
 
 const CIPHERSUITE: CipherSuite = CipherSuite::CURVE25519_AES128;

mls-rs/examples/basic_usage.rs

@@ -2,15 +2,11 @@
 // Copyright by contributors to this project.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-use mls_rs::{
-    client_builder::MlsConfig,
-    error::MlsError,
-    identity::{
-        basic::{BasicCredential, BasicIdentityProvider},
-        SigningIdentity,
-    },
-    CipherSuite, CipherSuiteProvider, Client, CryptoProvider, ExtensionList,
-};
+use mls_rs::client_builder::MlsConfig;
+use mls_rs::error::MlsError;
+use mls_rs::identity::basic::{BasicCredential, BasicIdentityProvider};
+use mls_rs::identity::SigningIdentity;
+use mls_rs::{CipherSuite, CipherSuiteProvider, Client, CryptoProvider, ExtensionList};
 
 const CIPHERSUITE: CipherSuite = CipherSuite::CURVE25519_AES128;
 

mls-rs/examples/custom.rs

@@ -24,29 +24,26 @@
 /// * Proposal validation rules that enforce 1. above.
 ///
 use assert_matches::assert_matches;
+use mls_rs::client_builder::{MlsConfig, PaddingMode};
+use mls_rs::error::MlsError;
+use mls_rs::group::proposal::{MlsCustomProposal, Proposal};
+use mls_rs::group::{Roster, Sender};
+use mls_rs::mls_rules::{
+    CommitDirection, CommitOptions, CommitSource, EncryptionOptions, ProposalBundle, ProposalSource,
+};
 use mls_rs::{
-    client_builder::{MlsConfig, PaddingMode},
-    error::MlsError,
-    group::{
-        proposal::{MlsCustomProposal, Proposal},
-        Roster, Sender,
-    },
-    mls_rules::{
-        CommitDirection, CommitOptions, CommitSource, EncryptionOptions, ProposalBundle,
-        ProposalSource,
-    },
     CipherSuite, CipherSuiteProvider, Client, CryptoProvider, ExtensionList, IdentityProvider,
     MlsRules,
 };
 use mls_rs_codec::{MlsDecode, MlsEncode, MlsSize};
-use mls_rs_core::{
-    crypto::{SignaturePublicKey, SignatureSecretKey},
-    error::IntoAnyError,
-    extension::{ExtensionError, ExtensionType, MlsCodecExtension},
-    group::ProposalType,
-    identity::{Credential, CredentialType, CustomCredential, MlsCredential, SigningIdentity},
-    time::MlsTime,
+use mls_rs_core::crypto::{SignaturePublicKey, SignatureSecretKey};
+use mls_rs_core::error::IntoAnyError;
+use mls_rs_core::extension::{ExtensionError, ExtensionType, MlsCodecExtension};
+use mls_rs_core::group::ProposalType;
+use mls_rs_core::identity::{
+    Credential, CredentialType, CustomCredential, MlsCredential, SigningIdentity,
 };
+use mls_rs_core::time::MlsTime;
 
 use std::fmt::Display;
 

mls-rs/examples/large_group.rs

@@ -2,16 +2,12 @@
 // Copyright by contributors to this project.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-use mls_rs::{
-    client_builder::MlsConfig,
-    error::MlsError,
-    identity::{
-        basic::{BasicCredential, BasicIdentityProvider},
-        SigningIdentity,
-    },
-    mls_rules::{CommitOptions, DefaultMlsRules},
-    CipherSuite, CipherSuiteProvider, Client, CryptoProvider, Group,
-};
+use mls_rs::client_builder::MlsConfig;
+use mls_rs::error::MlsError;
+use mls_rs::identity::basic::{BasicCredential, BasicIdentityProvider};
+use mls_rs::identity::SigningIdentity;
+use mls_rs::mls_rules::{CommitOptions, DefaultMlsRules};
+use mls_rs::{CipherSuite, CipherSuiteProvider, Client, CryptoProvider, Group};
 
 const CIPHERSUITE: CipherSuite = CipherSuite::CURVE25519_AES128;
 const GROUP_SIZES: [usize; 8] = [2, 3, 5, 9, 17, 33, 65, 129];

mls-rs/src/client.rs

@@ -7,13 +7,14 @@ use crate::client_builder::{recreate_config, BaseConfig, ClientBuilder, MakeConf
 use crate::client_config::ClientConfig;
 use crate::group::framing::MlsMessage;
 
+use crate::group::snapshot::Snapshot;
 #[cfg(feature = "by_ref_proposal")]
 use crate::group::{
     framing::{Content, MlsMessagePayload, PublicMessage, Sender, WireFormat},
     message_signature::AuthenticatedContent,
     proposal::{AddProposal, Proposal},
 };
-use crate::group::{snapshot::Snapshot, ExportedTree, Group, NewMemberInfo};
+use crate::group::{ExportedTree, Group, NewMemberInfo};
 use crate::identity::SigningIdentity;
 use crate::key_package::{KeyPackageGeneration, KeyPackageGenerator};
 use crate::protocol_version::ProtocolVersion;
@@ -784,22 +785,16 @@ mod tests {
     use super::test_utils::*;
 
     use super::*;
-    use crate::{
-        crypto::test_utils::TestCryptoProvider,
-        identity::test_utils::{get_test_basic_credential, get_test_signing_identity},
-        tree_kem::leaf_node::LeafNodeSource,
-    };
+    use crate::crypto::test_utils::TestCryptoProvider;
+    use crate::identity::test_utils::{get_test_basic_credential, get_test_signing_identity};
+    use crate::tree_kem::leaf_node::LeafNodeSource;
     use assert_matches::assert_matches;
 
-    use crate::{
-        group::{
-            message_processor::ProposalMessageDescription,
-            proposal::Proposal,
-            test_utils::{test_group, test_group_custom_config},
-            ReceivedMessage,
-        },
-        psk::{ExternalPskId, PreSharedKey},
-    };
+    use crate::group::message_processor::ProposalMessageDescription;
+    use crate::group::proposal::Proposal;
+    use crate::group::test_utils::{test_group, test_group_custom_config};
+    use crate::group::ReceivedMessage;
+    use crate::psk::{ExternalPskId, PreSharedKey};
 
     use alloc::vec;
 
@@ -893,7 +888,8 @@ mod tests {
         // interim_transcript_hash to be computed from the confirmed_transcript_hash and
         // confirmation_tag, which is not the case for the initial interim_transcript_hash.
 
-        use crate::group::{message_processor::CommitEffect, CommitMessageDescription};
+        use crate::group::message_processor::CommitEffect;
+        use crate::group::CommitMessageDescription;
 
         let psk = PreSharedKey::from(b"psk".to_vec());
         let psk_id = ExternalPskId::new(b"psk id".to_vec());

mls-rs/src/client_builder.rs

@@ -6,25 +6,20 @@
 //!
 //! See [`ClientBuilder`].
 
-use crate::{
-    cipher_suite::CipherSuite,
-    client::Client,
-    client_config::ClientConfig,
-    extension::{ExtensionType, MlsExtension},
-    group::{
-        mls_rules::{DefaultMlsRules, MlsRules},
-        proposal::ProposalType,
-    },
-    identity::CredentialType,
-    identity::SigningIdentity,
-    protocol_version::ProtocolVersion,
-    psk::{ExternalPskId, PreSharedKey},
-    storage_provider::in_memory::{
-        InMemoryGroupStateStorage, InMemoryKeyPackageStorage, InMemoryPreSharedKeyStorage,
-    },
-    tree_kem::{Capabilities, Lifetime},
-    Sealed,
+use crate::cipher_suite::CipherSuite;
+use crate::client::Client;
+use crate::client_config::ClientConfig;
+use crate::extension::{ExtensionType, MlsExtension};
+use crate::group::mls_rules::{DefaultMlsRules, MlsRules};
+use crate::group::proposal::ProposalType;
+use crate::identity::{CredentialType, SigningIdentity};
+use crate::protocol_version::ProtocolVersion;
+use crate::psk::{ExternalPskId, PreSharedKey};
+use crate::storage_provider::in_memory::{
+    InMemoryGroupStateStorage, InMemoryKeyPackageStorage, InMemoryPreSharedKeyStorage,
 };
+use crate::tree_kem::{Capabilities, Lifetime};
+use crate::Sealed;
 
 #[cfg(feature = "std")]
 use crate::time::MlsTime;
@@ -927,11 +922,9 @@ pub(crate) fn recreate_config<T: ClientConfig>(
 /// Definitions meant to be private that are inaccessible outside this crate. They need to be marked
 /// `pub` because they appear in public definitions.
 mod private {
-    use mls_rs_core::{
-        crypto::{CipherSuite, SignatureSecretKey},
-        identity::SigningIdentity,
-        protocol_version::ProtocolVersion,
-    };
+    use mls_rs_core::crypto::{CipherSuite, SignatureSecretKey};
+    use mls_rs_core::identity::SigningIdentity;
+    use mls_rs_core::protocol_version::ProtocolVersion;
 
     use crate::client_builder::{IntoConfigOutput, Settings};
 
@@ -977,27 +970,21 @@ mod private {
     }
 }
 
-use mls_rs_core::{
-    crypto::{CryptoProvider, SignatureSecretKey},
-    extension::{ExtensionError, ExtensionList},
-    group::GroupStateStorage,
-    identity::IdentityProvider,
-    key_package::KeyPackageStorage,
-    psk::PreSharedKeyStorage,
-};
+use mls_rs_core::crypto::{CryptoProvider, SignatureSecretKey};
+use mls_rs_core::extension::{ExtensionError, ExtensionList};
+use mls_rs_core::group::GroupStateStorage;
+use mls_rs_core::identity::IdentityProvider;
+use mls_rs_core::key_package::KeyPackageStorage;
+use mls_rs_core::psk::PreSharedKeyStorage;
 use private::{Config, ConfigInner, IntoConfig};
 
 #[cfg(test)]
 pub(crate) mod test_utils {
-    use crate::{
-        client_builder::{BaseConfig, ClientBuilder, WithIdentityProvider},
-        crypto::test_utils::TestCryptoProvider,
-        identity::{
-            basic::BasicIdentityProvider,
-            test_utils::{get_test_signing_identity, BasicWithCustomProvider},
-        },
-        CipherSuite,
-    };
+    use crate::client_builder::{BaseConfig, ClientBuilder, WithIdentityProvider};
+    use crate::crypto::test_utils::TestCryptoProvider;
+    use crate::identity::basic::BasicIdentityProvider;
+    use crate::identity::test_utils::{get_test_signing_identity, BasicWithCustomProvider};
+    use crate::CipherSuite;
 
     use super::WithCryptoProvider;
 

mls-rs/src/client_config.rs

@@ -2,19 +2,20 @@
 // Copyright by contributors to this project.
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-use crate::{
-    extension::ExtensionType,
-    group::{mls_rules::MlsRules, proposal::ProposalType},
-    identity::CredentialType,
-    protocol_version::ProtocolVersion,
-    tree_kem::{leaf_node::ConfigProperties, Capabilities, Lifetime},
-    ExtensionList,
-};
+use crate::extension::ExtensionType;
+use crate::group::mls_rules::MlsRules;
+use crate::group::proposal::ProposalType;
+use crate::identity::CredentialType;
+use crate::protocol_version::ProtocolVersion;
+use crate::tree_kem::leaf_node::ConfigProperties;
+use crate::tree_kem::{Capabilities, Lifetime};
+use crate::ExtensionList;
 use alloc::vec::Vec;
-use mls_rs_core::{
-    crypto::CryptoProvider, group::GroupStateStorage, identity::IdentityProvider,
-    key_package::KeyPackageStorage, psk::PreSharedKeyStorage,
-};
+use mls_rs_core::crypto::CryptoProvider;
+use mls_rs_core::group::GroupStateStorage;
+use mls_rs_core::identity::IdentityProvider;
+use mls_rs_core::key_package::KeyPackageStorage;
+use mls_rs_core::psk::PreSharedKeyStorage;
 
 pub trait ClientConfig: Send + Sync + Clone {
     type KeyPackageRepository: KeyPackageStorage + Clone;

mls-rs/src/extension/built_in.rs

@@ -7,7 +7,8 @@ use core::fmt::{self, Debug};
 use mls_rs_codec::{MlsDecode, MlsEncode, MlsSize};
 use mls_rs_core::extension::{ExtensionType, MlsCodecExtension};
 
-use mls_rs_core::{group::ProposalType, identity::CredentialType};
+use mls_rs_core::group::ProposalType;
+use mls_rs_core::identity::CredentialType;
 
 #[cfg(feature = "by_ref_proposal")]
 use mls_rs_core::{