Rearrange "use" lines, mostly by cargo fmt.

control_plane/src/local_env.rs

@@ -6,9 +6,9 @@
 //
 use anyhow::{anyhow, Result};
 use serde::{Deserialize, Serialize};
-use std::{collections::BTreeMap, env};
 use std::fs;
 use std::path::PathBuf;
+use std::{collections::BTreeMap, env};
 use url::Url;
 
 pub type Remotes = BTreeMap<String, String>;

integration_tests/src/lib.rs

@@ -1,23 +1,22 @@
+use std::collections::BTreeMap;
+use std::convert::TryInto;
+use std::fs::{self, File, OpenOptions};
+use std::io::Read;
+use std::net::SocketAddr;
+use std::path::{Path, PathBuf};
+use std::process::{Command, ExitStatus};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::Arc;
+
 use anyhow::{bail, Result};
-use std::{collections::BTreeMap, sync::{atomic::AtomicBool, Arc}};
-use std::{
-    convert::TryInto,
-    fs::{self, File, OpenOptions},
-    io::Read,
-    net::SocketAddr,
-    path::{Path, PathBuf},
-    process::{Command, ExitStatus},
-    sync::atomic::Ordering,
-};
+use nix::sys::signal::{kill, Signal};
+use nix::unistd::Pid;
+use postgres;
 
 use control_plane::compute::PostgresNode;
 use control_plane::local_env;
 use control_plane::read_pidfile;
 use control_plane::{local_env::LocalEnv, storage::PageServerNode};
-use nix::sys::signal::{kill, Signal};
-use nix::unistd::Pid;
-
-use postgres;
 
 // local compute env for tests
 pub fn create_test_env(testname: &str) -> LocalEnv {

zenith/src/main.rs

@@ -1,12 +1,13 @@
-use std::{collections::btree_map::Entry, str::FromStr};
-use anyhow::Result;
-use anyhow::{anyhow, Context, bail};
+use anyhow::{anyhow, bail};
+use anyhow::{Context, Result};
 use clap::{App, Arg, ArgMatches, SubCommand};
-use std::collections::HashMap;
-use std::process::exit;
-use control_plane::storage::PageServerNode;
 use control_plane::compute::ComputeControlPlane;
 use control_plane::local_env::{self, LocalEnv};
+use control_plane::storage::PageServerNode;
+use std::collections::btree_map::Entry;
+use std::collections::HashMap;
+use std::process::exit;
+use std::str::FromStr;
 
 use pageserver::{branches::BranchInfo, ZTimelineId};
 use zenith_utils::lsn::Lsn;