Centralise if_chain

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 74fa34bd753fe1f3c550b2d56af7f610d2ee968b..69d2f064cf19fcdde8250e943e3c2a566597ac74 100644 (file)
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1597,7 +1597,6 @@ dependencies = [
  "fs2",
  "glob 0.3.0",
  "htmlescape",
- "if_chain",
  "index_vec",
  "inventory",
  "itertools",

diff --git a/Cargo.toml b/Cargo.toml
index 6cb7057b22ac8d6afb79ffc6c87cd56cb5a3af2f..792a48978004913542953de5c4ac3479d00f9003 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,6 @@ flexi_logger = { version = "0.17", features = [ "specfile" ] }
 fs2 = "0.4"
 glob = "0.3"
 htmlescape = "0.3"
-if_chain = "1"
 index_vec = { version = "0.1.1", features = ['serde'] }
 inventory = "0.1"
 itertools = "0.10"

diff --git a/base/Cargo.toml b/base/Cargo.toml
index 86072057c734d9ef16912b3cf0bc7290607c03af..222524871df42c0512858a05fba34325a0017708 100644 (file)
--- a/base/Cargo.toml
+++ b/base/Cargo.toml
@@ -16,6 +16,7 @@ path = "lib.rs"
 arrayvec = "0.5"
 derive_more = "0.99"
 if_chain = "1"
+
 thiserror = "1"
 serde = { version = "1", features = ["derive","rc"] }
 serde_with = "1"

diff --git a/base/imports.rs b/base/imports.rs
index e86379af31793ef5e834f989e2e8de0d7f2c2300..9f3e3cc66fe8a3bf355d94406a847caf41a6ad25 100644 (file)
--- a/base/imports.rs
+++ b/base/imports.rs
@@ -4,3 +4,4 @@
 
 pub use arrayvec;
 pub use derive_more;
+pub use if_chain;

diff --git a/src/toml-de.rs b/src/toml-de.rs
index f5995af22ce58fde309113ed3799720c6296a586..0522ce1d77c5379ad96264c14100562108292585 100644 (file)
--- a/src/toml-de.rs
+++ b/src/toml-de.rs
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 // There is NO WARRANTY.
 
+use crate::imports::*;
+
 use std::fmt::{Debug, Display};
 use std::iter::Peekable;
 use std::slice;