Merge pull request #136 from avitex/master

Make capabilities has_str case insensitive
This commit is contained in:
Jon Gjengset 2019-09-04 09:23:09 -04:00 committed by GitHub
commit 6c9611ff3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -45,13 +45,16 @@ impl Capabilities {
/// Check if the server has the given capability via str.
pub fn has_str<S: AsRef<str>>(&self, cap: S) -> bool {
let s = cap.as_ref();
if s == IMAP4REV1_CAPABILITY {
self.has(&Capability::Imap4rev1)
} else if s.starts_with(AUTH_CAPABILITY_PREFIX) {
self.has(&Capability::Auth(&s[AUTH_CAPABILITY_PREFIX.len()..]))
} else {
self.has(&Capability::Atom(s))
if s.eq_ignore_ascii_case(IMAP4REV1_CAPABILITY) {
return self.has(&Capability::Imap4rev1);
}
if s.len() > AUTH_CAPABILITY_PREFIX.len() {
let (pre, val) = s.split_at(AUTH_CAPABILITY_PREFIX.len());
if pre.eq_ignore_ascii_case(AUTH_CAPABILITY_PREFIX) {
return self.has(&Capability::Auth(val));
}
}
self.has(&Capability::Atom(s))
}
/// Iterate over all the server's capabilities