From ab3e69997bb84d9abe688bd91f6bb7e13410b35b Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Fri, 3 Apr 2020 08:12:54 +0800
Subject: [PATCH] remove unnessary pub

---
 src/config_util.rs |  8 ++++----
 src/main.rs        | 20 ++++++++++----------
 src/pgp_util.rs    |  1 +
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/config_util.rs b/src/config_util.rs
index 443b9f6..2828a39 100644
--- a/src/config_util.rs
+++ b/src/config_util.rs
@@ -130,11 +130,11 @@ pub fn remove_start_end_slash(s: &str) -> String {
     let mut ss = s;
     while ss.starts_with("/") {
         ss = &ss[1..]
-   }
-   while ss.ends_with("/") {
+    }
+    while ss.ends_with("/") {
         ss = &ss[0..(ss.len() - 1)];
-   }
-   ss.to_string()
+    }
+    ss.to_string()
 }
 
 pub fn parse_config(config_json: &json::JsonValue) -> OSSBackupdConfig {
diff --git a/src/main.rs b/src/main.rs
index 55c94a9..241c8d2 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,11 @@
 // #[macro_use]
 // extern crate lazy_static;
 extern crate sequoia_openpgp as openpgp;
-pub mod oss_util;
-pub mod pgp_util;
-pub mod config_util;
-pub mod zip_util;
-pub mod opt;
+mod oss_util;
+mod pgp_util;
+mod config_util;
+mod zip_util;
+mod opt;
 
 use std::{
     fs::{self, File},
@@ -61,7 +61,7 @@ fn main() -> XResult<()> {
     Ok(())
 }
 
-pub fn process_config_item(options: &Options, config_item: &OSSBackupdConfigItem, 
+fn process_config_item(options: &Options, config_item: &OSSBackupdConfigItem, 
         oss_backupd_config :&OSSBackupdConfig, item_index: i32) -> Result<(), String> {
     if options.verbose {
         print_message(MessageType::DEBUG, &format!("Process config item index: {}, config: {:?}", item_index, config_item));
@@ -188,7 +188,7 @@ pub fn process_config_item(options: &Options, config_item: &OSSBackupdConfigItem
     Ok(())
 }
 
-pub fn process_oss_files(options: &Options, oss_client: &OSSClient, bucket_name: &str, path: &str, meta_file_name: &str, new_file: &str, limit: usize) -> XResult<()> {
+fn process_oss_files(options: &Options, oss_client: &OSSClient, bucket_name: &str, path: &str, meta_file_name: &str, new_file: &str, limit: usize) -> XResult<()> {
     let meta_file_key = &format!("{}/{}", path, meta_file_name);
     if options.verbose {
         print_message(MessageType::DEBUG, &format!("Read meta file: {}", meta_file_key));
@@ -214,7 +214,7 @@ pub fn process_oss_files(options: &Options, oss_client: &OSSClient, bucket_name:
     Ok(())
 }
 
-pub fn process_new_backup_file(backup_content_json: &str, new_item: &str, limit: usize) -> XResult<(Vec<String>, String)> {
+fn process_new_backup_file(backup_content_json: &str, new_item: &str, limit: usize) -> XResult<(Vec<String>, String)> {
     let mut removed_vec: Vec<String> = vec![];
     let mut parsed_vec = parse_json_array(backup_content_json)?;
     while parsed_vec.len() + 1 > limit {
@@ -228,7 +228,7 @@ pub fn process_new_backup_file(backup_content_json: &str, new_item: &str, limit:
 }
 
 // stringify JSON array
-pub fn stringity_json_array(vec: &Vec<String>) -> XResult<String> {
+fn stringity_json_array(vec: &Vec<String>) -> XResult<String> {
     let mut json_arr = json::JsonValue::new_array();
     for v in vec {
         json_arr.push(json::JsonValue::from(v.as_str()))?;
@@ -237,7 +237,7 @@ pub fn stringity_json_array(vec: &Vec<String>) -> XResult<String> {
 }
 
 // parse JSON array
-pub fn parse_json_array(arr: &str) -> XResult<Vec<String>> {
+fn parse_json_array(arr: &str) -> XResult<Vec<String>> {
     let mut vec: Vec<String> = vec![];
     if !arr.is_empty() {
         let json_arr = &json::parse(&arr)?;
diff --git a/src/pgp_util.rs b/src/pgp_util.rs
index e0d9d88..68f236f 100644
--- a/src/pgp_util.rs
+++ b/src/pgp_util.rs
@@ -45,6 +45,7 @@ impl OpenPGPTool {
         })
     }
 
+    #[allow(dead_code)]
     pub fn from_bytes(bs: &[u8]) -> XResult<OpenPGPTool> {
         Ok(OpenPGPTool{
             tpk: TPK::from_bytes(&bs)?,