From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Jun 2020 22:46:01 +0000 (+0100)
Subject: call setup
X-Git-Tag: otter-0.2.0~1573
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=19e22bb646acfa5d71d77277af40dd4fba1ef654;p=otter.git

call setup
---

diff --git a/src/bin/server.rs b/src/bin/server.rs
index 43a0d23f..c6694c19 100644
--- a/src/bin/server.rs
+++ b/src/bin/server.rs
@@ -80,6 +80,8 @@ fn resource(leaf : CheckedResourceLeaf) -> io::Result<NamedFile> {
 }  
 
 fn main() {
+  global::xxx_global_setup();
+
   let helmet = SpaceHelmet::default()
     .enable(NoSniff::Enable)
     .enable(Frame::Deny)
diff --git a/src/imports.rs b/src/imports.rs
index f7a2171e..571b5b81 100644
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -25,6 +25,8 @@ pub use rocket::response::NamedFile;
 pub use rocket::response;
 
 pub use slotmap::dense::{DenseSlotMap};
+
+pub use crate::global;
 pub use crate::global::InstanceAccess;
 
 pub type E = anyhow::Error;