Repairs after merge
This commit is contained in:
parent
1aedfe46b7
commit
7c0fc8f358
|
@ -71,7 +71,7 @@
|
||||||
delimiters1: @"Note no space between the falses here" <Test #x"B5808084" [#f#f]>
|
delimiters1: @"Note no space between the falses here" <Test #x"B5808084" [#f#f]>
|
||||||
delimiters2: <Test #x"B580B303666f6f84" [#f foo]>
|
delimiters2: <Test #x"B580B303666f6f84" [#f foo]>
|
||||||
delimiters3: @"No space between the #f and the foo" <ParseError "[#ffoo]">
|
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]>
|
#t]>
|
||||||
delimiters5: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB3\x03ann\x81\x84" [#f@ann #t]>
|
delimiters5: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB3\x03ann\x81\x84" [#f@ann #t]>
|
||||||
dict0: <Test #x"B784" {}>
|
dict0: <Test #x"B784" {}>
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
delimiters1: @"Note no space between the falses here" <Test #x"B5808084" [#f#f]>
|
delimiters1: @"Note no space between the falses here" <Test #x"B5808084" [#f#f]>
|
||||||
delimiters2: <Test #x"B580B303666f6f84" [#f foo]>
|
delimiters2: <Test #x"B580B303666f6f84" [#f foo]>
|
||||||
delimiters3: @"No space between the #f and the foo" <ParseError "[#ffoo]">
|
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]>
|
#t]>
|
||||||
delimiters5: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB3\x03ann\x81\x84" [#f@ann #t]>
|
delimiters5: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB3\x03ann\x81\x84" [#f@ann #t]>
|
||||||
dict0: <Test #x"B784" {}>
|
dict0: <Test #x"B784" {}>
|
||||||
|
|
|
@ -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();
|
let (existing_annotations, v) = Reader::<N>::demand_next(self, true)?.pieces();
|
||||||
annotations.extend_from_slice(existing_annotations.slice());
|
annotations.extend_from_slice(existing_annotations.slice());
|
||||||
Ok(N::wrap(Annotations::new(Some(annotations)), v))
|
Ok(N::wrap(Annotations::new(Some(annotations)), v))
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
delimiters1: @"Note no space between the falses here" <Test #x"B5808084" [#f#f]>
|
delimiters1: @"Note no space between the falses here" <Test #x"B5808084" [#f#f]>
|
||||||
delimiters2: <Test #x"B580B303666f6f84" [#f foo]>
|
delimiters2: <Test #x"B580B303666f6f84" [#f foo]>
|
||||||
delimiters3: @"No space between the #f and the foo" <ParseError "[#ffoo]">
|
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]>
|
#t]>
|
||||||
delimiters5: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB3\x03ann\x81\x84" [#f@ann #t]>
|
delimiters5: @"Note no space after the #f" <Test #"\xB5\x80\x85\xB3\x03ann\x81\x84" [#f@ann #t]>
|
||||||
dict0: <Test #x"B784" {}>
|
dict0: <Test #x"B784" {}>
|
||||||
|
|
Loading…
Reference in New Issue