Add support for XML Schema xs:list type
#376
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Now debug representation is readable
failures:
de::tests::trivial::struct_::cdata::byte_buf
de::tests::trivial::struct_::cdata::char_
de::tests::trivial::struct_::cdata::f32_
de::tests::trivial::struct_::cdata::f64_
de::tests::trivial::struct_::cdata::false_
de::tests::trivial::struct_::cdata::i128_
de::tests::trivial::struct_::cdata::i16_
de::tests::trivial::struct_::cdata::i32_
de::tests::trivial::struct_::cdata::i64_
de::tests::trivial::struct_::cdata::i8_
de::tests::trivial::struct_::cdata::isize_
de::tests::trivial::struct_::cdata::string
de::tests::trivial::struct_::cdata::true_
de::tests::trivial::struct_::cdata::u128_
de::tests::trivial::struct_::cdata::u16_
de::tests::trivial::struct_::cdata::u32_
de::tests::trivial::struct_::cdata::u64_
de::tests::trivial::struct_::cdata::u8_
de::tests::trivial::struct_::cdata::usize_
de::tests::trivial::struct_::text::byte_buf
… trivial tests
failures:
de::tests::trivial::struct_::text::byte_buf
de::tests::trivial::struct_::cdata::byte_buf
Mingun
commented
Mar 23, 2022
Comment on lines
178
to
+187
| State::Attribute => { | ||
| let decoder = self.de.reader.decoder(); | ||
| match self.next_attr()? { | ||
| Some(a) => seed.deserialize(EscapedDeserializer::new(a.value, decoder, true)), | ||
| Some(a) => { | ||
| //FIXME: we have to clone value because of wrong lifetimes on `a` | ||
| // It should be bound to the input lifetime, but it instead bound | ||
| // to a deserializer lifetime | ||
| let value: Vec<_> = a.value.into_owned(); | ||
| seed.deserialize(SimpleTypeDeserializer::new(value.into(), true, decoder)) | ||
| } |
There was a problem hiding this comment.
This is a temporary solution. I'll remove this clone in next PRs, when I figure out how to do that. In any case, struct / map deserialization should be reviewed to match expectations that I documenting in #369
…tead of `BytesText` This commit revert changes from 85f9f68
No need to require that reader live as long as input from which it is borrow - we should be able to drop it if we don't need it anymore
dralley
reviewed
Jun 5, 2022
| @@ -35,9 +36,15 @@ impl<'de> Deserialize<'de> for ByteBuf { | |||
| } | |||
| } | |||
|
|
|||
| impl fmt::Debug for ByteBuf { | |||
| fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { | |||
| write_byte_string(f, &self.0) | |||
There was a problem hiding this comment.
write_byte_string could use some documentation
dralley
reviewed
Jun 5, 2022
| @@ -36,6 +36,8 @@ where | |||
| let decoder = self.de.reader.decoder(); | |||
| let de = match self.de.peek()? { | |||
| DeEvent::Text(t) => EscapedDeserializer::new(Cow::Borrowed(t), decoder, true), | |||
| // Escape sequences does not processed inside CDATA section | |||
There was a problem hiding this comment.
Suggested change
| // Escape sequences does not processed inside CDATA section | |
| // Escape sequences are not processed inside CDATA section |
|
GitHub thinks that this PR coming from https://github.com/Mingun/fast-xml/tree/xs-list repo and I cannot change that, so I'll close it and make a new PR |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR allows deserializing
Vecand other sequences from space-separated lists, as defined by XML Schema specification. So now this is possible:Deserialize
from
This PR is based on #374, because before parsing text/CDATA content I will need to fix CDATA handling. It also cancels change in the bytes deserializing: now it is again possible to get a raw content of the parsed buffer using deserializing into
Vec<u8>/&[u8]. This is not much useful in my opinion, although, so I put a TODO to look at this later.