From e1d2df3e2061da17dd36cf327d80ea7740b89c4f Mon Sep 17 00:00:00 2001
From: Guillaume Ballet <gballet@gmail.com>
Date: Mon, 14 Jan 2019 15:05:21 +0100
Subject: [PATCH] Fix build after rebase

---
 zokrates_cli/src/bin.rs            | 2 +-
 zokrates_core/tests/integration.rs | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/zokrates_cli/src/bin.rs b/zokrates_cli/src/bin.rs
index 6aae3570..954cf78f 100644
--- a/zokrates_cli/src/bin.rs
+++ b/zokrates_cli/src/bin.rs
@@ -26,7 +26,7 @@ use zokrates_core::ir;
 use zokrates_core::ir::r1cs_program;
 #[cfg(feature = "libsnark")]
 use zokrates_core::proof_system::{ProofSystem, GM17, PGHR13};
-use zokrates_field::field::FieldPrime;
+use zokrates_field::field::{Field, FieldPrime};
 use zokrates_fs_resolver::resolve as fs_resolve;
 
 #[cfg(feature = "libsnark")]
diff --git a/zokrates_core/tests/integration.rs b/zokrates_core/tests/integration.rs
index 13058b0f..05b5d8fa 100644
--- a/zokrates_core/tests/integration.rs
+++ b/zokrates_core/tests/integration.rs
@@ -1,8 +1,7 @@
 extern crate serde_json;
-extern crate zokrates_core;
-extern crate zokrates_field;
 #[macro_use]
 extern crate serde_derive;
+extern crate zokrates_core;
 extern crate zokrates_field;
 
 #[macro_use]