From 74f04b2069294bc26fa8b17e4bf0952697d32c59 Mon Sep 17 00:00:00 2001 From: timotree3 Date: Sun, 22 Dec 2019 00:11:41 -0500 Subject: [PATCH 1/4] hc: Update to 2018 edition --- crates/cli/Cargo.toml | 1 + crates/cli/src/cli/hash_dna.rs | 2 +- crates/cli/src/cli/init.rs | 4 ++-- crates/cli/src/cli/keygen.rs | 2 +- crates/cli/src/cli/run.rs | 6 ++---- crates/cli/src/main.rs | 33 +++++---------------------------- 6 files changed, 12 insertions(+), 36 deletions(-) diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index 2c259204d6..ef15f5f118 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -6,6 +6,7 @@ homepage = "https://github.com/holochain/holochain-rust" documentation = "https://github.com/holochain/holochain-rust" version = "0.0.41-alpha4" authors = ["Holochain Core Dev Team "] +edition = "2018" [dependencies] holochain_core_types = { version = "=0.0.41-alpha4", path = "../core_types" } diff --git a/crates/cli/src/cli/hash_dna.rs b/crates/cli/src/cli/hash_dna.rs index d845551d55..3f615a10f8 100644 --- a/crates/cli/src/cli/hash_dna.rs +++ b/crates/cli/src/cli/hash_dna.rs @@ -1,4 +1,4 @@ -use error::DefaultResult; +use crate::error::DefaultResult; use failure::err_msg; use holochain_conductor_lib::conductor::Conductor; use holochain_persistence_api::cas::content::{Address, AddressableContent}; diff --git a/crates/cli/src/cli/init.rs b/crates/cli/src/cli/init.rs index 5cc9779f03..91f373d61d 100644 --- a/crates/cli/src/cli/init.rs +++ b/crates/cli/src/cli/init.rs @@ -138,9 +138,9 @@ pub fn init(path: &PathBuf) -> DefaultResult<()> { #[cfg(test)] pub mod tests { - use super::*; - extern crate tempfile; use self::tempfile::{Builder, TempDir}; + use super::*; + use tempfile; const HOLOCHAIN_TEST_PREFIX: &str = "org_holochain_test"; diff --git a/crates/cli/src/cli/keygen.rs b/crates/cli/src/cli/keygen.rs index 3cd89871ad..0943683098 100644 --- a/crates/cli/src/cli/keygen.rs +++ b/crates/cli/src/cli/keygen.rs @@ -1,4 +1,4 @@ -use error::DefaultResult; +use crate::error::DefaultResult; use holochain_common::paths::keys_directory; use holochain_conductor_lib::{key_loaders::mock_passphrase_manager, keystore::Keystore}; use rpassword; diff --git a/crates/cli/src/cli/run.rs b/crates/cli/src/cli/run.rs index 1c00ffd9c5..bb95a46d41 100644 --- a/crates/cli/src/cli/run.rs +++ b/crates/cli/src/cli/run.rs @@ -1,7 +1,5 @@ -use crate::NetworkingType; -use cli; +use crate::{cli, error::DefaultResult, NetworkingType}; use colored::*; -use error::DefaultResult; use holochain_common::env_vars::EnvVar; use holochain_conductor_lib::{ conductor::{mount_conductor_from_config, Conductor, CONDUCTOR}, @@ -284,7 +282,7 @@ impl Networking { #[cfg(test)] mod tests { - extern crate tempfile; + use tempfile; // use crate::cli::init::{init, tests::gen_dir}; // use assert_cmd::prelude::*; // use std::{env, process::Command, path::PathBuf}; diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index b7d69ce7fc..cd9a4985c4 100755 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -1,38 +1,15 @@ #![warn(unused_extern_crates)] -extern crate holochain_common; -extern crate holochain_conductor_lib; -extern crate holochain_core; -extern crate holochain_core_types; -extern crate holochain_json_api; -extern crate holochain_locksmith; -extern crate holochain_net; -extern crate holochain_persistence_api; -extern crate holochain_persistence_file; -extern crate json_patch; -extern crate lib3h_crypto_api; -extern crate lib3h_protocol; -extern crate lib3h_sodium; -extern crate sim2h; -extern crate structopt; +use holochain_common; + +use lib3h_sodium; + #[macro_use] extern crate failure; #[macro_use] extern crate serde_derive; -extern crate base64; -extern crate colored; -extern crate semver; + #[macro_use] extern crate serde_json; -extern crate dns_lookup; -extern crate flate2; -extern crate glob; -extern crate ignore; -extern crate in_stream; -extern crate rpassword; -extern crate tar; -extern crate tempfile; -extern crate tera; -extern crate url2; mod cli; mod config_files; From 16939300fcb1718f8053e9b61ef29f927e63573b Mon Sep 17 00:00:00 2001 From: timotree3 Date: Sun, 22 Dec 2019 00:20:28 -0500 Subject: [PATCH 2/4] hc: Remove last `extern crate` --- crates/cli/src/cli/chain_log.rs | 1 + crates/cli/src/cli/generate.rs | 1 + crates/cli/src/cli/init.rs | 1 + crates/cli/src/cli/package.rs | 3 ++- crates/cli/src/cli/run.rs | 2 ++ crates/cli/src/cli/test.rs | 3 ++- crates/cli/src/config_files/app.rs | 1 + crates/cli/src/config_files/build.rs | 2 ++ crates/cli/src/config_files/dht.rs | 2 ++ crates/cli/src/error.rs | 2 +- crates/cli/src/main.rs | 8 ++------ crates/cli/src/util.rs | 1 + 12 files changed, 18 insertions(+), 9 deletions(-) diff --git a/crates/cli/src/cli/chain_log.rs b/crates/cli/src/cli/chain_log.rs index 30176da3bf..d1d1091f86 100644 --- a/crates/cli/src/cli/chain_log.rs +++ b/crates/cli/src/cli/chain_log.rs @@ -1,5 +1,6 @@ use crate::error::DefaultResult; use colored::*; +use failure::format_err; use holochain_core::{ agent::{ chain_store::ChainStore, diff --git a/crates/cli/src/cli/generate.rs b/crates/cli/src/cli/generate.rs index 69afe5d94f..4b7bb7dc39 100644 --- a/crates/cli/src/cli/generate.rs +++ b/crates/cli/src/cli/generate.rs @@ -1,4 +1,5 @@ use crate::error::DefaultResult; +use failure::format_err; use flate2::read::GzDecoder; use glob::glob; use std::{ diff --git a/crates/cli/src/cli/init.rs b/crates/cli/src/cli/init.rs index 91f373d61d..d682179cf0 100644 --- a/crates/cli/src/cli/init.rs +++ b/crates/cli/src/cli/init.rs @@ -8,6 +8,7 @@ use crate::{ util::DIST_DIR_NAME, }; use colored::*; +use failure::bail; use serde_json; use std::{ collections::HashMap, diff --git a/crates/cli/src/cli/package.rs b/crates/cli/src/cli/package.rs index 364b6b3fe9..a50bdd9a41 100644 --- a/crates/cli/src/cli/package.rs +++ b/crates/cli/src/cli/package.rs @@ -1,13 +1,14 @@ use crate::{config_files::Build, error::DefaultResult, util}; use base64; use colored::*; +use failure::format_err; use holochain_core::nucleus::ribosome::{run_dna, WasmCallData}; use holochain_core_types::dna::Dna; use holochain_json_api::json::JsonString; use holochain_persistence_api::cas::content::AddressableContent; use ignore::WalkBuilder; use json_patch::merge; -use serde_json::{self, Map, Value}; +use serde_json::{self, json, Map, Value}; use std::{ convert::TryFrom, fs::{self, File}, diff --git a/crates/cli/src/cli/run.rs b/crates/cli/src/cli/run.rs index bb95a46d41..5471db6a01 100644 --- a/crates/cli/src/cli/run.rs +++ b/crates/cli/src/cli/run.rs @@ -1,5 +1,6 @@ use crate::{cli, error::DefaultResult, NetworkingType}; use colored::*; +use failure::format_err; use holochain_common::env_vars::EnvVar; use holochain_conductor_lib::{ conductor::{mount_conductor_from_config, Conductor, CONDUCTOR}, @@ -12,6 +13,7 @@ use holochain_conductor_lib::{ use holochain_core_types::agent::AgentId; use holochain_net::sim2h_worker::Sim2hConfig; use holochain_persistence_api::cas::content::AddressableContent; +use serde_json::json; use std::{fs, path::PathBuf}; pub enum Networking { diff --git a/crates/cli/src/cli/test.rs b/crates/cli/src/cli/test.rs index 3b21703e2f..6e00cd7d82 100644 --- a/crates/cli/src/cli/test.rs +++ b/crates/cli/src/cli/test.rs @@ -1,6 +1,7 @@ use crate::{cli::package, error::DefaultResult, util}; use colored::*; -use failure::Error; +use failure::{ensure, Error}; +use serde_json::json; use std::{ io::ErrorKind, path::PathBuf, diff --git a/crates/cli/src/config_files/app.rs b/crates/cli/src/config_files/app.rs index 2fb891e18c..0edc0bf160 100644 --- a/crates/cli/src/config_files/app.rs +++ b/crates/cli/src/config_files/app.rs @@ -1,5 +1,6 @@ use crate::config_files::Dht; use semver::Version; +use serde_derive::{Deserialize, Serialize}; use serde_json::Value; #[derive(Serialize, Deserialize, Clone)] diff --git a/crates/cli/src/config_files/build.rs b/crates/cli/src/config_files/build.rs index 91681d5855..3522e05c1e 100644 --- a/crates/cli/src/config_files/build.rs +++ b/crates/cli/src/config_files/build.rs @@ -1,5 +1,7 @@ use crate::{error::DefaultResult, util}; use base64; +use failure::bail; +use serde_derive::{Deserialize, Serialize}; use serde_json; use std::{ fs::File, diff --git a/crates/cli/src/config_files/dht.rs b/crates/cli/src/config_files/dht.rs index 316507fed4..1be5b4c8a5 100644 --- a/crates/cli/src/config_files/dht.rs +++ b/crates/cli/src/config_files/dht.rs @@ -1,2 +1,4 @@ +use serde_derive::{Deserialize, Serialize}; + #[derive(Serialize, Deserialize, Clone)] pub struct Dht {} diff --git a/crates/cli/src/error.rs b/crates/cli/src/error.rs index bf284f6ac3..17090986c8 100644 --- a/crates/cli/src/error.rs +++ b/crates/cli/src/error.rs @@ -1,4 +1,4 @@ -use failure::Error; +use failure::{format_err, Error, Fail}; #[derive(Debug, Fail)] pub enum HolochainError { diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index cd9a4985c4..18a4364fc0 100755 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -3,13 +3,9 @@ use holochain_common; use lib3h_sodium; -#[macro_use] -extern crate failure; -#[macro_use] -extern crate serde_derive; +use failure::format_err; -#[macro_use] -extern crate serde_json; +use serde_json::json; mod cli; mod config_files; diff --git a/crates/cli/src/util.rs b/crates/cli/src/util.rs index 83ec17cf14..e988df1981 100644 --- a/crates/cli/src/util.rs +++ b/crates/cli/src/util.rs @@ -1,5 +1,6 @@ use crate::error::DefaultResult; use colored::*; +use failure::{ensure, format_err}; pub use holochain_common::paths::DNA_EXTENSION; use std::{ fs, From 50c68b0aed75f36c42bfea985d33ca99f707296e Mon Sep 17 00:00:00 2001 From: timotree3 Date: Sun, 22 Dec 2019 00:21:05 -0500 Subject: [PATCH 3/4] hc: Remove unnecessary lint annotation for unused extern crate --- crates/cli/src/main.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 18a4364fc0..0a5aa36da7 100755 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -1,4 +1,3 @@ -#![warn(unused_extern_crates)] use holochain_common; use lib3h_sodium; From fc1b5940f22f57419d7b10a44daa8725f322aa67 Mon Sep 17 00:00:00 2001 From: timotree3 Date: Sun, 22 Dec 2019 00:30:30 -0500 Subject: [PATCH 4/4] hc: Reformat imports --- crates/cli/src/main.rs | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 0a5aa36da7..9bfa5c87b9 100755 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -1,21 +1,17 @@ +use crate::error::{HolochainError, HolochainResult}; +use failure::format_err; use holochain_common; - +use holochain_conductor_lib::happ_bundle::HappBundle; use lib3h_sodium; - -use failure::format_err; - use serde_json::json; +use std::{fs::File, io::Read, path::PathBuf, str::FromStr}; +use structopt::{clap::arg_enum, StructOpt}; mod cli; mod config_files; mod error; mod util; -use crate::error::{HolochainError, HolochainResult}; -use holochain_conductor_lib::happ_bundle::HappBundle; -use std::{fs::File, io::Read, path::PathBuf, str::FromStr}; -use structopt::{clap::arg_enum, StructOpt}; - #[derive(StructOpt)] /// A command line for Holochain enum Cli {