diff --git a/components/encryption/export/examples/ecli.rs b/components/encryption/export/examples/ecli.rs index 2cb6d3d8dad..bb645534277 100644 --- a/components/encryption/export/examples/ecli.rs +++ b/components/encryption/export/examples/ecli.rs @@ -1,8 +1,5 @@ // Copyright 2020 TiKV Project Authors. Licensed under Apache-2.0. -#[macro_use] -extern crate tikv_util; - use std::io::{Read, Write}; pub use cloud::kms::Config as CloudConfig; @@ -15,6 +12,7 @@ use kvproto::encryptionpb::EncryptedContent; use protobuf::Message; use structopt::clap::arg_enum; use structopt::StructOpt; +use tikv_util::box_err; arg_enum! { #[derive(Debug)] diff --git a/components/encryption/export/src/lib.rs b/components/encryption/export/src/lib.rs index e6b2201645a..87af45d68fd 100644 --- a/components/encryption/export/src/lib.rs +++ b/components/encryption/export/src/lib.rs @@ -1,12 +1,9 @@ -#![feature(min_specialization)] -#[macro_use] -extern crate slog_global; - use async_trait::async_trait; use derive_more::Deref; use error_code::{self, ErrorCode, ErrorCodeExt}; use std::fmt::Debug; use std::path::Path; +use tikv_util::error; use tikv_util::impl_format_delegate_newtype; use tikv_util::stream::RetryError;