Merge branch 'pmarks/deps'

Author: termoshtt

intel-mkl-tool/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "intel-mkl-tool"
-version = "0.2.0+mkl2020.1"
+version = "0.2.1+mkl2020.1"
 authors = ["Toshiki Teramura <[email protected]>"]
 edition = "2018"
 
@@ -24,7 +24,7 @@ pkg-config = "0.3.17"
 # archive
 curl = { version = "0.4.29", optional = true }
 tar  = { version = "0.4.29", optional = true }
-zstd = { version = "0.6.1",  optional = true }
+zstd = { version = "<=0.11, >=0.6",  optional = true }
 
 # CLI
 structopt = { version = "0.3.15", optional = true }

intel-mkl-tool/src/config.rs

@@ -1,4 +1,4 @@
-use crate::*;
+use anyhow::{bail, Result};
 use derive_more::Display;
 
 pub const VALID_CONFIGS: &[&str] = &[

intel-mkl-tool/src/download.rs

@@ -1,6 +1,7 @@
-use crate::*;
+use crate::{s3_addr, Config};
+use anyhow::Result;
 use curl::easy::Easy;
-use std::fs;
+use std::{fs, path::Path};
 
 impl Config {
     /// Download archive from AWS S3, and expand into `${out_dir}/*.so`

intel-mkl-tool/src/entry.rs

@@ -1,9 +1,11 @@
-use crate::*;
+use crate::{mkl, xdg_home_path, Config, LinkType, VALID_CONFIGS};
+use anyhow::{bail, Result};
 use derive_more::Deref;
 use std::{
     collections::{HashMap, HashSet},
     fs,
     io::{self, BufRead},
+    path::{Path, PathBuf},
 };
 
 #[derive(Debug, Deref)]

intel-mkl-tool/src/lib.rs

@@ -92,8 +92,7 @@
 
 #![cfg_attr(not(feature = "archive"), allow(dead_code))]
 
-use anyhow::{bail, Result};
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 
 mod config;
 mod entry;

intel-mkl-tool/src/package.rs

@@ -1,5 +1,9 @@
-use crate::*;
-use std::{fs, io};
+use crate::Entry;
+use anyhow::{bail, Result};
+use std::{
+    fs, io,
+    path::{Path, PathBuf},
+};
 
 impl Entry {
     pub fn package(&self, out_dir: &Path) -> Result<PathBuf> {