reformat rust sources to one import per line

Reviewed By: yancouto, mzr

Differential Revision: D37493536

fbshipit-source-id: f0e07b725236ffa8326f90e6dce7e06869ba23af

Author: mitrandir77

eden/mononoke/acl_regions/src/lib.rs

@@ -7,13 +7,18 @@
 
 mod trie;
 
-use anyhow::{anyhow, Result};
+use anyhow::anyhow;
+use anyhow::Result;
 use async_trait::async_trait;
 use changeset_fetcher::ArcChangesetFetcher;
 use context::CoreContext;
-use futures::stream::{self, StreamExt, TryStreamExt};
-use metaconfig_types::{AclRegion, AclRegionConfig};
-use mononoke_types::{ChangesetId, MPath};
+use futures::stream::StreamExt;
+use futures::stream::TryStreamExt;
+use futures::stream::{self};
+use metaconfig_types::AclRegion;
+use metaconfig_types::AclRegionConfig;
+use mononoke_types::ChangesetId;
+use mononoke_types::MPath;
 use reachabilityindex::ReachabilityIndex;
 use std::collections::HashMap;
 use std::sync::Arc;

eden/mononoke/acl_regions/src/trie.rs

@@ -6,7 +6,8 @@
  */
 
 use metaconfig_types::AclRegionRule;
-use mononoke_types::{MPath, MPathElement};
+use mononoke_types::MPath;
+use mononoke_types::MPathElement;
 use std::collections::HashMap;
 use std::sync::Arc;
 

eden/mononoke/acl_regions/test/main.rs

@@ -5,16 +5,21 @@
  * GNU General Public License version 2.
  */
 
-use acl_regions::{AclRegions, AclRegionsRef, AssociatedRulesResult};
+use acl_regions::AclRegions;
+use acl_regions::AclRegionsRef;
+use acl_regions::AssociatedRulesResult;
 use anyhow::Result;
 use bonsai_hg_mapping::BonsaiHgMapping;
 use bookmarks::Bookmarks;
 use changesets::Changesets;
 use context::CoreContext;
 use fbinit::FacebookInit;
 use filestore::FilestoreConfig;
-use metaconfig_types::{AclRegion, AclRegionConfig, AclRegionRule};
-use mononoke_types::{ChangesetId, MPath};
+use metaconfig_types::AclRegion;
+use metaconfig_types::AclRegionConfig;
+use metaconfig_types::AclRegionRule;
+use mononoke_types::ChangesetId;
+use mononoke_types::MPath;
 use pretty_assertions::assert_eq;
 use repo_blobstore::RepoBlobstore;
 use repo_derived_data::RepoDerivedData;

eden/mononoke/alpn/src/lib.rs

@@ -5,7 +5,8 @@
  * GNU General Public License version 2.
  */
 
-use anyhow::{Context, Error};
+use anyhow::Context;
+use anyhow::Error;
 
 pub const H2_ALPN: &str = "h2";
 pub const HGCLI_ALPN: &str = "hgcli";

eden/mononoke/benchmarks/derived_data/benchmark_large_directory.rs

@@ -17,16 +17,19 @@ use std::collections::BTreeSet;
 use anyhow::Result;
 use blobrepo::BlobRepo;
 use context::CoreContext;
-use deleted_manifest::{RootDeletedManifestIdCommon, RootDeletedManifestV2Id};
+use deleted_manifest::RootDeletedManifestIdCommon;
+use deleted_manifest::RootDeletedManifestV2Id;
 use derived_data::BonsaiDerived;
 use derived_data_manager::BonsaiDerivable as NewBonsaiDerivable;
 use fbinit::FacebookInit;
 use fsnodes::RootFsnodeId;
 use futures_stats::TimedFutureExt;
 use mercurial_derived_data::MappedHgChangesetId;
 use mononoke_types::ChangesetId;
-use rand::distributions::{Alphanumeric, Uniform};
-use rand::{thread_rng, Rng};
+use rand::distributions::Alphanumeric;
+use rand::distributions::Uniform;
+use rand::thread_rng;
+use rand::Rng;
 use skeleton_manifest::RootSkeletonManifestId;
 use tests_utils::CreateCommitContext;
 use unodes::RootUnodeManifestId;

