Reformat imports to a consistent style for imports

rustfmt.toml configuration:
  imports_granularity = "One"
  group_imports = "One"
This commit is contained in:
Michael Vines
2021-12-03 09:00:31 -08:00
parent 0ef1b25e4b
commit b8837c04ec
397 changed files with 5990 additions and 5175 deletions

View File

@ -154,8 +154,7 @@ fn extract_release_archive(
archive: &Path,
extract_dir: &Path,
) -> Result<(), Box<dyn std::error::Error>> {
use bzip2::bufread::BzDecoder;
use tar::Archive;
use {bzip2::bufread::BzDecoder, tar::Archive};
let progress_bar = new_spinner_progress_bar();
progress_bar.set_message(format!("{}Extracting...", PACKAGE));
@ -308,8 +307,7 @@ fn check_env_path_for_bin_dir(config: &Config) {
/// Encodes a UTF-8 string as a null-terminated UCS-2 string in bytes
#[cfg(windows)]
pub fn string_to_winreg_bytes(s: &str) -> Vec<u8> {
use std::ffi::OsString;
use std::os::windows::ffi::OsStrExt;
use std::{ffi::OsString, os::windows::ffi::OsStrExt};
let v: Vec<_> = OsString::from(format!("{}\x00", s)).encode_wide().collect();
unsafe { std::slice::from_raw_parts(v.as_ptr() as *const u8, v.len() * 2).to_vec() }
}
@ -320,8 +318,7 @@ pub fn string_to_winreg_bytes(s: &str) -> Vec<u8> {
// conversion.
#[cfg(windows)]
pub fn string_from_winreg_value(val: &winreg::RegValue) -> Option<String> {
use std::slice;
use winreg::enums::RegType;
use {std::slice, winreg::enums::RegType};
match val.vtype {
RegType::REG_SZ | RegType::REG_EXPAND_SZ => {
@ -347,8 +344,10 @@ pub fn string_from_winreg_value(val: &winreg::RegValue) -> Option<String> {
// should not mess with it.
#[cfg(windows)]
fn get_windows_path_var() -> Result<Option<String>, String> {
use winreg::enums::{HKEY_CURRENT_USER, KEY_READ, KEY_WRITE};
use winreg::RegKey;
use winreg::{
enums::{HKEY_CURRENT_USER, KEY_READ, KEY_WRITE},
RegKey,
};
let root = RegKey::predef(HKEY_CURRENT_USER);
let environment = root
@ -372,13 +371,19 @@ fn get_windows_path_var() -> Result<Option<String>, String> {
#[cfg(windows)]
fn add_to_path(new_path: &str) -> bool {
use std::ptr;
use winapi::shared::minwindef::*;
use winapi::um::winuser::{
SendMessageTimeoutA, HWND_BROADCAST, SMTO_ABORTIFHUNG, WM_SETTINGCHANGE,
use {
std::ptr,
winapi::{
shared::minwindef::*,
um::winuser::{
SendMessageTimeoutA, HWND_BROADCAST, SMTO_ABORTIFHUNG, WM_SETTINGCHANGE,
},
},
winreg::{
enums::{RegType, HKEY_CURRENT_USER, KEY_READ, KEY_WRITE},
RegKey, RegValue,
},
};
use winreg::enums::{RegType, HKEY_CURRENT_USER, KEY_READ, KEY_WRITE};
use winreg::{RegKey, RegValue};
let old_path = if let Some(s) =
get_windows_path_var().unwrap_or_else(|err| panic!("Unable to get PATH: {}", err))

View File

@ -2,9 +2,11 @@ use {
crate::update_manifest::UpdateManifest,
serde::{Deserialize, Serialize},
solana_sdk::pubkey::Pubkey,
std::fs::{create_dir_all, File},
std::io::{self, Write},
std::path::{Path, PathBuf},
std::{
fs::{create_dir_all, File},
io::{self, Write},
path::{Path, PathBuf},
},
};
#[derive(Serialize, Deserialize, Debug, PartialEq)]