From f3c72ae5188d3b3f0183b7abb7a434559c154bad Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 15 Feb 2021 00:00:56 +0000
Subject: [PATCH] Move up dependencies once_cell void

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 Cargo.lock.example | 4 ++--
 Cargo.toml         | 2 ++
 src/imports.rs     | 2 ++
 wdriver/Cargo.toml | 2 --
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 91fbc00c..9a6200ae 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1607,6 +1607,7 @@ dependencies = [
  "nix",
  "num-derive",
  "num-traits",
+ "once_cell",
  "ordered-float",
  "otter-base",
  "parking_lot",
@@ -1630,6 +1631,7 @@ dependencies = [
  "uds",
  "url 2.2.0",
  "vecdeque-stableix",
+ "void",
 ]
 
 [[package]]
@@ -1684,13 +1686,11 @@ dependencies = [
  "humantime",
  "ndarray",
  "num-traits",
- "once_cell",
  "otter",
  "serde",
  "structopt",
  "strum",
  "thirtyfour_sync",
- "void",
  "x11rb",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 261adce9..d0b1d5f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -42,6 +42,7 @@ libc = "0.2"
 log = "0.4"
 nix = "0.19"
 num-derive = "0.3"
+once_cell = "1"
 ordered-float = "2"
 parking_lot = "0.11"
 percent-encoding = "2"
@@ -57,6 +58,7 @@ typetag = "0.1.6"
 uds = "0.2"
 url = "2"
 vecdeque-stableix = "1"
+void = "1"
 
 slotmap = { features = ['serde'], git = "https://github.com/ijackson/slotmap", branch="entry-return-stale-key" }
 # ^ MR not yet reviewed
diff --git a/src/imports.rs b/src/imports.rs
index 1477c9f4..9a3644b5 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -24,6 +24,7 @@ pub use libc;
 pub use log;
 pub use nix;
 pub use num_derive;
+pub use once_cell;
 pub use ordered_float;
 pub use parking_lot;
 pub use pwd;
@@ -34,3 +35,4 @@ pub use slotmap;
 pub use toml;
 pub use uds;
 pub use vecdeque_stableix;
+pub use void;
diff --git a/wdriver/Cargo.toml b/wdriver/Cargo.toml
index 3defd087..7c2028f7 100644
--- a/wdriver/Cargo.toml
+++ b/wdriver/Cargo.toml
@@ -15,9 +15,7 @@ otter = { path = ".." }
 
 humantime = "2"
 ndarray = "0.14"
-once_cell = "1"
 thirtyfour_sync = "0.22"
-void = "1"
 x11rb = "0.8"
 
 # Repeated here because importing does not work properly
-- 
2.30.2