fix: wrong vanished parsing

Author: soywod

imap-codec/src/response.rs

@@ -4,8 +4,6 @@ use abnf_core::streaming::crlf;
 use abnf_core::streaming::crlf_relaxed as crlf;
 use abnf_core::streaming::sp;
 use base64::{Engine, engine::general_purpose::STANDARD as _base64};
-#[cfg(feature = "ext_condstore_qresync")]
-use imap_types::sequence::SequenceSet;
 use imap_types::{
     core::{Text, Vec1},
     fetch::MessageDataItem,
@@ -423,39 +421,35 @@ pub(crate) fn message_data(input: &[u8]) -> IMAPResult<&[u8], Data> {
     enum TmpData<'a> {
         Expunge,
         Fetch(Vec1<MessageDataItem<'a>>),
-        #[cfg(feature = "ext_condstore_qresync")]
-        Vanished(bool, SequenceSet),
     }
 
-    let (remaining, (seq, tmp)) = tuple((
-        terminated(nz_number, sp),
-        alt((
-            value(TmpData::Expunge, tag_no_case(b"EXPUNGE")),
-            map(preceded(tag_no_case(b"FETCH "), msg_att), TmpData::Fetch),
-            #[cfg(feature = "ext_condstore_qresync")]
-            map(
-                tuple((
-                    tag_no_case("VANISHED"),
-                    opt(tag_no_case(" (EARLIER)")),
-                    preceded(sp, sequence_set),
+    alt((
+        map(
+            tuple((
+                terminated(nz_number, sp),
+                alt((
+                    value(TmpData::Expunge, tag_no_case(b"EXPUNGE")),
+                    map(preceded(tag_no_case(b"FETCH "), msg_att), TmpData::Fetch),
                 )),
-                |(_, earlier, known_uids)| TmpData::Vanished(earlier.is_some(), known_uids),
-            ),
-        )),
-    ))(input)?;
-
-    Ok((
-        remaining,
-        match tmp {
-            TmpData::Expunge => Data::Expunge(seq),
-            TmpData::Fetch(items) => Data::Fetch { seq, items },
-            #[cfg(feature = "ext_condstore_qresync")]
-            TmpData::Vanished(earlier, known_uids) => Data::Vanished {
-                earlier,
+            )),
+            |(seq, tmp)| match tmp {
+                TmpData::Expunge => Data::Expunge(seq),
+                TmpData::Fetch(items) => Data::Fetch { seq, items },
+            },
+        ),
+        #[cfg(feature = "ext_condstore_qresync")]
+        map(
+            tuple((
+                tag_no_case(b"VANISHED"),
+                opt(tag_no_case(" (EARLIER)")),
+                preceded(sp, sequence_set),
+            )),
+            |(_, earlier, known_uids)| Data::Vanished {
+                earlier: earlier.is_some(),
                 known_uids,
             },
-        },
-    ))
+        ),
+    ))(input)
 }
 
 #[cfg(test)]