This is an automated email from the ASF dual-hosted git repository.
mssun pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-teaclave.git
The following commit(s) were added to refs/heads/develop by this push:
new f5f3e1f [fmt] rustfmt config to edition 2018 (#234)
f5f3e1f is described below
commit f5f3e1fa2951bb32e7db00e691173b983122e357
Author: Zhaofeng Chen <[email protected]>
AuthorDate: Mon Mar 9 17:34:58 2020 -0700
[fmt] rustfmt config to edition 2018 (#234)
---
.rustfmt.toml | 1 +
attestation/src/key.rs | 4 +--
common/rusty_leveldb_sgx/Cargo.toml | 1 +
common/rusty_leveldb_sgx/src/block.rs | 8 ++---
common/rusty_leveldb_sgx/src/block_builder.rs | 4 +--
common/rusty_leveldb_sgx/src/cmp.rs | 6 ++--
common/rusty_leveldb_sgx/src/db_impl.rs | 50 +++++++++++++--------------
common/rusty_leveldb_sgx/src/db_iter.rs | 14 ++++----
common/rusty_leveldb_sgx/src/disk_env.rs | 6 ++--
common/rusty_leveldb_sgx/src/env.rs | 30 ++++++++--------
common/rusty_leveldb_sgx/src/filter.rs | 2 +-
common/rusty_leveldb_sgx/src/filter_block.rs | 6 ++--
common/rusty_leveldb_sgx/src/key_types.rs | 4 +--
common/rusty_leveldb_sgx/src/lib.rs | 20 +++++------
common/rusty_leveldb_sgx/src/log.rs | 2 +-
common/rusty_leveldb_sgx/src/mem_env.rs | 8 ++---
common/rusty_leveldb_sgx/src/memtable.rs | 12 +++----
common/rusty_leveldb_sgx/src/merging_iter.rs | 10 +++---
common/rusty_leveldb_sgx/src/options.rs | 18 +++++-----
common/rusty_leveldb_sgx/src/skipmap.rs | 8 ++---
common/rusty_leveldb_sgx/src/snapshot.rs | 2 +-
common/rusty_leveldb_sgx/src/table_block.rs | 18 +++++-----
common/rusty_leveldb_sgx/src/table_builder.rs | 22 ++++++------
common/rusty_leveldb_sgx/src/table_cache.rs | 18 +++++-----
common/rusty_leveldb_sgx/src/table_reader.rs | 38 ++++++++++----------
common/rusty_leveldb_sgx/src/test_util.rs | 4 +--
common/rusty_leveldb_sgx/src/types.rs | 2 +-
common/rusty_leveldb_sgx/src/version.rs | 32 ++++++++---------
common/rusty_leveldb_sgx/src/version_edit.rs | 10 +++---
common/rusty_leveldb_sgx/src/version_set.rs | 30 ++++++++--------
common/rusty_leveldb_sgx/src/write_batch.rs | 6 ++--
31 files changed, 199 insertions(+), 197 deletions(-)
diff --git a/.rustfmt.toml b/.rustfmt.toml
new file mode 100644
index 0000000..c51666e
--- /dev/null
+++ b/.rustfmt.toml
@@ -0,0 +1 @@
+edition = "2018"
\ No newline at end of file
diff --git a/attestation/src/key.rs b/attestation/src/key.rs
index ebf99c5..38b783c 100644
--- a/attestation/src/key.rs
+++ b/attestation/src/key.rs
@@ -22,7 +22,7 @@ use std::prelude::v1::*;
pub const CERT_VALID_DAYS: i64 = 90i64;
-/// NistP256KeyPair stores a pair of ECDSA (private, public) key based on the
NIST P-256 curve
+/// NistP256KeyPair stores a pair of ECDSA (private, public) key based on the
NIST P-256 curve
/// (a.k.a secp256r1).
pub struct NistP256KeyPair {
prv_k: sgx_ec256_private_t,
@@ -75,7 +75,7 @@ impl NistP256KeyPair {
/// create_cert_with_extension makes a self-signed x509-v3 cert with SGX
attestation report as
/// extensions.
/// @reference [Internet X.509 Public Key Infrastructure Certificate and
Certificate Revocation List (CRL) Profile][1]
- ///
+ ///
/// [1]: https://tools.ietf.org/pdf/rfc5280.pdf
pub fn create_cert_with_extension(
&self,
diff --git a/common/rusty_leveldb_sgx/Cargo.toml
b/common/rusty_leveldb_sgx/Cargo.toml
index e230ed9..251d53b 100644
--- a/common/rusty_leveldb_sgx/Cargo.toml
+++ b/common/rusty_leveldb_sgx/Cargo.toml
@@ -9,6 +9,7 @@ readme = "README.md"
keywords = ["LevelDB", "key-value", "database", "SSTable", "Google"]
license = "MIT"
publish = true
+edition = "2018"
[features]
default = []
diff --git a/common/rusty_leveldb_sgx/src/block.rs
b/common/rusty_leveldb_sgx/src/block.rs
index ba917fd..487cb60 100644
--- a/common/rusty_leveldb_sgx/src/block.rs
+++ b/common/rusty_leveldb_sgx/src/block.rs
@@ -4,8 +4,8 @@ use std::prelude::v1::*;
use std::cmp::Ordering;
use std::rc::Rc;
-use options::Options;
-use types::LdbIterator;
+use crate::options::Options;
+use crate::types::LdbIterator;
use integer_encoding::FixedInt;
use integer_encoding::VarInt;
@@ -305,10 +305,10 @@ impl LdbIterator for BlockIter {
#[cfg(test)]
mod tests {
use super::*;
- use block_builder::BlockBuilder;
+ use crate::block_builder::BlockBuilder;
+ use crate::types::{current_key_val, LdbIterator};
use options;
use test_util::{test_iterator_properties, LdbIteratorIter};
- use types::{current_key_val, LdbIterator};
fn get_data() -> Vec<(&'static [u8], &'static [u8])> {
vec![
diff --git a/common/rusty_leveldb_sgx/src/block_builder.rs
b/common/rusty_leveldb_sgx/src/block_builder.rs
index 7a1c668..ce0c686 100644
--- a/common/rusty_leveldb_sgx/src/block_builder.rs
+++ b/common/rusty_leveldb_sgx/src/block_builder.rs
@@ -3,8 +3,8 @@ use std::prelude::v1::*;
use std::cmp::Ordering;
-use block::BlockContents;
-use options::Options;
+use crate::block::BlockContents;
+use crate::options::Options;
use integer_encoding::{FixedIntWriter, VarIntWriter};
diff --git a/common/rusty_leveldb_sgx/src/cmp.rs
b/common/rusty_leveldb_sgx/src/cmp.rs
index a65feac..12e3c80 100644
--- a/common/rusty_leveldb_sgx/src/cmp.rs
+++ b/common/rusty_leveldb_sgx/src/cmp.rs
@@ -1,8 +1,8 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use key_types::{self, LookupKey};
-use types;
+use crate::key_types::{self, LookupKey};
+use crate::types;
use std::cmp::Ordering;
use std::rc::Rc;
@@ -182,7 +182,7 @@ impl Cmp for MemtableKeyCmp {
#[cfg(test)]
mod tests {
use super::*;
- use key_types::LookupKey;
+ use crate::key_types::LookupKey;
use types;
#[test]
diff --git a/common/rusty_leveldb_sgx/src/db_impl.rs
b/common/rusty_leveldb_sgx/src/db_impl.rs
index 88e142f..50ccc92 100644
--- a/common/rusty_leveldb_sgx/src/db_impl.rs
+++ b/common/rusty_leveldb_sgx/src/db_impl.rs
@@ -8,31 +8,31 @@ use std::prelude::v1::*;
#[cfg(feature = "mesalock_sgx")]
use std::untrusted::path::PathEx;
-use db_iter::DBIterator;
-
-use cmp::{Cmp, InternalKeyCmp};
-use env::{Env, FileLock};
-use error::{err, Result, StatusCode};
-use filter::{BoxedFilterPolicy, InternalFilterPolicy};
-use infolog::Logger;
-use key_types::{parse_internal_key, InternalKey, LookupKey, ValueType};
-use log::{LogReader, LogWriter};
-use memtable::MemTable;
-use merging_iter::MergingIter;
-use options::Options;
-use snapshot::{Snapshot, SnapshotList};
-use table_builder::TableBuilder;
-use table_cache::{table_file_name, TableCache};
-use types::{
+use crate::db_iter::DBIterator;
+
+use crate::cmp::{Cmp, InternalKeyCmp};
+use crate::env::{Env, FileLock};
+use crate::error::{err, Result, StatusCode};
+use crate::filter::{BoxedFilterPolicy, InternalFilterPolicy};
+use crate::infolog::Logger;
+use crate::key_types::{parse_internal_key, InternalKey, LookupKey, ValueType};
+use crate::log::{LogReader, LogWriter};
+use crate::memtable::MemTable;
+use crate::merging_iter::MergingIter;
+use crate::options::Options;
+use crate::snapshot::{Snapshot, SnapshotList};
+use crate::table_builder::TableBuilder;
+use crate::table_cache::{table_file_name, TableCache};
+use crate::types::{
parse_file_name, share, FileMetaData, FileNum, FileType, LdbIterator,
SequenceNumber, Shared,
MAX_SEQUENCE_NUMBER, NUM_LEVELS,
};
-use version::Version;
-use version_edit::VersionEdit;
-use version_set::{
+use crate::version::Version;
+use crate::version_edit::VersionEdit;
+use crate::version_set::{
manifest_file_name, read_current_file, set_current_file, Compaction,
VersionSet,
};
-use write_batch::WriteBatch;
+use crate::write_batch::WriteBatch;
use std::cmp::Ordering;
use std::io::{self, BufWriter, Write};
@@ -1076,7 +1076,7 @@ fn open_info_log<E: Env + ?Sized, P: AsRef<Path>>(env:
&E, db: P) -> Logger {
pub mod testutil {
use super::*;
- use version::testutil::make_version;
+ use crate::version::testutil::make_version;
/// build_db creates a database filled with the tables created by
make_version().
pub fn build_db() -> (DB, Options) {
@@ -1135,12 +1135,12 @@ mod tests {
use super::testutil::{build_db, set_file_to_compact};
use super::*;
- use error::Status;
- use key_types::LookupKey;
- use mem_env::MemEnv;
+ use crate::error::Status;
+ use crate::key_types::LookupKey;
+ use crate::mem_env::MemEnv;
+ use crate::version::testutil::make_version;
use options;
use test_util::LdbIteratorIter;
- use version::testutil::make_version;
#[test]
fn test_db_impl_open_info_log() {
diff --git a/common/rusty_leveldb_sgx/src/db_iter.rs
b/common/rusty_leveldb_sgx/src/db_iter.rs
index bc57c83..ff5b9ff 100644
--- a/common/rusty_leveldb_sgx/src/db_iter.rs
+++ b/common/rusty_leveldb_sgx/src/db_iter.rs
@@ -1,12 +1,12 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use cmp::Cmp;
-use key_types::{parse_internal_key, truncate_to_userkey, LookupKey, ValueType};
-use merging_iter::MergingIter;
-use snapshot::Snapshot;
-use types::{Direction, LdbIterator, Shared};
-use version_set::VersionSet;
+use crate::cmp::Cmp;
+use crate::key_types::{parse_internal_key, truncate_to_userkey, LookupKey,
ValueType};
+use crate::merging_iter::MergingIter;
+use crate::snapshot::Snapshot;
+use crate::types::{Direction, LdbIterator, Shared};
+use crate::version_set::VersionSet;
use std::cmp::Ordering;
use std::mem;
@@ -290,10 +290,10 @@ fn random_period() -> isize {
#[cfg(test)]
mod tests {
use super::*;
+ use crate::types::{current_key_val, Direction};
use db_impl::testutil::*;
use db_impl::DB;
use test_util::LdbIteratorIter;
- use types::{current_key_val, Direction};
use std::collections::HashMap;
use std::collections::HashSet;
diff --git a/common/rusty_leveldb_sgx/src/disk_env.rs
b/common/rusty_leveldb_sgx/src/disk_env.rs
index 210bad3..af81ee3 100644
--- a/common/rusty_leveldb_sgx/src/disk_env.rs
+++ b/common/rusty_leveldb_sgx/src/disk_env.rs
@@ -1,9 +1,9 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use env::{path_to_str, Env, FileLock, Logger, RandomAccess};
-use env_common::micros;
-use error::{err, Result, Status, StatusCode};
+use crate::env::{path_to_str, Env, FileLock, Logger, RandomAccess};
+use crate::env_common::micros;
+use crate::error::{err, Result, Status, StatusCode};
use std::collections::HashMap;
diff --git a/common/rusty_leveldb_sgx/src/env.rs
b/common/rusty_leveldb_sgx/src/env.rs
index 29b4b50..64ead57 100644
--- a/common/rusty_leveldb_sgx/src/env.rs
+++ b/common/rusty_leveldb_sgx/src/env.rs
@@ -3,7 +3,7 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use error::Result;
+use crate::error::Result;
use std::io::prelude::*;
use std::os::unix::fs::FileExt;
@@ -12,7 +12,7 @@ use std::path::{Path, PathBuf};
cfg_if! {
if #[cfg(feature = "mesalock_sgx")] {
use protected_fs::ProtectedFile;
- use error::Status;
+ use crate::error::Status;
use std::untrusted::fs::File;
} else {
use std::fs::File;
@@ -44,24 +44,24 @@ pub struct FileLock {
}
pub trait Env {
- fn open_sequential_file(&self, &Path) -> Result<Box<dyn Read>>;
- fn open_random_access_file(&self, &Path) -> Result<Box<dyn RandomAccess>>;
- fn open_writable_file(&self, &Path) -> Result<Box<dyn Write>>;
- fn open_appendable_file(&self, &Path) -> Result<Box<dyn Write>>;
+ fn open_sequential_file(&self, p: &Path) -> Result<Box<dyn Read>>;
+ fn open_random_access_file(&self, p: &Path) -> Result<Box<dyn
RandomAccess>>;
+ fn open_writable_file(&self, p: &Path) -> Result<Box<dyn Write>>;
+ fn open_appendable_file(&self, p: &Path) -> Result<Box<dyn Write>>;
- fn exists(&self, &Path) -> Result<bool>;
- fn children(&self, &Path) -> Result<Vec<PathBuf>>;
- fn size_of(&self, &Path) -> Result<usize>;
+ fn exists(&self, p: &Path) -> Result<bool>;
+ fn children(&self, p: &Path) -> Result<Vec<PathBuf>>;
+ fn size_of(&self, p: &Path) -> Result<usize>;
- fn delete(&self, &Path) -> Result<()>;
- fn mkdir(&self, &Path) -> Result<()>;
- fn rmdir(&self, &Path) -> Result<()>;
- fn rename(&self, &Path, &Path) -> Result<()>;
+ fn delete(&self, p: &Path) -> Result<()>;
+ fn mkdir(&self, p: &Path) -> Result<()>;
+ fn rmdir(&self, p: &Path) -> Result<()>;
+ fn rename(&self, p: &Path, p: &Path) -> Result<()>;
- fn lock(&self, &Path) -> Result<FileLock>;
+ fn lock(&self, p: &Path) -> Result<FileLock>;
fn unlock(&self, l: FileLock) -> Result<()>;
- fn new_logger(&self, &Path) -> Result<Logger>;
+ fn new_logger(&self, p: &Path) -> Result<Logger>;
fn micros(&self) -> u64;
}
diff --git a/common/rusty_leveldb_sgx/src/filter.rs
b/common/rusty_leveldb_sgx/src/filter.rs
index 8b43292..a7c5371 100644
--- a/common/rusty_leveldb_sgx/src/filter.rs
+++ b/common/rusty_leveldb_sgx/src/filter.rs
@@ -237,7 +237,7 @@ fn offset_data_iterate<F: FnMut(&[u8])>(data: &[u8],
offsets: &[usize], mut f: F
#[cfg(test)]
mod tests {
use super::*;
- use key_types::LookupKey;
+ use crate::key_types::LookupKey;
const _BITS_PER_KEY: u32 = 12;
diff --git a/common/rusty_leveldb_sgx/src/filter_block.rs
b/common/rusty_leveldb_sgx/src/filter_block.rs
index dfac767..b963c4f 100644
--- a/common/rusty_leveldb_sgx/src/filter_block.rs
+++ b/common/rusty_leveldb_sgx/src/filter_block.rs
@@ -1,8 +1,8 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use block::BlockContents;
-use filter::BoxedFilterPolicy;
+use crate::block::BlockContents;
+use crate::filter::BoxedFilterPolicy;
use std::rc::Rc;
@@ -169,7 +169,7 @@ mod tests {
use super::get_filter_index;
use super::FILTER_BASE_LOG2;
use super::*;
- use filter::BloomPolicy;
+ use crate::filter::BloomPolicy;
#[test]
fn test_filter_index() {
diff --git a/common/rusty_leveldb_sgx/src/key_types.rs
b/common/rusty_leveldb_sgx/src/key_types.rs
index 4f10b10..00219f8 100644
--- a/common/rusty_leveldb_sgx/src/key_types.rs
+++ b/common/rusty_leveldb_sgx/src/key_types.rs
@@ -1,8 +1,8 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use cmp::Cmp;
-use types::SequenceNumber;
+use crate::cmp::Cmp;
+use crate::types::SequenceNumber;
use std::cmp::Ordering;
use std::io::Write;
diff --git a/common/rusty_leveldb_sgx/src/lib.rs
b/common/rusty_leveldb_sgx/src/lib.rs
index c25d181..dd90aa9 100644
--- a/common/rusty_leveldb_sgx/src/lib.rs
+++ b/common/rusty_leveldb_sgx/src/lib.rs
@@ -85,15 +85,15 @@ mod write_batch;
mod db_impl;
mod db_iter;
-pub use cmp::{Cmp, DefaultCmp};
+pub use crate::cmp::{Cmp, DefaultCmp};
+pub use crate::db_iter::DBIterator;
+pub use crate::env::Env;
+pub use crate::error::{Result, Status, StatusCode};
+pub use crate::filter::{BloomPolicy, FilterPolicy};
+pub use crate::mem_env::MemEnv;
+pub use crate::options::{in_memory, CompressionType, Options};
+pub use crate::skipmap::SkipMap;
+pub use crate::types::LdbIterator;
+pub use crate::write_batch::WriteBatch;
pub use db_impl::DB;
-pub use db_iter::DBIterator;
pub use disk_env::PosixDiskEnv;
-pub use env::Env;
-pub use error::{Result, Status, StatusCode};
-pub use filter::{BloomPolicy, FilterPolicy};
-pub use mem_env::MemEnv;
-pub use options::{in_memory, CompressionType, Options};
-pub use skipmap::SkipMap;
-pub use types::LdbIterator;
-pub use write_batch::WriteBatch;
diff --git a/common/rusty_leveldb_sgx/src/log.rs
b/common/rusty_leveldb_sgx/src/log.rs
index 2db4fb6..75eb554 100644
--- a/common/rusty_leveldb_sgx/src/log.rs
+++ b/common/rusty_leveldb_sgx/src/log.rs
@@ -5,7 +5,7 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use error::{err, Result, StatusCode};
+use crate::error::{err, Result, StatusCode};
use std::io::{Read, Write};
diff --git a/common/rusty_leveldb_sgx/src/mem_env.rs
b/common/rusty_leveldb_sgx/src/mem_env.rs
index d76c295..986caba 100644
--- a/common/rusty_leveldb_sgx/src/mem_env.rs
+++ b/common/rusty_leveldb_sgx/src/mem_env.rs
@@ -2,9 +2,9 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use env::{path_to_str, path_to_string, Env, FileLock, Logger, RandomAccess};
-use env_common::micros;
-use error::{err, Result, StatusCode};
+use crate::env::{path_to_str, path_to_string, Env, FileLock, Logger,
RandomAccess};
+use crate::env_common::micros;
+use crate::error::{err, Result, StatusCode};
use std::collections::hash_map::Entry;
use std::collections::HashMap;
@@ -357,7 +357,7 @@ impl Env for MemEnv {
#[cfg(test)]
mod tests {
use super::*;
- use env;
+ use crate::env;
fn new_memfile(v: Vec<u8>) -> MemFile {
MemFile(Arc::new(Mutex::new(v)))
diff --git a/common/rusty_leveldb_sgx/src/memtable.rs
b/common/rusty_leveldb_sgx/src/memtable.rs
index 90b53cf..467ecd5 100644
--- a/common/rusty_leveldb_sgx/src/memtable.rs
+++ b/common/rusty_leveldb_sgx/src/memtable.rs
@@ -1,11 +1,11 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use cmp::{Cmp, MemtableKeyCmp};
-use key_types::{build_memtable_key, parse_internal_key, parse_memtable_key,
ValueType};
-use key_types::{LookupKey, UserKey};
-use skipmap::{SkipMap, SkipMapIter};
-use types::{current_key_val, LdbIterator, SequenceNumber};
+use crate::cmp::{Cmp, MemtableKeyCmp};
+use crate::key_types::{build_memtable_key, parse_internal_key,
parse_memtable_key, ValueType};
+use crate::key_types::{LookupKey, UserKey};
+use crate::skipmap::{SkipMap, SkipMapIter};
+use crate::types::{current_key_val, LdbIterator, SequenceNumber};
use std::rc::Rc;
@@ -157,7 +157,7 @@ fn shift_left(s: &mut Vec<u8>, mid: usize) {
#[allow(unused_variables)]
mod tests {
use super::*;
- use key_types::*;
+ use crate::key_types::*;
use options;
use test_util::{test_iterator_properties, LdbIteratorIter};
diff --git a/common/rusty_leveldb_sgx/src/merging_iter.rs
b/common/rusty_leveldb_sgx/src/merging_iter.rs
index 133cddb..af90393 100644
--- a/common/rusty_leveldb_sgx/src/merging_iter.rs
+++ b/common/rusty_leveldb_sgx/src/merging_iter.rs
@@ -1,8 +1,8 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use cmp::Cmp;
-use types::{current_key_val, Direction, LdbIterator};
+use crate::cmp::Cmp;
+use crate::types::{current_key_val, Direction, LdbIterator};
use std::cmp::Ordering;
use std::rc::Rc;
@@ -201,10 +201,10 @@ impl LdbIterator for MergingIter {
mod tests {
use super::*;
- use cmp::DefaultCmp;
- use skipmap::tests;
+ use crate::cmp::DefaultCmp;
+ use crate::skipmap::tests;
+ use crate::types::{current_key_val, LdbIterator};
use test_util::{test_iterator_properties, LdbIteratorIter, TestLdbIter};
- use types::{current_key_val, LdbIterator};
#[test]
fn test_merging_one() {
diff --git a/common/rusty_leveldb_sgx/src/options.rs
b/common/rusty_leveldb_sgx/src/options.rs
index 8d4b124..d9ce94c 100644
--- a/common/rusty_leveldb_sgx/src/options.rs
+++ b/common/rusty_leveldb_sgx/src/options.rs
@@ -1,16 +1,16 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use block::Block;
-use cache::Cache;
-use cmp::{Cmp, DefaultCmp};
-use disk_env;
+use crate::block::Block;
+use crate::cache::Cache;
+use crate::cmp::{Cmp, DefaultCmp};
+use crate::disk_env;
-use env::Env;
-use filter;
-use infolog::{self, Logger};
-use mem_env::MemEnv;
-use types::{share, Shared};
+use crate::env::Env;
+use crate::filter;
+use crate::infolog::{self, Logger};
+use crate::mem_env::MemEnv;
+use crate::types::{share, Shared};
use std::rc::Rc;
diff --git a/common/rusty_leveldb_sgx/src/skipmap.rs
b/common/rusty_leveldb_sgx/src/skipmap.rs
index 2f37fb9..34bc704 100644
--- a/common/rusty_leveldb_sgx/src/skipmap.rs
+++ b/common/rusty_leveldb_sgx/src/skipmap.rs
@@ -1,10 +1,10 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use cmp::{Cmp, MemtableKeyCmp};
+use crate::cmp::{Cmp, MemtableKeyCmp};
+use crate::types::LdbIterator;
use rand::rngs::StdRng;
use rand::{RngCore, SeedableRng};
-use types::LdbIterator;
use std::cell::RefCell;
use std::cmp::Ordering;
@@ -361,10 +361,10 @@ impl LdbIterator for SkipMapIter {
#[cfg(test)]
pub mod tests {
use super::*;
- use cmp::MemtableKeyCmp;
+ use crate::cmp::MemtableKeyCmp;
+ use crate::types::current_key_val;
use options;
use test_util::{test_iterator_properties, LdbIteratorIter};
- use types::current_key_val;
pub fn make_skipmap() -> SkipMap {
let mut skm = SkipMap::new(options::for_test().cmp);
diff --git a/common/rusty_leveldb_sgx/src/snapshot.rs
b/common/rusty_leveldb_sgx/src/snapshot.rs
index cc1ad8c..1577d57 100644
--- a/common/rusty_leveldb_sgx/src/snapshot.rs
+++ b/common/rusty_leveldb_sgx/src/snapshot.rs
@@ -1,5 +1,5 @@
+use crate::types::{share, SequenceNumber, Shared, MAX_SEQUENCE_NUMBER};
use std::collections::HashMap;
-use types::{share, SequenceNumber, Shared, MAX_SEQUENCE_NUMBER};
use std::rc::Rc;
diff --git a/common/rusty_leveldb_sgx/src/table_block.rs
b/common/rusty_leveldb_sgx/src/table_block.rs
index b0d342b..30fa460 100644
--- a/common/rusty_leveldb_sgx/src/table_block.rs
+++ b/common/rusty_leveldb_sgx/src/table_block.rs
@@ -1,15 +1,15 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use block::Block;
-use blockhandle::BlockHandle;
-use env::RandomAccess;
-use error::{err, Result, StatusCode};
-use filter;
-use filter_block::FilterBlockReader;
-use log::unmask_crc;
-use options::{self, CompressionType, Options};
-use table_builder;
+use crate::block::Block;
+use crate::blockhandle::BlockHandle;
+use crate::env::RandomAccess;
+use crate::error::{err, Result, StatusCode};
+use crate::filter;
+use crate::filter_block::FilterBlockReader;
+use crate::log::unmask_crc;
+use crate::options::{self, CompressionType, Options};
+use crate::table_builder;
use crc::crc32::{self, Hasher32};
use integer_encoding::FixedInt;
diff --git a/common/rusty_leveldb_sgx/src/table_builder.rs
b/common/rusty_leveldb_sgx/src/table_builder.rs
index 495b995..4313757 100644
--- a/common/rusty_leveldb_sgx/src/table_builder.rs
+++ b/common/rusty_leveldb_sgx/src/table_builder.rs
@@ -1,16 +1,16 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use block::BlockContents;
-use block_builder::BlockBuilder;
-use blockhandle::BlockHandle;
-use cmp::InternalKeyCmp;
-use error::Result;
-use filter::{InternalFilterPolicy, NoFilterPolicy};
-use filter_block::FilterBlockBuilder;
-use key_types::InternalKey;
-use log::mask_crc;
-use options::{CompressionType, Options};
+use crate::block::BlockContents;
+use crate::block_builder::BlockBuilder;
+use crate::blockhandle::BlockHandle;
+use crate::cmp::InternalKeyCmp;
+use crate::error::Result;
+use crate::filter::{InternalFilterPolicy, NoFilterPolicy};
+use crate::filter_block::FilterBlockBuilder;
+use crate::key_types::InternalKey;
+use crate::log::mask_crc;
+use crate::options::{CompressionType, Options};
use std::cmp::Ordering;
use std::io::Write;
@@ -276,7 +276,7 @@ impl<Dst: Write> TableBuilder<Dst> {
#[cfg(test)]
mod tests {
use super::*;
- use blockhandle::BlockHandle;
+ use crate::blockhandle::BlockHandle;
use options;
#[test]
diff --git a/common/rusty_leveldb_sgx/src/table_cache.rs
b/common/rusty_leveldb_sgx/src/table_cache.rs
index 6e453a6..cbde776 100644
--- a/common/rusty_leveldb_sgx/src/table_cache.rs
+++ b/common/rusty_leveldb_sgx/src/table_cache.rs
@@ -4,12 +4,12 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use cache::{self, Cache};
-use error::{err, Result, StatusCode};
-use key_types::InternalKey;
-use options::Options;
-use table_reader::Table;
-use types::FileNum;
+use crate::cache::{self, Cache};
+use crate::error::{err, Result, StatusCode};
+use crate::key_types::InternalKey;
+use crate::options::Options;
+use crate::table_reader::Table;
+use crate::types::FileNum;
use integer_encoding::FixedIntWriter;
@@ -91,10 +91,10 @@ impl TableCache {
#[cfg(test)]
mod tests {
use super::*;
- use cache;
- use mem_env::MemEnv;
+ use crate::cache;
+ use crate::mem_env::MemEnv;
+ use crate::table_builder::TableBuilder;
use options;
- use table_builder::TableBuilder;
use test_util::LdbIteratorIter;
#[test]
diff --git a/common/rusty_leveldb_sgx/src/table_reader.rs
b/common/rusty_leveldb_sgx/src/table_reader.rs
index 7520a54..0e61819 100644
--- a/common/rusty_leveldb_sgx/src/table_reader.rs
+++ b/common/rusty_leveldb_sgx/src/table_reader.rs
@@ -1,19 +1,19 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use block::{Block, BlockIter};
-use blockhandle::BlockHandle;
-use cache;
-use cmp::InternalKeyCmp;
-use env::RandomAccess;
-use error::Result;
-use filter;
-use filter_block::FilterBlockReader;
-use key_types::InternalKey;
-use options::Options;
-use table_block;
-use table_builder::{self, Footer};
-use types::{current_key_val, LdbIterator};
+use crate::block::{Block, BlockIter};
+use crate::blockhandle::BlockHandle;
+use crate::cache;
+use crate::cmp::InternalKeyCmp;
+use crate::env::RandomAccess;
+use crate::error::Result;
+use crate::filter;
+use crate::filter_block::FilterBlockReader;
+use crate::key_types::InternalKey;
+use crate::options::Options;
+use crate::table_block;
+use crate::table_builder::{self, Footer};
+use crate::types::{current_key_val, LdbIterator};
use std::cmp::Ordering;
use std::rc::Rc;
@@ -355,12 +355,12 @@ impl LdbIterator for TableIterator {
#[cfg(test)]
mod tests {
- use filter::BloomPolicy;
- use key_types::LookupKey;
- use options::{self, CompressionType};
- use table_builder::TableBuilder;
+ use crate::filter::BloomPolicy;
+ use crate::key_types::LookupKey;
+ use crate::options::{self, CompressionType};
+ use crate::table_builder::TableBuilder;
+ use crate::types::{current_key_val, LdbIterator};
use test_util::{test_iterator_properties, LdbIteratorIter};
- use types::{current_key_val, LdbIterator};
use super::*;
@@ -685,7 +685,7 @@ mod tests {
// general, but here we want to see that the other infrastructure works
too.
#[test]
fn test_table_internal_keys() {
- use key_types::LookupKey;
+ use crate::key_types::LookupKey;
let (src, size) = build_internal_table();
diff --git a/common/rusty_leveldb_sgx/src/test_util.rs
b/common/rusty_leveldb_sgx/src/test_util.rs
index f38cd82..868161d 100644
--- a/common/rusty_leveldb_sgx/src/test_util.rs
+++ b/common/rusty_leveldb_sgx/src/test_util.rs
@@ -1,8 +1,8 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use cmp::{Cmp, DefaultCmp};
-use types::{current_key_val, LdbIterator};
+use crate::cmp::{Cmp, DefaultCmp};
+use crate::types::{current_key_val, LdbIterator};
use std::cmp::Ordering;
diff --git a/common/rusty_leveldb_sgx/src/types.rs
b/common/rusty_leveldb_sgx/src/types.rs
index 7e2c601..fc48ede 100644
--- a/common/rusty_leveldb_sgx/src/types.rs
+++ b/common/rusty_leveldb_sgx/src/types.rs
@@ -2,7 +2,7 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use error::{err, Result, StatusCode};
+use crate::error::{err, Result, StatusCode};
use std::cell::RefCell;
use std::path::Path;
diff --git a/common/rusty_leveldb_sgx/src/version.rs
b/common/rusty_leveldb_sgx/src/version.rs
index 346b3e4..0564373 100644
--- a/common/rusty_leveldb_sgx/src/version.rs
+++ b/common/rusty_leveldb_sgx/src/version.rs
@@ -1,12 +1,12 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use cmp::{Cmp, InternalKeyCmp};
-use error::Result;
-use key_types::{parse_internal_key, InternalKey, LookupKey, UserKey,
ValueType};
-use table_cache::TableCache;
-use table_reader::TableIterator;
-use types::{FileMetaData, FileNum, LdbIterator, Shared, MAX_SEQUENCE_NUMBER,
NUM_LEVELS};
+use crate::cmp::{Cmp, InternalKeyCmp};
+use crate::error::Result;
+use crate::key_types::{parse_internal_key, InternalKey, LookupKey, UserKey,
ValueType};
+use crate::table_cache::TableCache;
+use crate::table_reader::TableIterator;
+use crate::types::{FileMetaData, FileNum, LdbIterator, Shared,
MAX_SEQUENCE_NUMBER, NUM_LEVELS};
use std::cmp::Ordering;
use std::default::Default;
@@ -576,13 +576,13 @@ fn some_file_overlaps_range<'a, 'b>(
#[cfg(test)]
pub mod testutil {
use super::*;
- use cmp::DefaultCmp;
- use env::Env;
- use key_types::ValueType;
- use options::{self, Options};
- use table_builder::TableBuilder;
- use table_cache::table_file_name;
- use types::{share, FileMetaData, FileNum};
+ use crate::cmp::DefaultCmp;
+ use crate::env::Env;
+ use crate::key_types::ValueType;
+ use crate::options::{self, Options};
+ use crate::table_builder::TableBuilder;
+ use crate::table_cache::table_file_name;
+ use crate::types::{share, FileMetaData, FileNum};
use std::path::Path;
@@ -725,9 +725,9 @@ mod tests {
use super::testutil::*;
use super::*;
- use cmp::DefaultCmp;
- use error::Result;
- use merging_iter::MergingIter;
+ use crate::cmp::DefaultCmp;
+ use crate::error::Result;
+ use crate::merging_iter::MergingIter;
use options;
use test_util::{test_iterator_properties, LdbIteratorIter};
diff --git a/common/rusty_leveldb_sgx/src/version_edit.rs
b/common/rusty_leveldb_sgx/src/version_edit.rs
index a8a23de..fd6f159 100644
--- a/common/rusty_leveldb_sgx/src/version_edit.rs
+++ b/common/rusty_leveldb_sgx/src/version_edit.rs
@@ -1,9 +1,9 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use error::{err, Result, StatusCode};
-use key_types::InternalKey;
-use types::{FileMetaData, FileNum, SequenceNumber};
+use crate::error::{err, Result, StatusCode};
+use crate::key_types::InternalKey;
+use crate::types::{FileMetaData, FileNum, SequenceNumber};
use integer_encoding::{VarIntReader, VarIntWriter};
@@ -304,8 +304,8 @@ mod tests {
use super::CompactionPointer;
use super::VersionEdit;
- use cmp::{Cmp, DefaultCmp};
- use types::FileMetaData;
+ use crate::cmp::{Cmp, DefaultCmp};
+ use crate::types::FileMetaData;
#[test]
fn test_version_edit_encode_decode() {
diff --git a/common/rusty_leveldb_sgx/src/version_set.rs
b/common/rusty_leveldb_sgx/src/version_set.rs
index e8c6834..6d61297 100644
--- a/common/rusty_leveldb_sgx/src/version_set.rs
+++ b/common/rusty_leveldb_sgx/src/version_set.rs
@@ -1,19 +1,19 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
-use cmp::{Cmp, InternalKeyCmp};
-use env::Env;
-use error::{err, Result, Status, StatusCode};
-use key_types::{parse_internal_key, InternalKey, UserKey};
-use log::{LogReader, LogWriter};
-use merging_iter::MergingIter;
-use options::Options;
-use table_cache::TableCache;
-use types::{
+use crate::cmp::{Cmp, InternalKeyCmp};
+use crate::env::Env;
+use crate::error::{err, Result, Status, StatusCode};
+use crate::key_types::{parse_internal_key, InternalKey, UserKey};
+use crate::log::{LogReader, LogWriter};
+use crate::merging_iter::MergingIter;
+use crate::options::Options;
+use crate::table_cache::TableCache;
+use crate::types::{
parse_file_name, share, FileMetaData, FileNum, FileType, LdbIterator,
Shared, NUM_LEVELS,
};
-use version::{new_version_iter, total_size, FileMetaHandle, Version};
-use version_edit::VersionEdit;
+use crate::version::{new_version_iter, total_size, FileMetaHandle, Version};
+use crate::version_edit::VersionEdit;
use std::cmp::Ordering;
use std::collections::HashSet;
@@ -980,11 +980,11 @@ fn get_range<'a, C: Cmp, I: Iterator<Item = &'a
FileMetaHandle>>(
#[cfg(test)]
mod tests {
use super::*;
- use cmp::DefaultCmp;
- use key_types::LookupKey;
+ use crate::cmp::DefaultCmp;
+ use crate::key_types::LookupKey;
+ use crate::types::FileMetaData;
+ use crate::version::testutil::make_version;
use test_util::LdbIteratorIter;
- use types::FileMetaData;
- use version::testutil::make_version;
fn example_files() -> Vec<FileMetaHandle> {
let mut f1 = FileMetaData::default();
diff --git a/common/rusty_leveldb_sgx/src/write_batch.rs
b/common/rusty_leveldb_sgx/src/write_batch.rs
index 47fcd44..5e900fe 100644
--- a/common/rusty_leveldb_sgx/src/write_batch.rs
+++ b/common/rusty_leveldb_sgx/src/write_batch.rs
@@ -1,10 +1,10 @@
#[cfg(feature = "mesalock_sgx")]
use std::prelude::v1::*;
+use crate::key_types::ValueType;
+use crate::memtable::MemTable;
+use crate::types::SequenceNumber;
use integer_encoding::{FixedInt, VarInt, VarIntWriter};
-use key_types::ValueType;
-use memtable::MemTable;
-use types::SequenceNumber;
use std::io::Write;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
