greg/mentat
1
0
Fork 0
Code Issues 294 Pull requests Packages Projects Releases 9 Wiki Activity

Don't depend on num and ordered-float in the db and query crates, r=ncalexan (#223)

Browse source 
Signed-off-by: Victor Porof <victor.porof@gmail.com>
This commit is contained in:
Victor Porof 2017-02-08 12:19:16 +01:00
parent 4d83aafa2a
commit c585715224
8 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
db/Cargo.toml
View file

@ -5,9 +5,6 @@ version = "0.0.1"
[dependencies]
error-chain = "0.8.0"
lazy_static = "0.2.2"
# TODO: don't depend on num and ordered-float; expose helpers in edn abstracting necessary constructors.
num = "0.1.35"
ordered-float = "0.4.0"
[dependencies.rusqlite]
version = "0.9.3"

2
db/src/lib.rs
View file

@ -12,8 +12,6 @@
extern crate error_chain;
#[macro_use]
extern crate lazy_static;
extern crate num;
extern crate ordered_float;
extern crate rusqlite;
extern crate edn;

3
db/src/types.rs
View file

@ -11,8 +11,7 @@
#![allow(dead_code)]
use std::collections::{BTreeMap};
use ordered_float::{OrderedFloat};
use edn::OrderedFloat;
extern crate mentat_core;

6
edn/src/lib.rs
View file

@ -21,5 +21,7 @@ pub mod parse {
include!(concat!(env!("OUT_DIR"), "/edn.rs"));
}
pub use self::types::Value;
pub use self::symbols::{Keyword, NamespacedKeyword, PlainSymbol, NamespacedSymbol};
pub use ordered_float::OrderedFloat;
pub use num::BigInt;
pub use types::Value;
pub use symbols::{Keyword, NamespacedKeyword, PlainSymbol, NamespacedSymbol};

1
query-parser/Cargo.toml
View file

@ -5,7 +5,6 @@ version = "0.0.1"
[dependencies]
combine = "2.1.1"
matches = "0.1"
ordered-float = "0.4.0"
[dependencies.edn]
path = "../edn"

3
query-parser/src/parse.rs
View file

@ -244,10 +244,9 @@ mod test {
extern crate combine;
extern crate edn;
extern crate mentat_query;
extern crate ordered_float;
use self::combine::Parser;
use self::ordered_float::OrderedFloat;
use self::edn::OrderedFloat;
use self::mentat_query::{
Element,
FindSpec,

2
query/Cargo.toml
View file

@ -3,8 +3,6 @@ name = "mentat_query"
version = "0.0.1"
[dependencies]
num = "0.1.35"
ordered-float = "0.4.0"
[dependencies.edn]
path = "../edn"

6
query/src/lib.rs
View file

@ -31,12 +31,8 @@
///! a tradeoff against well-typed function signatures and other such boundaries.
extern crate edn;
extern crate num;
extern crate ordered_float;
use num::BigInt;
use ordered_float::OrderedFloat;
use edn::{NamespacedKeyword, PlainSymbol};
use edn::{BigInt, OrderedFloat, NamespacedKeyword, PlainSymbol};
pub type SrcVarName = String; // Do not include the required syntactic '$'.