From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Jul 2020 22:23:08 +0000 (+0100)
Subject: Revert "experiment with RON"
X-Git-Tag: otter-0.2.0~1235
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9c2827dc1ee6b3be41e008dcf6e5ad3b9b4bfa1f;p=otter.git

Revert "experiment with RON"

Going back to lexpr after reading the RON issue list

This reverts commit 96d2125cf12f9b3b8f57a4428792b568a1c73ee7.
---

diff --git a/Cargo.lock.example b/Cargo.lock.example
index 52f05919..4a149c9b 100644
--- a/Cargo.lock.example
+++ b/Cargo.lock.example
@@ -413,7 +413,6 @@ dependencies = [
  "rmp-serde",
  "rocket",
  "rocket_contrib",
- "ron",
  "serde",
  "serde-lexpr",
  "serde_json",
@@ -1160,17 +1159,6 @@ dependencies = [
  "unicode-xid 0.1.0",
 ]
 
-[[package]]
-name = "ron"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a91260f321dbf3b5a16ff91c451dc9eb644ce72775a6812f9c3dfffe63818f8f"
-dependencies = [
- "base64 0.12.3",
- "bitflags",
- "serde",
-]
-
 [[package]]
 name = "rustc-demangle"
 version = "0.1.16"
diff --git a/Cargo.toml b/Cargo.toml
index 7ab22c47..aefc6b88 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -47,8 +47,7 @@ failure = "0.1.8" # for pwd
 
 libc = "0.2"
 
-serde-lexpr = "0.1" #xxx
-ron = "0.6"
+serde-lexpr = "0.1"
 
 #rocket = "0.4"
 rocket_contrib = { version = "0.4", default-features=false, features=["tera_templates","helmet","json"], git = "file:///home/ian/Rustup/Game/rocket/.git" branch = "Game-rocket-contrib" }
diff --git a/src/cmdlistener.rs b/src/cmdlistener.rs
index 85b188d6..452b24a5 100644
--- a/src/cmdlistener.rs
+++ b/src/cmdlistener.rs
@@ -52,8 +52,8 @@ impl CommandStream<'_> {
   }
 }
 
-impl From<ron::error::Error> for MgmtError {
-  fn from(je: ron::error::Error) -> ME {
+impl From<serde_lexpr::Error> for MgmtError {
+  fn from(je: serde_lexpr::Error) -> ME {
     ParseFailed(format!("{}", &je))
   }
 }
@@ -71,12 +71,12 @@ fn decode_and_process(cs: &mut CommandStream, s: &str) {
     .unwrap_or_else(|e| MgmtResponse::Error {
       error: MgmtError::ParseFailed(format!("{}", e))
     });
-  ron::ser::to_writer(&mut cs.write, &resp)?;
+  serde_lexpr::to_writer(&mut cs.write, &resp)?;
 }
 
 #[throws(ME)]
 fn decode_process_inner(cs: &mut CommandStream, s: &str)-> MgmtResponse {
-  let cmd : MgmtCommand = ron::de::from_str(s)?;
+  let cmd : MgmtCommand = serde_lexpr::from_str(s)?;
   execute(cs, cmd)?
 }