rename toml to toml_de

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

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index c5ca7ca63f7eab7dcb8e3c8beba7cd194f9211e5..7934eb5df9a3a268dd519470907aee5e1f9fdcde 100644 (file)
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -539,7 +539,7 @@ fn read_spec<T: DeserializeOwned>(filename: &str, what: &str) -> T {
     let mut f = File::open(filename).context("open")?;
     let mut buf = String::new();
     f.read_to_string(&mut buf).context("read")?;
-    let spec : T = otter::toml::from_str(&buf).context("parse")?;
+    let spec : T = toml_de::from_str(&buf).context("parse")?;
     Ok::<_,AE>(spec)
   })().with_context(|| format!("read {} {:?}", what, filename))?
 }

diff --git a/src/config.rs b/src/config.rs
index 68a0faf203b61b7aa1d6e1666aacfd7eb58d3ccf..5c5303a5fdac7e843a7012a5e616931f2a2c8605 100644 (file)
--- a/src/config.rs
+++ b/src/config.rs
@@ -117,7 +117,7 @@ impl ServerConfig {
     let mut buf = String::new();
     File::open(&config_filename).with_context(||config_filename.to_string())?
       .read_to_string(&mut buf)?;
-    let config : ServerConfigSpec = crate::toml::from_str(&buf)?;
+    let config : ServerConfigSpec = toml_de::from_str(&buf)?;
     let config = config.try_into()?;
     set_config(config);
   }
@@ -125,7 +125,7 @@ impl ServerConfig {
 
 impl Default for ServerConfig {
   fn default() -> ServerConfig {
-    let spec : ServerConfigSpec = crate::toml::from_str(r#"
+    let spec : ServerConfigSpec = toml_de::from_str(r#"
       public_url = "XXX"
       "#)
       .expect("parse dummy config as ServerConfigSpec");

diff --git a/src/imports.rs b/src/imports.rs
index 3edb9429cb92d2ec64cd1407ec0242a8a584b64d..c2c673f3c2edb52da84fe7388bea5a2e97d05aad 100644 (file)
--- a/src/imports.rs
+++ b/src/imports.rs
@@ -131,6 +131,7 @@ pub use crate::tz::*;
 pub use crate::config::*;
 pub use crate::accounts::*;
 pub use crate::accounts::loaded_acl::{self,LoadedAcl,EffectiveACL,PermSet};
+pub use crate::toml_de;
 
 pub use zcoord::{self, ZCoord};
 

diff --git a/src/lib.rs b/src/lib.rs
index 95f543068c21e74eb5b1b225603b7e8425247ced..b8f51b70d0324928e9a8ffe008bd22c46096cb6c 100644 (file)
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -27,5 +27,5 @@ pub mod shapelib;
 pub mod tz;
 pub mod accounts;
 pub mod config;
-pub mod toml;
+#[path="toml-de.rs"] pub mod toml_de;
 #[path="slotmap-slot-idx.rs"] pub mod slotmap_slot_idx;

diff --git a/src/toml.rs b/src/toml-de.rs
similarity index 100%
rename from src/toml.rs
rename to src/toml-de.rs