From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 11 May 2022 22:44:00 +0000 (+0100)
Subject: ambassador: Switch to upstream version of delegation to fn
X-Git-Tag: otter-1.1.0~228
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=adcf022417fedfdf7817a19d24e6b25f32bd9b61;p=otter.git

ambassador: Switch to upstream version of delegation to fn

Directly as per:
  https://github.com/hobofan/ambassador/pull/32#issuecomment-1121759145

Quite ugly, I think.  I will try to tidy it up somehow.

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

diff --git a/Cargo.lock b/Cargo.lock
index e43cd78a..fbe966fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -289,10 +289,10 @@ dependencies = [
 
 [[package]]
 name = "ambassador"
-version = "0.3.0"
-source = "git+https://github.com/ijackson/ambassador?rev=e4775f906a7987b294e87c05ab1e923de0cf6a3a#e4775f906a7987b294e87c05ab1e923de0cf6a3a"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bcbad70f1bf852d280ac8ba277df761e7c1749072a05db9b9506d201aab4b59"
 dependencies = [
- "bytemuck",
  "itertools",
  "proc-macro2",
  "quote",
@@ -541,20 +541,6 @@ name = "bytemuck"
 version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ee1e0e2125faccb856bf10b0a9dfa89c4c718d05ef85580dfefbdf1c422ef801"
-dependencies = [
- "bytemuck_derive",
-]
-
-[[package]]
-name = "bytemuck_derive"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562e382481975bc61d11275ac5e62a19abd00b0547d99516a415336f183dcd0e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
 
 [[package]]
 name = "byteorder"
diff --git a/Cargo.toml b/Cargo.toml
index 9c52ca20..a9f88858 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -90,7 +90,7 @@ vecdeque-stableix="1"
 xmlparser = "0.13"
 zip="0.6"
 
-ambassador = { version = "0.3", git = "https://github.com/ijackson/ambassador", rev="e4775f906a7987b294e87c05ab1e923de0cf6a3a" }
+ambassador = "0.3.1"
 
 async-condvar-fair = { version="0.2", features=["parking_lot_0_12"] }
 const-default = { version="1",    features=["derive"      ] }
diff --git a/src/fastsplit.rs b/src/fastsplit.rs
index 8d1acb42..b93f4f73 100644
--- a/src/fastsplit.rs
+++ b/src/fastsplit.rs
@@ -58,15 +58,15 @@ impl Piece {
 
 #[dyn_upcast]
 impl OutlineTrait for Piece {
-  ambassador_impl_OutlineTrait_body_single_struct!{ inner() }
+  ambassador_impl_OutlineTrait! {body_struct(<>, dyn PieceTrait, (), (inner()), (inner_mut()))}
 }
 #[dyn_upcast]
 impl PieceBaseTrait for Piece {
-  ambassador_impl_PieceBaseTrait_body_single_struct!{ inner() }
+  ambassador_impl_PieceBaseTrait! {body_struct(<>, dyn PieceTrait, (), (inner()), (inner_mut()))}
 }
 #[typetag::serde(name="FastSplit")]
 impl PieceTrait for Piece {
-  ambassador_impl_PieceTrait_body_single_struct!{ inner() }
+  ambassador_impl_PieceTrait! {body_struct(<>, dyn PieceTrait, (), (inner()), (inner_mut()))}
 }
 
 impl Record {