eden/mononoke/benchmarks/simulated_repo/benchmark.rs

@@ -8,18 +8,26 @@
 //! This benchmark generates linear stack with specified parameters, and then
 //! measures how log it takes to convert it from Bonsai to Hg.
 
-use anyhow::{anyhow, Error, Result};
+use anyhow::anyhow;
+use anyhow::Error;
+use anyhow::Result;
 use blobrepo::BlobRepo;
 use clap::Arg;
-use cmdlib::args::{self, get_and_parse_opt, ArgType, MononokeMatches};
+use cmdlib::args::get_and_parse_opt;
+use cmdlib::args::ArgType;
+use cmdlib::args::MononokeMatches;
+use cmdlib::args::{self};
 use context::CoreContext;
-use derived_data_utils::{derived_data_utils, POSSIBLE_DERIVED_TYPES};
+use derived_data_utils::derived_data_utils;
+use derived_data_utils::POSSIBLE_DERIVED_TYPES;
 use fbinit::FacebookInit;
 use futures::future::TryFutureExt;
 use futures_stats::futures03::TimedFutureExt;
 use rand::SeedableRng;
 use rand_xorshift::XorShiftRng;
-use simulated_repo::{new_benchmark_repo, DelaySettings, GenManifest};
+use simulated_repo::new_benchmark_repo;
+use simulated_repo::DelaySettings;
+use simulated_repo::GenManifest;
 use tokio::runtime::Runtime;
 
 const ARG_SEED: &str = "seed";

eden/mononoke/benchmarks/simulated_repo/lib/gen.rs

@@ -6,17 +6,28 @@
  */
 
 //! Utilities to generate reasonably looking stack of changesets
-use anyhow::{Error, Result};
-use blobrepo::{save_bonsai_changesets, BlobRepo};
+use anyhow::Error;
+use anyhow::Result;
+use blobrepo::save_bonsai_changesets;
+use blobrepo::BlobRepo;
 use blobstore::Storable;
 use context::CoreContext;
-use futures::{future, stream, TryStreamExt};
-use mononoke_types::{
-    BlobstoreValue, BonsaiChangesetMut, ChangesetId, DateTime, FileChange, FileContents, FileType,
-    MPath, MPathElement,
-};
-use rand::{seq::SliceRandom, Rng};
-use rand_distr::{Binomial, Uniform};
+use futures::future;
+use futures::stream;
+use futures::TryStreamExt;
+use mononoke_types::BlobstoreValue;
+use mononoke_types::BonsaiChangesetMut;
+use mononoke_types::ChangesetId;
+use mononoke_types::DateTime;
+use mononoke_types::FileChange;
+use mononoke_types::FileContents;
+use mononoke_types::FileType;
+use mononoke_types::MPath;
+use mononoke_types::MPathElement;
+use rand::seq::SliceRandom;
+use rand::Rng;
+use rand_distr::Binomial;
+use rand_distr::Uniform;
 use std::collections::BTreeMap;
 
 #[derive(Clone, Copy)]

eden/mononoke/benchmarks/simulated_repo/lib/lib.rs

@@ -8,5 +8,7 @@
 mod gen;
 mod repository;
 
-pub use gen::{GenManifest, GenSettings};
-pub use repository::{new_benchmark_repo, DelaySettings};
+pub use gen::GenManifest;
+pub use gen::GenSettings;
+pub use repository::new_benchmark_repo;
+pub use repository::DelaySettings;

eden/mononoke/benchmarks/simulated_repo/lib/repository.rs

@@ -8,58 +8,90 @@
 //! Main function is `new_benchmark_repo` which creates `BlobRepo` which delay applied
 //! to all underlying stores, but which all the caching enabled.
 
-use anyhow::{anyhow, Error, Result};
+use anyhow::anyhow;
+use anyhow::Error;
+use anyhow::Result;
 use async_trait::async_trait;
 use blobrepo::BlobRepo;
 use blobstore::Blobstore;
