From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 22:47:13 +0000 (+0000)
Subject: Centralise if_chain
X-Git-Tag: otter-0.4.0~482
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c59e361ed620f36445165a87913f5b5fe6a3a59e;p=otter.git

Centralise if_chain

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 74fa34bd..69d2f064 100644
--- 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 6cb7057b..792a4897 100644
--- 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 86072057..22252487 100644
--- 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 e86379af..9f3e3cc6 100644
--- 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 f5995af2..0522ce1d 100644
--- 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;