From 220ae2e8a9cda6f0023c4ad8268975fe6f9a1360 Mon Sep 17 00:00:00 2001
From: "Hatter Jiang@Pixelbook" <jht5945@gmail.com>
Date: Sun, 2 Aug 2020 14:39:29 +0800
Subject: [PATCH] style: code style

---
 src/build_json.rs | 13 ++++---------
 src/http.rs       |  8 ++------
 src/jdk.rs        |  6 +-----
 src/local_util.rs |  4 +---
 src/main.rs       |  4 ++--
 src/misc.rs       |  1 -
 src/tool.rs       |  8 ++++----
 7 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/src/build_json.rs b/src/build_json.rs
index 0df2fcf..dd09aba 100644
--- a/src/build_json.rs
+++ b/src/build_json.rs
@@ -1,13 +1,8 @@
-use std::{ fs, path::Path, };
+use std::{ fs, path::Path };
+use rust_util::{ XResult, new_box_ioerror };
 
-use rust_util::{
-    iff,
-    XResult,
-    new_box_ioerror,
-};
-
-use super::http::get_url_content;
-use super::misc::VERBOSE;
+use crate::http::get_url_content;
+use crate::misc::VERBOSE;
 
 pub const BUILD_JSON: &str = "build.json";
 
diff --git a/src/http.rs b/src/http.rs
index 795e935..7ea2146 100644
--- a/src/http.rs
+++ b/src/http.rs
@@ -1,11 +1,7 @@
 use std::fs::File;
+use rust_util::{ XResult, util_io::copy_io };
 
-use rust_util::{
-    XResult,
-    util_io::copy_io,
-};
-
-use super::misc::VERBOSE;
+use crate::misc::VERBOSE;
 
 pub fn download_url(url: &str, dest: &mut File) -> XResult<()> {
     if *VERBOSE {
diff --git a/src/jdk.rs b/src/jdk.rs
index 3ae95f1..79306b7 100644
--- a/src/jdk.rs
+++ b/src/jdk.rs
@@ -7,11 +7,7 @@ use std::{
     process::Command,
 };
 use rust_util::util_os::*;
-use super::{
-    local_util,
-    tool,
-    misc::*,
-};
+use crate::{ local_util, tool, misc::* };
 
 const PATH: &str = "PATH";
 const JAVA_HOME: &str = "JAVA_HOME";
diff --git a/src/local_util.rs b/src/local_util.rs
index f06e5ea..ee4aa6b 100644
--- a/src/local_util.rs
+++ b/src/local_util.rs
@@ -6,18 +6,16 @@ use std::{
     process::Command,
     time::SystemTime,
 };
-
 use rust_util::{
     XResult,
     new_box_ioerror,
     util_io::*,
 };
-
 use crypto::{
     digest::Digest,
     md5::Md5,
     sha1::Sha1,
-    sha2::{Sha256, Sha512},
+    sha2::{ Sha256, Sha512 },
 };
 
 pub fn get_args_as_vec() -> Vec<String> {
diff --git a/src/main.rs b/src/main.rs
index 92ecb33..bb1792a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -24,9 +24,9 @@ use jdk::*;
 use build_json::*;
 use misc::*;
 
-const BUILDJ: &str = "buildj";
+const BUILDJ:     &str = "buildj";
 const BUDERJ_VER: &str = env!("CARGO_PKG_VERSION");
-const GIT_HASH: &str = env!("GIT_HASH");
+const GIT_HASH:   &str = env!("GIT_HASH");
 const BUILD_DATE: &str = env!("BUILD_DATE");
 
 
diff --git a/src/misc.rs b/src/misc.rs
index 5c89693..c0c837a 100644
--- a/src/misc.rs
+++ b/src/misc.rs
@@ -1,4 +1,3 @@
-
 use std::env;
 use rust_util::util_env::*;
 
diff --git a/src/tool.rs b/src/tool.rs
index 471e6b8..5dfe99e 100644
--- a/src/tool.rs
+++ b/src/tool.rs
@@ -1,5 +1,5 @@
 use std::{
-    fs::{self, File},
+    fs::{ self, File },
     path::Path,
 };
 use rust_util::{
@@ -7,9 +7,9 @@ use rust_util::{
     new_box_ioerror,
     util_os::is_macos_or_linux,
 };
-use super::{
-    http::{ download_url, get_url_content, },
-    local_util::{self, *},
+use crate::{
+    http::{ download_url, get_url_content },
+    local_util::{ self, * },
     misc::*,
 };