-use bonsai_git_mapping::{ArcBonsaiGitMapping, SqlBonsaiGitMappingBuilder};
-use bonsai_globalrev_mapping::{ArcBonsaiGlobalrevMapping, SqlBonsaiGlobalrevMappingBuilder};
-use bonsai_hg_mapping::{
-    ArcBonsaiHgMapping, BonsaiHgMapping, BonsaiHgMappingEntry, BonsaiOrHgChangesetIds,
-    CachingBonsaiHgMapping, SqlBonsaiHgMappingBuilder,
-};
-use bonsai_svnrev_mapping::{ArcBonsaiSvnrevMapping, SqlBonsaiSvnrevMappingBuilder};
-use bookmarks::{bookmark_heads_fetcher, ArcBookmarkUpdateLog, ArcBookmarks};
-use cacheblob::{dummy::DummyLease, new_cachelib_blobstore, CachelibBlobstoreOptions};
-use changeset_fetcher::{ArcChangesetFetcher, SimpleChangesetFetcher};
-use changesets::{ArcChangesets, ChangesetEntry, ChangesetInsert, Changesets, SortOrder};
-use changesets_impl::{CachingChangesets, SqlChangesetsBuilder};
+use bonsai_git_mapping::ArcBonsaiGitMapping;
+use bonsai_git_mapping::SqlBonsaiGitMappingBuilder;
+use bonsai_globalrev_mapping::ArcBonsaiGlobalrevMapping;
+use bonsai_globalrev_mapping::SqlBonsaiGlobalrevMappingBuilder;
+use bonsai_hg_mapping::ArcBonsaiHgMapping;
+use bonsai_hg_mapping::BonsaiHgMapping;
+use bonsai_hg_mapping::BonsaiHgMappingEntry;
+use bonsai_hg_mapping::BonsaiOrHgChangesetIds;
+use bonsai_hg_mapping::CachingBonsaiHgMapping;
+use bonsai_hg_mapping::SqlBonsaiHgMappingBuilder;
+use bonsai_svnrev_mapping::ArcBonsaiSvnrevMapping;
+use bonsai_svnrev_mapping::SqlBonsaiSvnrevMappingBuilder;
+use bookmarks::bookmark_heads_fetcher;
+use bookmarks::ArcBookmarkUpdateLog;
+use bookmarks::ArcBookmarks;
+use cacheblob::dummy::DummyLease;
+use cacheblob::new_cachelib_blobstore;
+use cacheblob::CachelibBlobstoreOptions;
+use changeset_fetcher::ArcChangesetFetcher;
+use changeset_fetcher::SimpleChangesetFetcher;
+use changesets::ArcChangesets;
+use changesets::ChangesetEntry;
+use changesets::ChangesetInsert;
+use changesets::Changesets;
+use changesets::SortOrder;
+use changesets_impl::CachingChangesets;
+use changesets_impl::SqlChangesetsBuilder;
 use context::CoreContext;
-use dbbookmarks::{ArcSqlBookmarks, SqlBookmarksBuilder};
+use dbbookmarks::ArcSqlBookmarks;
+use dbbookmarks::SqlBookmarksBuilder;
 use delayblob::DelayedBlobstore;
 use fbinit::FacebookInit;
-use filenodes::{
-    ArcFilenodes, FilenodeInfo, FilenodeRangeResult, FilenodeResult, Filenodes, PreparedFilenode,
-};
-use filestore::{ArcFilestoreConfig, FilestoreConfig};
+use filenodes::ArcFilenodes;
+use filenodes::FilenodeInfo;
+use filenodes::FilenodeRangeResult;
+use filenodes::FilenodeResult;
+use filenodes::Filenodes;
+use filenodes::PreparedFilenode;
+use filestore::ArcFilestoreConfig;
+use filestore::FilestoreConfig;
 use futures::stream::BoxStream;
 use memblob::Memblob;
