Shuffle dependecies for apitests and wdriver

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/Cargo.lock.example b/Cargo.lock.example
index e6697e2ab353874650b45d0ec8726f960cd6a45a..ac9f2656b00a2f15b2bee79cca010118cbc2e5af 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1701,7 +1701,6 @@ version = "0.0.1"
 dependencies = [
  "fehler",
  "humantime",
- "ndarray",
  "num-traits",
  "otter",
  "serde",
@@ -1756,10 +1755,9 @@ name = "otter-webdriver-tests"
 version = "0.0.1"
 dependencies = [
  "fehler",
- "humantime",
  "ndarray",
  "num-traits",
- "otter",
+ "otter-api-tests",
  "serde",
  "structopt",
  "strum",

diff --git a/apitest.rs b/apitest.rs
index 0dbe30b8ea2e12e167a67e6411f3c6e01e09f8ba..94a5ee1e610fca6e03b700b9c7346159fe9a383c 100644 (file)
--- a/apitest.rs
+++ b/apitest.rs
@@ -2,3 +2,9 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+pub mod imports {
+  pub use otter;
+  pub use otter::imports::*;
+
+  pub use humantime;
+}

diff --git a/apitest/Cargo.toml b/apitest/Cargo.toml
index 24756982a1856577045739176fa334d9e69db477..91fe1f835edf53b62b4264426f9ca67ccf0f7c14 100644 (file)
--- a/apitest/Cargo.toml
+++ b/apitest/Cargo.toml
@@ -14,7 +14,6 @@ edition = "2018"
 otter = { path = ".." }
 
 humantime = "2"
-ndarray = "0.14"
 
 # Repeated here because importing does not work properly
 fehler = "1"

diff --git a/wdriver.rs b/wdriver.rs
index 25ee49149e1decb4a26f707ba4f0bf029bc8ebd1..4abe478110c46f48067362381cd4b77f1bfd7394 100644 (file)
--- a/wdriver.rs
+++ b/wdriver.rs
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
-pub use otter::imports::*;
+pub use otter_api_tests::imports::*;
 
 pub use anyhow::{anyhow, ensure, Context};
 pub use boolinator::Boolinator;
@@ -257,7 +257,7 @@ impl Substitutor for DirSubst {
 }
 
 mod cleanup_notify {
-  use otter::imports::*;
+  use otter_api_tests::imports::*;
   use anyhow::Context;
   use fehler::{throw, throws};
   use libc::_exit;

diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index 7c2028f7688ed6cd4cfd71d5371f62ee55629286..8850f1b52effe8efc6fb82e01aab3fa437dedb76 100644 (file)
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -11,9 +11,8 @@ version = "0.0.1"
 edition = "2018"
 
 [dependencies]
-otter = { path = ".." }
+otter-api-tests = { path = "../apitest" }
 
-humantime = "2"
 ndarray = "0.14"
 thirtyfour_sync = "0.22"
 x11rb = "0.8"