Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Introduce StatusV2 #374

Merged
merged 1 commit into from
Nov 4, 2023
Merged

feat: Introduce StatusV2 #374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 153 additions & 0 deletions imap-types/src/response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,159 @@ impl<'a> Data<'a> {
}
}

/// An alternative definition of [`Status`].
///
/// Note: Both definitions are semantically equal, thus, they can always be converted to each other.
/// However, the new definition makes IMAP processing (and pattern matching) easier.
#[derive(Debug)]
pub enum StatusV2<'a> {
Untagged(StatusBody<'a>),
Tagged(Tagged<'a>),
Bye(Bye<'a>),
}

#[derive(Debug)]
pub struct StatusBody<'a> {
pub kind: StatusKind,
pub code: Option<Code<'a>>,
pub text: Text<'a>,
}

#[derive(Debug)]
pub enum StatusKind {
Ok,
No,
Bad,
}

#[derive(Debug)]
pub struct Tagged<'a> {
pub tag: Tag<'a>,
pub body: StatusBody<'a>,
}

#[derive(Debug)]
pub struct Bye<'a> {
pub code: Option<Code<'a>>,
pub text: Text<'a>,
}

impl<'a> From<Status<'a>> for StatusV2<'a> {
fn from(value: Status<'a>) -> Self {
match value {
Status::Ok {
tag: Some(tag),
code,
text,
} => StatusV2::Tagged(Tagged {
tag,
body: StatusBody {
kind: StatusKind::Ok,
code,
text,
},
}),
Status::No {
tag: Some(tag),
code,
text,
} => StatusV2::Tagged(Tagged {
tag,
body: StatusBody {
kind: StatusKind::No,
code,
text,
},
}),
Status::Bad {
tag: Some(tag),
code,
text,
} => StatusV2::Tagged(Tagged {
tag,
body: StatusBody {
kind: StatusKind::Bad,
code,
text,
},
}),
Status::Ok {
tag: None,
code,
text,
} => StatusV2::Untagged(StatusBody {
kind: StatusKind::Ok,
code,
text,
}),
Status::No {
tag: None,
code,
text,
} => StatusV2::Untagged(StatusBody {
kind: StatusKind::No,
code,
text,
}),
Status::Bad {
tag: None,
code,
text,
} => StatusV2::Untagged(StatusBody {
kind: StatusKind::Bad,
code,
text,
}),
Status::Bye { code, text } => StatusV2::Bye(Bye { code, text }),
}
}
}

impl<'a> From<StatusV2<'a>> for Status<'a> {
fn from(status: StatusV2<'a>) -> Self {
match status {
StatusV2::Untagged(StatusBody { kind, code, text }) => match kind {
StatusKind::Ok => Status::Ok {
tag: None,
code,
text,
},
StatusKind::No => Status::No {
tag: None,
code,
text,
},
StatusKind::Bad => Status::Bad {
tag: None,
code,
text,
},
},
StatusV2::Tagged(Tagged {
tag,
body: StatusBody { kind, code, text },
}) => match kind {
StatusKind::Ok => Status::Ok {
tag: Some(tag),
code,
text,
},
StatusKind::No => Status::No {
tag: Some(tag),
code,
text,
},
StatusKind::Bad => Status::Bad {
tag: Some(tag),
code,
text,
},
},
StatusV2::Bye(Bye { code, text }) => Status::Bye { code, text },
}
}
}

/// ## 7.5. Server Responses - Command Continuation Request
///
/// The command continuation request response is indicated by a "+" token
Expand Down
Loading