From 852f0f4722f09bb4db42fe1314839b9b0e4cc970 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Mon, 5 Feb 2024 23:40:44 +0100
Subject: [PATCH] Switch embedded from `#!` to `#:`

---
 Cargo.lock                                             |  8 ++++----
 syndicate-schema-plugin/Cargo.toml                     |  2 +-
 syndicate-server/Cargo.toml                            |  4 ++--
 .../protocols/schemas/internalServices.prs             | 10 +++++-----
 syndicate-tools/Cargo.toml                             |  2 +-
 syndicate/Cargo.toml                                   |  6 +++---
 syndicate/src/lib.rs                                   |  2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7d8b020..c464ac6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1460,9 +1460,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "preserves"
-version = "4.993.0"
+version = "4.994.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f9a566f570edf177ae41c551b16e9e0635d8b8bec8122a95ad272ba99246cc6"
+checksum = "1f334d62e58515d8d1cfeacd2444e44b0e77a3aca5158e90a0c014bb6079e31d"
 dependencies = [
  "base64",
  "dtoa",
@@ -1475,9 +1475,9 @@ dependencies = [
 
 [[package]]
 name = "preserves-schema"
-version = "5.993.0"
+version = "5.994.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e616ca1e0ca0e8d665d3ee9ea8ed0751cfb3257e2e443be08c8e265ecd42ff23"
+checksum = "45dd6e76b1d0fa46e1683dfca266460a46a30bfe2691cafdb833fa87179a2331"
 dependencies = [
  "convert_case",
  "glob",
diff --git a/syndicate-schema-plugin/Cargo.toml b/syndicate-schema-plugin/Cargo.toml
index 0c52e70..15f34ec 100644
--- a/syndicate-schema-plugin/Cargo.toml
+++ b/syndicate-schema-plugin/Cargo.toml
@@ -12,7 +12,7 @@ license = "Apache-2.0"
 [lib]
 
 [dependencies]
-preserves-schema = "5.993"
+preserves-schema = "5.994"
 syndicate = { path = "../syndicate", version = "0.33.0"}
 
 [package.metadata.workspaces]
diff --git a/syndicate-server/Cargo.toml b/syndicate-server/Cargo.toml
index 40abbd8..23be450 100644
--- a/syndicate-server/Cargo.toml
+++ b/syndicate-server/Cargo.toml
@@ -13,12 +13,12 @@ license = "Apache-2.0"
 jemalloc = ["dep:tikv-jemallocator"]
 
 [build-dependencies]
-preserves-schema = "5.993"
+preserves-schema = "5.994"
 syndicate = { path = "../syndicate", version = "0.33.0"}
 syndicate-schema-plugin = { path = "../syndicate-schema-plugin", version = "0.3.0"}
 
 [dependencies]
-preserves-schema = "5.993"
+preserves-schema = "5.994"
 syndicate = { path = "../syndicate", version = "0.33.0"}
 syndicate-macros = { path = "../syndicate-macros", version = "0.26.0"}
 
diff --git a/syndicate-server/protocols/schemas/internalServices.prs b/syndicate-server/protocols/schemas/internalServices.prs
index 58665f4..371a6d0 100644
--- a/syndicate-server/protocols/schemas/internalServices.prs
+++ b/syndicate-server/protocols/schemas/internalServices.prs
@@ -1,18 +1,18 @@
 version 1 .
 embeddedType EntityRef.Cap .
 
-Gatekeeper = <gatekeeper @bindspace #!gatekeeper.Bind> .
+Gatekeeper = <gatekeeper @bindspace #:gatekeeper.Bind> .
 
 DebtReporter = <debt-reporter @intervalSeconds double>.
 
 TcpRelayListener = TcpWithoutHttp / TcpWithHttp .
-TcpWithoutHttp = <relay-listener @addr TransportAddress.Tcp @gatekeeper #!gatekeeper.Resolve> .
-TcpWithHttp = <relay-listener @addr TransportAddress.Tcp @gatekeeper #!gatekeeper.Resolve @httpd #!http.HttpContext> .
+TcpWithoutHttp = <relay-listener @addr TransportAddress.Tcp @gatekeeper #:gatekeeper.Resolve> .
+TcpWithHttp = <relay-listener @addr TransportAddress.Tcp @gatekeeper #:gatekeeper.Resolve @httpd #:http.HttpContext> .
 
-UnixRelayListener = <relay-listener @addr TransportAddress.Unix @gatekeeper #!gatekeeper.Resolve> .
+UnixRelayListener = <relay-listener @addr TransportAddress.Unix @gatekeeper #:gatekeeper.Resolve> .
 ConfigWatcher = <config-watcher @path string @env ConfigEnv>.
 
 ConfigEnv = { symbol: any ...:... }.
 
-HttpRouter = <http-router @httpd #!any> .
+HttpRouter = <http-router @httpd #:any> .
 HttpStaticFileServer = <http-static-files @dir string @pathPrefixElements int> .
diff --git a/syndicate-tools/Cargo.toml b/syndicate-tools/Cargo.toml
index 52e0bf3..e924368 100644
--- a/syndicate-tools/Cargo.toml
+++ b/syndicate-tools/Cargo.toml
@@ -10,7 +10,7 @@ repository = "https://git.syndicate-lang.org/syndicate-lang/syndicate-rs"
 license = "Apache-2.0"
 
 [dependencies]
-preserves = "4.993"
+preserves = "4.994"
 syndicate = { path = "../syndicate", version = "0.33.0"}
 
 clap = { version = "^4.0", features = ["derive"] }
diff --git a/syndicate/Cargo.toml b/syndicate/Cargo.toml
index 3f9c8f4..921f74b 100644
--- a/syndicate/Cargo.toml
+++ b/syndicate/Cargo.toml
@@ -13,11 +13,11 @@ license = "Apache-2.0"
 vendored-openssl = ["openssl/vendored"]
 
 [build-dependencies]
-preserves-schema = "5.993"
+preserves-schema = "5.994"
 
 [dependencies]
-preserves = "4.993"
-preserves-schema = "5.993"
+preserves = "4.994"
+preserves-schema = "5.994"
 
 tokio = { version = "1.10", features = ["io-util", "macros", "rt", "rt-multi-thread", "time"] }
 tokio-util = "0.6"
diff --git a/syndicate/src/lib.rs b/syndicate/src/lib.rs
index 1eb2f45..4e13a96 100644
--- a/syndicate/src/lib.rs
+++ b/syndicate/src/lib.rs
@@ -74,7 +74,7 @@ mod protocol_test {
     use preserves_schema::Deserialize;
 
     #[test] fn decode_sync() {
-        let input_str = "[[2 <sync #![0 11]>]]";
+        let input_str = "[[2 <S #:[0 11]>]]";
         let mut src = BytesBinarySource::new(input_str.as_bytes());
         let mut r = src.text::<IOValue, _>(ViaCodec::new(IOValueDomainCodec));
         let packet: schemas::protocol::Packet<IOValue> = schemas::protocol::Packet::deserialize(&mut r).unwrap();