Revert "Merge #1001"

This reverts commit 690eab4a25, reversing
changes made to 086020e543.

update changelog
This commit is contained in:
mpostma 2020-10-30 11:30:18 +01:00
parent 39cf1931ae
commit a8ab15d65d
8 changed files with 95 additions and 120 deletions

View file

@ -55,7 +55,6 @@ pub struct Deserializer<'a> {
pub documents_fields: DocumentsFields,
pub schema: &'a Schema,
pub fields: Option<&'a HashSet<FieldId>>,
pub displayed: bool,
}
impl<'de, 'a, 'b> de::Deserializer<'de> for &'b mut Deserializer<'a> {
@ -94,9 +93,7 @@ impl<'de, 'a, 'b> de::Deserializer<'de> for &'b mut Deserializer<'a> {
};
let is_displayed = self.schema.is_displayed(attr);
// Check if displayed fields were requested, if yes, return only displayed fields,
// else return all fields
if !self.displayed || (is_displayed && self.fields.map_or(true, |f| f.contains(&attr))) {
if is_displayed && self.fields.map_or(true, |f| f.contains(&attr)) {
if let Some(attribute_name) = self.schema.name(attr) {
let cursor = Cursor::new(value.to_owned());
let ioread = SerdeJsonIoRead::new(cursor);