Skip to content

Commit

Permalink
encryption: import macros with the use syntax (tikv#9951)
Browse files Browse the repository at this point in the history
Signed-off-by: lhy1024 <[email protected]>

Co-authored-by: Ti Chi Robot <[email protected]>
  • Loading branch information
lhy1024 and ti-chi-bot authored Apr 6, 2021
1 parent fef37f8 commit 0b46e60
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
4 changes: 1 addition & 3 deletions components/encryption/export/examples/ecli.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)]
Expand Down
5 changes: 1 addition & 4 deletions components/encryption/export/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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;

Expand Down

0 comments on commit 0b46e60

Please sign in to comment.