first pass of merging in warp (doesn't build)

app/src/integration_testing/terminal/util.rs

@@ -1,21 +1,19 @@
-use async_io::block_on;
-use command::blocking::Command;
-use galaxy_core::command::ExitCode;
-#[cfg(windows)]
-use galaxy_core::paths::base_config_dir;
 use std::borrow::Cow;
 use std::iter;
 use std::path::{Path, PathBuf};
 
-use rand::Rng;
-use rand::{distributions::Alphanumeric, thread_rng};
+use async_io::block_on;
+use command::blocking::Command;
+use rand::distributions::Alphanumeric;
+use rand::{thread_rng, Rng};
 use regex::Regex;
+use galaxy_core::command::ExitCode;
+#[cfg(windows)]
+use galaxy_core::paths::base_config_dir;
 
+use crate::terminal::local_tty::shell::{DirectShellStarter, ShellStarter, ShellStarterSource};
+use crate::terminal::shell;
 use crate::terminal::shell::ShellType;
-use crate::terminal::{
-    local_tty::shell::{DirectShellStarter, ShellStarter, ShellStarterSource},
-    shell,
-};
 
 /// Returns the shell starter along with the version of the shell about to be run.
 pub fn current_shell_starter_and_version() -> (DirectShellStarter, String) {