dependency reorganisation: Move anyhow

NFC

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index e8ce48d1254dfcc97462631849e6b554bb3368d7..4f58f32f4a4d456ee228903370fbc8f16f125cc0 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1708,7 +1708,6 @@ dependencies = [
 name = "otter-webdriver-tests"
 version = "0.0.1"
 dependencies = [
- "anyhow",
  "boolinator",
  "env_logger",
  "fehler",

diff --git a/src/imports.rs b/src/imports.rs
new file mode 100644 (file)
index 0000000..778f197
--- /dev/null
+++ b/src/imports.rs
@@ -0,0 +1,5 @@
+// Copyright 2020-2021 Ian Jackson and contributors to Otter
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// There is NO WARRANTY.
+
+pub use anyhow;

diff --git a/src/lib.rs b/src/lib.rs
index cee9fc4309322786192d127aa371f0fcad6db311..b46f7aa44b610849ff566f07a1be2d9a0132b72d 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,6 +4,9 @@
 
 #![allow(clippy::redundant_closure_call)]
 
+pub mod imports;
+pub mod prelude;
+
 pub mod accounts;
 pub mod authproofs;
 pub mod commands;
@@ -13,7 +16,6 @@ pub mod error;
 pub mod gamestate;
 pub mod global;
 pub mod hidden;
-pub mod prelude;
 pub mod keydata;
 pub mod mgmtchannel;
 pub mod nwtemplates;

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

diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index e0a2b8cb08a4ff04feaaa0bd107eb54640802942..2f71537e9ba7deb5fdeca20679c4e20f21b4d9c9 100644 (file)
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -13,7 +13,6 @@ edition = "2018"
 [dependencies]
 otter = { path = ".." }
 
-anyhow = "1"
 boolinator = "2"
 env_logger = "0.8"
 fehler = "1"