From 8492fed85ecfe3cbb9f2bce743479bb3a6d53cf3 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel.sambuc@epfl.ch>
Date: Sat, 25 Jul 2020 09:23:10 +0200
Subject: [PATCH] Update the parser imports

---
 src/expressions.rs |  8 ++++----
 src/main.rs        | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/expressions.rs b/src/expressions.rs
index 8f0d330..8e9b3a7 100644
--- a/src/expressions.rs
+++ b/src/expressions.rs
@@ -14,10 +14,10 @@ pub trait Predictor {
 pub trait Executor<'e> {
     type ResultSet;
 
-    fn execute<'f: 'e>(
-        &self,
-        core_id: &str,
-        parameters: &CoreQueryParameters<'f>,
+    fn execute(
+        &'e self,
+        core_id: &'e str,
+        parameters: &'e CoreQueryParameters<'e>,
     ) -> Self::ResultSet;
 }
 
diff --git a/src/main.rs b/src/main.rs
index f409d98..f33c949 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -7,11 +7,11 @@ use std::io;
 
 use mercator_db::CoreQueryParameters;
 use mercator_db::DataBase;
-use parser::Executor;
-use parser::FiltersParser;
-use parser::Predictor;
-use parser::QueryParser;
-use parser::Validator;
+use mercator_parser::Executor;
+use mercator_parser::FiltersParser;
+use mercator_parser::Predictor;
+use mercator_parser::QueryParser;
+use mercator_parser::Validator;
 
 fn main() {
     // If RUST_LOG is unset, set it to INFO, otherwise keep it as-is.