From 7c0fc8f358944519f6e567869658e629c94eb226 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Sun, 29 Oct 2023 22:32:27 +0100
Subject: [PATCH] Repairs after merge

---
 implementations/python/tests/samples.pr                     | 2 +-
 implementations/racket/preserves/preserves/tests/samples.pr | 2 +-
 implementations/rust/preserves/src/value/text/reader.rs     | 2 +-
 tests/samples.pr                                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/implementations/python/tests/samples.pr b/implementations/python/tests/samples.pr
index 34e8784..2af441e 100644
--- a/implementations/python/tests/samples.pr
+++ b/implementations/python/tests/samples.pr
@@ -71,7 +71,7 @@
   delimiters1: @"Note no space between the falses here" <Test #x"B5808084" [#f#f]>
   delimiters2: <Test #x"B580B303666f6f84" [#f foo]>
   delimiters3: @"No space between the #f and the foo" <ParseError "[#ffoo]">
-  delimiters4: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB1\x0Ea line comment\x81\x84" [#f;a line comment
+  delimiters4: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB1\x0Ea line comment\x81\x84" [#f# a line comment
 #t]>
   delimiters5:  @"Note no space after the #f" <Test #"\xB5\x80\x85\xB3\x03ann\x81\x84" [#f@ann #t]>
   dict0: <Test #x"B784" {}>
diff --git a/implementations/racket/preserves/preserves/tests/samples.pr b/implementations/racket/preserves/preserves/tests/samples.pr
index 34e8784..2af441e 100644
--- a/implementations/racket/preserves/preserves/tests/samples.pr
+++ b/implementations/racket/preserves/preserves/tests/samples.pr
@@ -71,7 +71,7 @@
   delimiters1: @"Note no space between the falses here" <Test #x"B5808084" [#f#f]>
   delimiters2: <Test #x"B580B303666f6f84" [#f foo]>
   delimiters3: @"No space between the #f and the foo" <ParseError "[#ffoo]">
-  delimiters4: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB1\x0Ea line comment\x81\x84" [#f;a line comment
+  delimiters4: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB1\x0Ea line comment\x81\x84" [#f# a line comment
 #t]>
   delimiters5:  @"Note no space after the #f" <Test #"\xB5\x80\x85\xB3\x03ann\x81\x84" [#f@ann #t]>
   dict0: <Test #x"B784" {}>
diff --git a/implementations/rust/preserves/src/value/text/reader.rs b/implementations/rust/preserves/src/value/text/reader.rs
index 78bc11a..fd49333 100644
--- a/implementations/rust/preserves/src/value/text/reader.rs
+++ b/implementations/rust/preserves/src/value/text/reader.rs
@@ -127,7 +127,7 @@ impl<'de, 'src, N: NestedValue, Dec: DomainParse<N::Embedded>, S: BinarySource<'
         }
     }
 
-    fn prepend_annotations_to_next<N: NestedValue<Embedded = D>>(&mut self, mut annotations: Vec<N>) -> ReaderResult<N> {
+    fn prepend_annotations_to_next(&mut self, mut annotations: Vec<N>) -> ReaderResult<N> {
         let (existing_annotations, v) = Reader::<N>::demand_next(self, true)?.pieces();
         annotations.extend_from_slice(existing_annotations.slice());
         Ok(N::wrap(Annotations::new(Some(annotations)), v))
diff --git a/tests/samples.pr b/tests/samples.pr
index 34e8784..2af441e 100644
--- a/tests/samples.pr
+++ b/tests/samples.pr
@@ -71,7 +71,7 @@
   delimiters1: @"Note no space between the falses here" <Test #x"B5808084" [#f#f]>
   delimiters2: <Test #x"B580B303666f6f84" [#f foo]>
   delimiters3: @"No space between the #f and the foo" <ParseError "[#ffoo]">
-  delimiters4: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB1\x0Ea line comment\x81\x84" [#f;a line comment
+  delimiters4: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB1\x0Ea line comment\x81\x84" [#f# a line comment
 #t]>
   delimiters5:  @"Note no space after the #f" <Test #"\xB5\x80\x85\xB3\x03ann\x81\x84" [#f@ann #t]>
   dict0: <Test #x"B784" {}>