From 9a586ce704eff32bb9997d7aa40192eb67406d58 Mon Sep 17 00:00:00 2001
From: Thomas Heck <t@b128.net>
Date: Sat, 13 Feb 2021 19:03:01 +0100
Subject: [PATCH] use unambiguous crate `use`s

---
 crdt-enc-gpgme/src/lib.rs           | 14 +++++++-------
 crdt-enc-sodium/src/lib.rs          | 14 +++++++-------
 crdt-enc-tokio/src/lib.rs           | 18 +++++++++---------
 crdt-enc/src/cryptor.rs             | 10 +++++-----
 crdt-enc/src/key_cryptor.rs         | 12 ++++++------
 crdt-enc/src/lib.rs                 | 16 ++++++++--------
 crdt-enc/src/storage.rs             | 10 +++++-----
 crdt-enc/src/utils.rs               |  6 +++---
 crdt-enc/src/utils/version_bytes.rs |  8 ++++----
 examples/test/src/main.rs           | 10 +++++-----
 10 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/crdt-enc-gpgme/src/lib.rs b/crdt-enc-gpgme/src/lib.rs
index 18dc7ee..9d08e9e 100644
--- a/crdt-enc-gpgme/src/lib.rs
+++ b/crdt-enc-gpgme/src/lib.rs
@@ -1,10 +1,10 @@
-use anyhow::{Context, Error, Result};
-use async_trait::async_trait;
-use crdt_enc::{key_cryptor::Keys, utils::VersionBytes, CoreSubHandle, Info};
-use crdts::{CmRDT, CvRDT, MVReg, Orswot};
-use serde::{Deserialize, Serialize};
-use std::{convert::Infallible, fmt::Debug, sync::Mutex as SyncMutex};
-use uuid::Uuid;
+use ::anyhow::{Context, Error, Result};
+use ::async_trait::async_trait;
+use ::crdt_enc::{key_cryptor::Keys, utils::VersionBytes, CoreSubHandle, Info};
+use ::crdts::{CmRDT, CvRDT, MVReg, Orswot};
+use ::serde::{Deserialize, Serialize};
+use ::std::{convert::Infallible, fmt::Debug, sync::Mutex as SyncMutex};
+use ::uuid::Uuid;
 
 pub fn init() {
     gpgme::init();
diff --git a/crdt-enc-sodium/src/lib.rs b/crdt-enc-sodium/src/lib.rs
index 1ef142b..5dba305 100644
--- a/crdt-enc-sodium/src/lib.rs
+++ b/crdt-enc-sodium/src/lib.rs
@@ -1,10 +1,10 @@
-use anyhow::{Context, Error, Result};
-use async_trait::async_trait;
-use crdt_enc::utils::{VersionBytes, VersionBytesRef};
-use serde::{Deserialize, Serialize};
-use sodiumoxide::crypto::secretbox;
-use std::{borrow::Cow, fmt::Debug};
-use uuid::Uuid;
+use ::anyhow::{Context, Error, Result};
+use ::async_trait::async_trait;
+use ::crdt_enc::utils::{VersionBytes, VersionBytesRef};
+use ::serde::{Deserialize, Serialize};
+use ::sodiumoxide::crypto::secretbox;
+use ::std::{borrow::Cow, fmt::Debug};
+use ::uuid::Uuid;
 
 const DATA_VERSION: Uuid = Uuid::from_u128(0xc7f269be_0ff5_4a77_99c3_7c23c96d5cb4);
 
diff --git a/crdt-enc-tokio/src/lib.rs b/crdt-enc-tokio/src/lib.rs
index 1c4e9d9..248a628 100644
--- a/crdt-enc-tokio/src/lib.rs
+++ b/crdt-enc-tokio/src/lib.rs
@@ -1,24 +1,24 @@
+use ::anyhow::{ensure, Context, Error, Result};
+use ::async_trait::async_trait;
 use ::bytes::Buf;
-use anyhow::{ensure, Context, Error, Result};
-use async_trait::async_trait;
-use crdt_enc::utils::{VersionBytes, VersionBytesRef};
-use futures::{
+use ::crdt_enc::utils::{VersionBytes, VersionBytesRef};
+use ::futures::{
     future::{Either, TryFutureExt},
     stream::{self, Stream, StreamExt, TryStreamExt},
 };
-use std::{
+use ::std::{
     convert::TryFrom,
     fmt::Debug,
     path::{Path, PathBuf},
     str::FromStr,
 };
-use tiny_keccak::{Hasher, Sha3};
-use tokio::{
+use ::tiny_keccak::{Hasher, Sha3};
+use ::tokio::{
     fs,
     io::{self, AsyncWriteExt},
 };
-use tokio_stream::wrappers::ReadDirStream;
-use uuid::Uuid;
+use ::tokio_stream::wrappers::ReadDirStream;
+use ::uuid::Uuid;
 
 #[derive(Debug)]
 pub struct Storage {
diff --git a/crdt-enc/src/cryptor.rs b/crdt-enc/src/cryptor.rs
index c2f7f34..2081054 100644
--- a/crdt-enc/src/cryptor.rs
+++ b/crdt-enc/src/cryptor.rs
@@ -2,11 +2,11 @@ use crate::{
     utils::{VersionBytes, VersionBytesRef},
     CoreSubHandle, Info,
 };
-use anyhow::Result;
-use async_trait::async_trait;
-use crdts::MVReg;
-use std::fmt::Debug;
-use uuid::Uuid;
+use ::anyhow::Result;
+use ::async_trait::async_trait;
+use ::crdts::MVReg;
+use ::std::fmt::Debug;
+use ::uuid::Uuid;
 
 #[async_trait]
 pub trait Cryptor
diff --git a/crdt-enc/src/key_cryptor.rs b/crdt-enc/src/key_cryptor.rs
index 013ddd4..6e51fa0 100644
--- a/crdt-enc/src/key_cryptor.rs
+++ b/crdt-enc/src/key_cryptor.rs
@@ -2,18 +2,18 @@ use crate::{
     utils::{VersionBytes, VersionBytesRef},
     CoreSubHandle, Info,
 };
-use anyhow::Result;
-use async_trait::async_trait;
-use crdts::{CmRDT, CvRDT, MVReg, Orswot};
-use serde::{Deserialize, Serialize};
-use std::{
+use ::anyhow::Result;
+use ::async_trait::async_trait;
+use ::crdts::{CmRDT, CvRDT, MVReg, Orswot};
+use ::serde::{Deserialize, Serialize};
+use ::std::{
     borrow::Borrow,
     cmp::{Eq, Ord, Ordering, PartialEq},
     convert::Infallible,
     fmt::Debug,
     hash::{Hash, Hasher},
 };
-use uuid::Uuid;
+use ::uuid::Uuid;
 
 #[async_trait]
 pub trait KeyCryptor
diff --git a/crdt-enc/src/lib.rs b/crdt-enc/src/lib.rs
index d85b26a..f1f19cb 100644
--- a/crdt-enc/src/lib.rs
+++ b/crdt-enc/src/lib.rs
@@ -9,16 +9,16 @@ use crate::{
     storage::Storage,
     utils::{VersionBytes, VersionBytesRef},
 };
-use anyhow::{Context, Error, Result};
-use async_trait::async_trait;
-use crdts::{CmRDT, CvRDT, MVReg, VClock};
-use dyn_clone::DynClone;
-use futures::{
+use ::anyhow::{Context, Error, Result};
+use ::async_trait::async_trait;
+use ::crdts::{CmRDT, CvRDT, MVReg, VClock};
+use ::dyn_clone::DynClone;
+use ::futures::{
     lock::Mutex as AsyncMutex,
     stream::{self, StreamExt, TryStreamExt},
 };
-use serde::{de::DeserializeOwned, Deserialize, Serialize};
-use std::{
+use ::serde::{de::DeserializeOwned, Deserialize, Serialize};
+use ::std::{
     collections::HashSet,
     convert::Infallible,
     default::Default,
@@ -26,7 +26,7 @@ use std::{
     mem,
     sync::{Arc, Mutex as SyncMutex},
 };
-use uuid::Uuid;
+use ::uuid::Uuid;
 
 const CURRENT_VERSION: Uuid = Uuid::from_u128(0xe834d789_101b_4634_9823_9de990a9051f);
 
diff --git a/crdt-enc/src/storage.rs b/crdt-enc/src/storage.rs
index abafe30..31a9fed 100644
--- a/crdt-enc/src/storage.rs
+++ b/crdt-enc/src/storage.rs
@@ -1,9 +1,9 @@
 use crate::{utils::VersionBytes, CoreSubHandle, Info};
-use anyhow::Result;
-use async_trait::async_trait;
-use crdts::MVReg;
-use std::fmt::Debug;
-use uuid::Uuid;
+use ::anyhow::Result;
+use ::async_trait::async_trait;
+use ::crdts::MVReg;
+use ::std::fmt::Debug;
+use ::uuid::Uuid;
 
 #[async_trait]
 pub trait Storage
diff --git a/crdt-enc/src/utils.rs b/crdt-enc/src/utils.rs
index de26cce..d1daf0a 100644
--- a/crdt-enc/src/utils.rs
+++ b/crdt-enc/src/utils.rs
@@ -2,9 +2,9 @@ mod version_bytes;
 
 pub use version_bytes::*;
 
-use crdts::{CmRDT, CvRDT};
-use serde::{Deserialize, Serialize};
-use std::convert::Infallible;
+use ::crdts::{CmRDT, CvRDT};
+use ::serde::{Deserialize, Serialize};
+use ::std::convert::Infallible;
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 pub struct EmptyCrdt;
diff --git a/crdt-enc/src/utils/version_bytes.rs b/crdt-enc/src/utils/version_bytes.rs
index 45ea446..c118067 100644
--- a/crdt-enc/src/utils/version_bytes.rs
+++ b/crdt-enc/src/utils/version_bytes.rs
@@ -1,7 +1,7 @@
-use bytes::Buf;
-use serde::{Deserialize, Serialize};
-use std::{borrow::Cow, convert::TryFrom, fmt, io::IoSlice};
-use uuid::Uuid;
+use ::bytes::Buf;
+use ::serde::{Deserialize, Serialize};
+use ::std::{borrow::Cow, convert::TryFrom, fmt, io::IoSlice};
+use ::uuid::Uuid;
 
 #[derive(Debug)]
 pub struct VersionError {
diff --git a/examples/test/src/main.rs b/examples/test/src/main.rs
index 00dc88a..0171106 100644
--- a/examples/test/src/main.rs
+++ b/examples/test/src/main.rs
@@ -1,8 +1,8 @@
-use anyhow::Result;
-use crdt_enc_gpgme::KeyHandler;
-use crdt_enc_sodium::EncHandler;
-use crdt_enc_tokio::Storage;
-use uuid::Uuid;
+use ::anyhow::Result;
+use ::crdt_enc_gpgme::KeyHandler;
+use ::crdt_enc_sodium::EncHandler;
+use ::crdt_enc_tokio::Storage;
+use ::uuid::Uuid;
 
 const CURRENT_DATA_VERSION: Uuid = Uuid::from_u128(0xaadfd5a6_6e19_4b24_a802_4fa27c72f20c);