diff --git a/public-traits/Cargo.toml b/public-traits/Cargo.toml index d102a702..5b377b18 100644 --- a/public-traits/Cargo.toml +++ b/public-traits/Cargo.toml @@ -16,7 +16,7 @@ syncable = ["tolstoy_traits", "hyper", "serde_json"] failure = "~0.1" failure_derive = "~0.1" http = "~0.2" -tokio = { version = "~1.8", features = ["rt-core"] } +tokio = { version = "1.8.0", features = ["full"] } uuid = "~0.8" [dependencies.rusqlite] diff --git a/tests/query.rs b/tests/query.rs index f9a74039..96c82843 100644 --- a/tests/query.rs +++ b/tests/query.rs @@ -20,6 +20,7 @@ use chrono::FixedOffset; use core_traits::{Entid, KnownEntid, ValueType, ValueTypeSet}; +use edn::OrderedFloat; use mentat_core::{DateTime, HasSchema, Utc, Uuid}; use query_projector_traits::aggregates::SimpleAggregationOp; @@ -470,7 +471,7 @@ fn test_fulltext() { ) => { assert_eq!(x, v); assert_eq!(text.as_str(), "hello darkness my old friend"); - assert_approx_eq!(score, 0.0f64.into()); + assert_approx_eq!(score, OrderedFloat(0.0f64)); } _ => panic!("Unexpected results."), } @@ -1953,7 +1954,7 @@ fn run_tx_data_test(mut store: Store) { } x => panic!("Got unexpected results {:?}", x), } - }; + } assert_tx_data(&store, &tx1, "1".into()); assert_tx_data(&store, &tx2, "2".into()); diff --git a/tolstoy/Cargo.toml b/tolstoy/Cargo.toml index 79de28c7..6f445c53 100644 --- a/tolstoy/Cargo.toml +++ b/tolstoy/Cargo.toml @@ -11,12 +11,12 @@ sqlcipher = ["rusqlite/sqlcipher"] [dependencies] failure = "~0.1" futures = "~0.3" -hyper = "~0.14" +hyper = { version = "~0.14", features = ["full"] } hyper-tls = "~0.5" http = "~0.2" log = "~0.4" mime = "~0.3" -tokio = { version = "~1.8", features = ["full"] } +tokio = { version = "1.8.0", features = ["full"] } serde = "~1.0" serde_json = "~1.0" serde_cbor = "~0.11" diff --git a/tolstoy/src/remote_client.rs b/tolstoy/src/remote_client.rs index 9c620716..cfee9335 100644 --- a/tolstoy/src/remote_client.rs +++ b/tolstoy/src/remote_client.rs @@ -10,7 +10,7 @@ #![allow(dead_code)] -use hyper::{body, header, Body, Client, Method, Request, StatusCode}; +use hyper::{body, header, Client, Body, Method, Request, StatusCode}; use hyper_tls::HttpsConnector; // TODO: https://github.com/mozilla/mentat/issues/570 // use serde_cbor;