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 8f5d43b2d613b3cd5ff6ca9b667a85accdba5787..081931803e0c85ae90ffc826736eabaa92e404a4 100644 (file)
--- 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 446aa5d35d00dba22943d6dfe2dbeef7b003c756..514ab0873bfb42910ccde4d56899770ebe52364c 100644 (file)
--- 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 0e1eaf89fb9d80f1a7a7b5387950976a30390b9c..927e38e98aa10b80b70cacdcb9248d0acc17e030 100644 (file)
--- 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 fb95514e7f8501b82f7eda8f47e42a650f9de329..d0bc226e73990f85d28816d57817ac1821c23e63 100644 (file)
--- 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;