From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 14 Feb 2021 23:52:59 +0000 (+0000)
Subject: Centralise toml tempfile
X-Git-Tag: otter-0.4.0~458
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9f216da0effaf469d209255b46e97f870f6554aa;p=otter.git

Centralise toml tempfile

And put off tera

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

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 8f5d43b2..08193180 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -1662,7 +1662,6 @@ dependencies = [
  "structopt",
  "strum",
  "thiserror",
- "toml 0.5.8",
  "typetag",
  "uds",
  "vecdeque-stableix",
diff --git a/Cargo.toml b/Cargo.toml
index 446aa5d3..514ab087 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,15 +51,16 @@ regex = "1"
 rmp = "0.8"
 rmp-serde = "0.15"
 serde_json = "1"
-
 tempfile = "3"
-tera = "0.11"
 toml = "0.5"
+
 typetag = "0.1.6"
 uds = "0.2"
 url = "2"
 vecdeque-stableix = "1"
 
+tera = "0.11"
+
 # Repeated here because importing does not work properly
 fehler = "1"
 num-traits = "0.2"
diff --git a/daemon/Cargo.toml b/daemon/Cargo.toml
index 0e1eaf89..927e38e9 100644
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -18,7 +18,6 @@ path = "main.rs"
 otter = { path = ".." }
 otter-base = { path = "../base" }
 
-toml = "0.5"
 typetag = "0.1.6"
 uds = "0.2"
 vecdeque-stableix = "1"
diff --git a/src/imports.rs b/src/imports.rs
index fb95514e..d0bc226e 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -30,3 +30,4 @@ pub use pwd;
 pub use regex;
 pub use rmp_serde;
 pub use serde_json;
+pub use toml;