From 1deed24f42847bc1eb0cfc26bada840643eaec33 Mon Sep 17 00:00:00 2001 From: Jordan Santell Date: Fri, 10 Feb 2017 09:09:13 -0800 Subject: [PATCH] Remove usage of global imports in db module. Fixes #251. r=nalexander (#253) --- db/src/bootstrap.rs | 2 +- db/src/db.rs | 4 ++-- db/src/lib.rs | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/db/src/bootstrap.rs b/db/src/bootstrap.rs index b92955ce..51943091 100644 --- a/db/src/bootstrap.rs +++ b/db/src/bootstrap.rs @@ -12,9 +12,9 @@ use ::{to_namespaced_keyword}; use edn; +use errors::{ErrorKind, Result}; use edn::types::Value; use entids; -use errors::*; use db::TypedSQLValue; use mentat_tx::entities::Entity; use mentat_tx_parser; diff --git a/db/src/db.rs b/db/src/db.rs index c906ce64..0b2c82d9 100644 --- a/db/src/db.rs +++ b/db/src/db.rs @@ -23,10 +23,10 @@ use ::{repeat_values, to_namespaced_keyword}; use bootstrap; use edn::types::Value; use entids; -use errors::*; use mentat_tx::entities as entmod; use mentat_tx::entities::{Entity, OpType}; -use types::*; +use errors::{ErrorKind, Result, ResultExt}; +use types::{Attribute, DB, Entid, IdentMap, Partition, PartitionMap, Schema, TypedValue, ValueType}; pub fn new_connection(uri: T) -> rusqlite::Result where T: AsRef { let conn = match uri.as_ref().to_string_lossy().len() { diff --git a/db/src/lib.rs b/db/src/lib.rs index fcadcb18..c1e3225c 100644 --- a/db/src/lib.rs +++ b/db/src/lib.rs @@ -26,10 +26,6 @@ extern crate mentat_tx_parser; use itertools::Itertools; use std::iter::repeat; -pub use errors::*; -pub use schema::*; -pub use types::*; - pub mod db; mod bootstrap; mod debug;