chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

identifiers: Remove RoomVersionId::{is_custom, is_official}

Browse Source 
They were a forwards-compatibility hazard.
This commit is contained in:
Jonas Platte 2020-09-22 01:03:30 +02:00
parent f0df31d42b
commit 91994015d2
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
1 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
ruma-identifiers/src/room_version_id.rs
View File

@ -65,16 +65,6 @@ impl RoomVersionId {
pub fn as_bytes(&self) -> &[u8] { pub fn as_bytes(&self) -> &[u8] {
self.as_str().as_bytes() self.as_str().as_bytes()
} }
/// Whether or not this room version is an official one specified by the Matrix protocol.
pub fn is_official(&self) -> bool {
!self.is_custom()
}
/// Whether or not this is a custom room version.
pub fn is_custom(&self) -> bool {
matches!(self, Self::Custom(_))
}
} }
impl From<RoomVersionId> for String { impl From<RoomVersionId> for String {
@ -243,7 +233,7 @@ mod tests {
#[cfg(feature = "serde")] #[cfg(feature = "serde")]
use serde_json::{from_str, to_string}; use serde_json::{from_str, to_string};
use super::{CustomRoomVersion, RoomVersionId}; use super::RoomVersionId;
use crate::Error; use crate::Error;
#[test] #[test]
@ -332,7 +322,6 @@ mod tests {
from_str::<RoomVersionId>(r#""1""#).expect("Failed to convert RoomVersionId to JSON."); from_str::<RoomVersionId>(r#""1""#).expect("Failed to convert RoomVersionId to JSON.");
assert_eq!(deserialized, RoomVersionId::Version1); assert_eq!(deserialized, RoomVersionId::Version1);
assert!(deserialized.is_official());
assert_eq!( assert_eq!(
deserialized, deserialized,
@ -358,33 +347,9 @@ mod tests {
let deserialized = from_str::<RoomVersionId>(r#""io.ruma.1""#) let deserialized = from_str::<RoomVersionId>(r#""io.ruma.1""#)
.expect("Failed to convert RoomVersionId to JSON."); .expect("Failed to convert RoomVersionId to JSON.");
assert!(deserialized.is_custom());
assert_eq!( assert_eq!(
deserialized, deserialized,
RoomVersionId::try_from("io.ruma.1").expect("Failed to create RoomVersionId.") RoomVersionId::try_from("io.ruma.1").expect("Failed to create RoomVersionId.")
); );
} }
#[test]
fn official_versions() {
assert!(RoomVersionId::Version1.is_official());
assert!(RoomVersionId::Version2.is_official());
assert!(RoomVersionId::Version3.is_official());
assert!(RoomVersionId::Version4.is_official());
assert!(RoomVersionId::Version5.is_official());
assert!(RoomVersionId::Version6.is_official());
assert!(!RoomVersionId::Custom(CustomRoomVersion("io.ruma.1".into())).is_official());
}
#[test]
fn custom_versions() {
assert!(!RoomVersionId::Version1.is_custom());
assert!(!RoomVersionId::Version2.is_custom());
assert!(!RoomVersionId::Version3.is_custom());
assert!(!RoomVersionId::Version4.is_custom());
assert!(!RoomVersionId::Version5.is_custom());
assert!(!RoomVersionId::Version6.is_custom());
assert!(RoomVersionId::Custom(CustomRoomVersion("io.ruma.1".into())).is_custom());
}
} }