diff --git a/Cargo.toml b/Cargo.toml index a9f80375..358de0aa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,16 +18,13 @@ rustc_version = "0.1.7" [dependencies] chrono = "0.3" -clap = "2.19.3" +clap = "2.23" error-chain = "0.8.1" nickel = "0.9.0" -slog = "1.4.0" -slog-scope = "0.2.2" -slog-term = "1.3.4" -time = "0.1.35" +time = "0.1" [dependencies.rusqlite] -version = "0.10.1" +version = "0.11" # System sqlite might be very old. features = ["bundled", "limits"] diff --git a/db/Cargo.toml b/db/Cargo.toml index b0deae04..b83e49a5 100644 --- a/db/Cargo.toml +++ b/db/Cargo.toml @@ -5,13 +5,13 @@ workspace = ".." [dependencies] error-chain = "0.8.1" -itertools = "0.5.9" -lazy_static = "0.2.2" -ordered-float = "0.4.0" -time = "0.1.35" +itertools = "0.5" +lazy_static = "0.2" +ordered-float = "0.4" +time = "0.1" [dependencies.rusqlite] -version = "0.10.1" +version = "0.11" # System sqlite might be very old. features = ["bundled", "limits"] diff --git a/edn/Cargo.toml b/edn/Cargo.toml index 6f0c7f62..9147c71f 100644 --- a/edn/Cargo.toml +++ b/edn/Cargo.toml @@ -12,11 +12,11 @@ readme = "./README.md" [dependencies] chrono = "0.3" -itertools = "0.5.9" -num = "0.1.35" -ordered-float = "0.4.0" -pretty = "0.2.0" -uuid = "0.5.0" +itertools = "0.5" +num = "0.1" +ordered-float = "0.4" +pretty = "0.2" +uuid = "0.5" [build-dependencies] -peg = "0.5.1" +peg = "0.5" diff --git a/query-projector/Cargo.toml b/query-projector/Cargo.toml index 0bd54f1f..7b1f45e3 100644 --- a/query-projector/Cargo.toml +++ b/query-projector/Cargo.toml @@ -7,7 +7,7 @@ workspace = ".." error-chain = "0.8.1" [dependencies.rusqlite] -version = "0.10.1" +version = "0.11" # System sqlite might be very old. features = ["bundled", "limits"] diff --git a/sql/Cargo.toml b/sql/Cargo.toml index abca4fa2..e4e2420d 100644 --- a/sql/Cargo.toml +++ b/sql/Cargo.toml @@ -8,7 +8,7 @@ error-chain = "0.8.1" ordered-float = "0.4.0" [dependencies.rusqlite] -version = "0.10.1" +version = "0.11" # System sqlite might be very old. features = ["bundled", "limits"] diff --git a/src/lib.rs b/src/lib.rs index c9686a86..76762777 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,12 +11,6 @@ #[macro_use] extern crate error_chain; -#[macro_use] -extern crate slog; - -#[macro_use] -extern crate slog_scope; - extern crate rusqlite; extern crate edn; @@ -38,7 +32,6 @@ pub mod conn; pub mod query; pub fn get_name() -> String { - info!("Called into mentat library"; "fn" => "get_name"); return String::from("mentat"); } diff --git a/src/main.rs b/src/main.rs index a0fc6447..ca1e2e02 100644 --- a/src/main.rs +++ b/src/main.rs @@ -13,16 +13,9 @@ extern crate clap; use nickel::{Nickel, HttpRouter}; -#[macro_use] -extern crate slog; -#[macro_use] -extern crate slog_scope; -extern crate slog_term; - extern crate mentat; use clap::{App, Arg, SubCommand, AppSettings}; -use slog::DrainExt; use std::u16; use std::str::FromStr; @@ -59,23 +52,6 @@ fn main() { matches.value_of("port").unwrap()); } - // Set up logging. - let log_level = if debug { - slog::Level::Debug - } else { - slog::Level::Warning - }; - let term_logger = slog_term::streamer().build().fuse(); - let log = slog::Logger::root(slog::LevelFilter::new(term_logger, log_level), - o!("version" => env!("CARGO_PKG_VERSION"))); - slog_scope::set_global_logger(log); - - info!("Serving database"; "database" => matches.value_of("database").unwrap(), - "port" => port, - "debug mode" => debug); - - error!("Calling a function: {}", mentat::get_name()); - let mut server = Nickel::new(); server.get("/", middleware!("This doesn't do anything yet")); server.listen(("127.0.0.1", port)).expect("Failed to launch server");