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

Move RoomVersionId::V7 out of unstable-pre-spec

Browse Source 
Matrix v1.1 stabilized room version 7.
This commit is contained in:
Jonas Platte 2021-12-14 13:58:58 +01:00
parent d3679c1902
commit 57cbe491f0
No known key found for this signature in database
GPG Key ID: CC154DE0E30B7C67
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ruma-identifiers/src/room_version_id.rs
View File

@ -43,7 +43,6 @@ pub enum RoomVersionId {
V6, V6,
/// A version 7 room. /// A version 7 room.
#[cfg(feature = "unstable-pre-spec")]
V7, V7,
/// A version 8 room. /// A version 8 room.
@ -70,7 +69,6 @@ impl RoomVersionId {
Self::V4 => "4", Self::V4 => "4",
Self::V5 => "5", Self::V5 => "5",
Self::V6 => "6", Self::V6 => "6",
#[cfg(feature = "unstable-pre-spec")]
Self::V7 => "7", Self::V7 => "7",
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
Self::V8 => "8", Self::V8 => "8",
@ -95,7 +93,6 @@ impl From<RoomVersionId> for String {
RoomVersionId::V4 => "4".to_owned(), RoomVersionId::V4 => "4".to_owned(),
RoomVersionId::V5 => "5".to_owned(), RoomVersionId::V5 => "5".to_owned(),
RoomVersionId::V6 => "6".to_owned(), RoomVersionId::V6 => "6".to_owned(),
#[cfg(feature = "unstable-pre-spec")]
RoomVersionId::V7 => "7".to_owned(), RoomVersionId::V7 => "7".to_owned(),
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
RoomVersionId::V8 => "8".to_owned(), RoomVersionId::V8 => "8".to_owned(),
@ -166,7 +163,6 @@ where
"4" => RoomVersionId::V4, "4" => RoomVersionId::V4,
"5" => RoomVersionId::V5, "5" => RoomVersionId::V5,
"6" => RoomVersionId::V6, "6" => RoomVersionId::V6,
#[cfg(feature = "unstable-pre-spec")]
"7" => RoomVersionId::V7, "7" => RoomVersionId::V7,
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
"8" => RoomVersionId::V8, "8" => RoomVersionId::V8,

2
crates/ruma-state-res/src/room_version.rs
View File

@ -98,7 +98,6 @@ impl RoomVersion {
..Self::V5 ..Self::V5
}; };
#[cfg(feature = "unstable-pre-spec")]
pub const V7: Self = Self { pub const V7: Self = Self {
// FIXME: once room version 7 is stabilized move this to version 8 // FIXME: once room version 7 is stabilized move this to version 8
disposition: RoomDisposition::Unstable, disposition: RoomDisposition::Unstable,
@ -120,7 +119,6 @@ impl RoomVersion {
RoomVersionId::V4 => Self::V4, RoomVersionId::V4 => Self::V4,
RoomVersionId::V5 => Self::V5, RoomVersionId::V5 => Self::V5,
RoomVersionId::V6 => Self::V6, RoomVersionId::V6 => Self::V6,
#[cfg(feature = "unstable-pre-spec")]
RoomVersionId::V7 => Self::V7, RoomVersionId::V7 => Self::V7,
#[cfg(feature = "unstable-pre-spec")] #[cfg(feature = "unstable-pre-spec")]
RoomVersionId::V8 => Self::V8, RoomVersionId::V8 => Self::V8,