-use mercurial_mutation::{ArcHgMutationStore, SqlHgMutationStoreBuilder};
-use mercurial_types::{HgChangesetId, HgFileNodeId};
+use mercurial_mutation::ArcHgMutationStore;
+use mercurial_mutation::SqlHgMutationStoreBuilder;
+use mercurial_types::HgChangesetId;
+use mercurial_types::HgFileNodeId;
 use metaconfig_types::ArcRepoConfig;
-use mononoke_types::{
-    ChangesetId, ChangesetIdPrefix, ChangesetIdsResolvedFromPrefix, RepoPath, RepositoryId,
-};
-use mutable_counters::{ArcMutableCounters, SqlMutableCountersBuilder};
+use mononoke_types::ChangesetId;
+use mononoke_types::ChangesetIdPrefix;
+use mononoke_types::ChangesetIdsResolvedFromPrefix;
+use mononoke_types::RepoPath;
+use mononoke_types::RepositoryId;
+use mutable_counters::ArcMutableCounters;
+use mutable_counters::SqlMutableCountersBuilder;
 use newfilenodes::NewFilenodesBuilder;
 use phases::ArcPhases;
-use pushrebase_mutation_mapping::{
-    ArcPushrebaseMutationMapping, SqlPushrebaseMutationMappingConnection,
-};
+use pushrebase_mutation_mapping::ArcPushrebaseMutationMapping;
+use pushrebase_mutation_mapping::SqlPushrebaseMutationMappingConnection;
 use rand::Rng;
 use rand_distr::Distribution;
 use rendezvous::RendezVousOptions;
-use repo_blobstore::{ArcRepoBlobstore, RepoBlobstore};
-use repo_derived_data::{ArcRepoDerivedData, RepoDerivedData};
-use repo_identity::{ArcRepoIdentity, RepoIdentity};
-use repo_permission_checker::{AlwaysAllowMockRepoPermissionChecker, ArcRepoPermissionChecker};
+use repo_blobstore::ArcRepoBlobstore;
+use repo_blobstore::RepoBlobstore;
+use repo_derived_data::ArcRepoDerivedData;
+use repo_derived_data::RepoDerivedData;
+use repo_identity::ArcRepoIdentity;
+use repo_identity::RepoIdentity;
+use repo_permission_checker::AlwaysAllowMockRepoPermissionChecker;
+use repo_permission_checker::ArcRepoPermissionChecker;
 use scuba_ext::MononokeScubaSampleBuilder;
 use segmented_changelog::DisabledSegmentedChangelog;
 use segmented_changelog_types::ArcSegmentedChangelog;
-use skiplist::{ArcSkiplistIndex, SkiplistIndex};
+use skiplist::ArcSkiplistIndex;
+use skiplist::SkiplistIndex;
 use sql_construct::SqlConstruct;
 use sqlphases::SqlPhasesBuilder;
-use std::{sync::Arc, time::Duration};
+use std::sync::Arc;
+use std::time::Duration;
 
 pub type Normal = rand_distr::Normal<f64>;
 

eden/mononoke/blobimport_lib/src/bookmark.rs

@@ -8,17 +8,24 @@
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use anyhow::{format_err, Error};
+use anyhow::format_err;
+use anyhow::Error;
 use ascii::AsciiString;
 use cloned::cloned;
-use futures::{FutureExt, TryFutureExt};
-use futures_01_ext::{try_boxfuture, BoxFuture, FutureExt as _};
-use futures_old::{prelude::*, stream};
-use slog::{info, Logger};
+use futures::FutureExt;
+use futures::TryFutureExt;
+use futures_01_ext::try_boxfuture;
+use futures_01_ext::BoxFuture;
+use futures_01_ext::FutureExt as _;
+use futures_old::prelude::*;
+use futures_old::stream;
+use slog::info;
+use slog::Logger;
 
 use blobrepo::BlobRepo;
 use blobrepo_hg::BlobRepoHg;
-use bookmarks::{BookmarkName, BookmarkUpdateReason};
+use bookmarks::BookmarkName;
+use bookmarks::BookmarkUpdateReason;
 use context::CoreContext;
 use mercurial_revlog::RevlogRepo;
 use mercurial_types::HgChangesetId;