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

identifiers: Move room versions 8, 9 out of unstable-spec

Browse Source 
… since v1.2 is out!
This commit is contained in:
Jonas Platte 2022-02-02 23:06:39 +01:00
parent 40a96b93b1
commit e9994b89c8
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
6 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/ruma-events/Cargo.toml
View File

@ -22,7 +22,7 @@ markdown = ["pulldown-cmark"]
unstable-exhaustive-types = [] unstable-exhaustive-types = []
unstable-pdu = [] unstable-pdu = []
unstable-pre-spec = ["unstable-spec"] unstable-pre-spec = ["unstable-spec"]
unstable-spec = ["ruma-identifiers/unstable-spec"] unstable-spec = []
[dependencies] [dependencies]
criterion = { version = "0.3.3", optional = true } criterion = { version = "0.3.3", optional = true }

1
crates/ruma-identifiers/Cargo.toml
View File

@ -23,7 +23,6 @@ default = ["serde"]
compat = ["ruma-identifiers-validation/compat"] compat = ["ruma-identifiers-validation/compat"]
rand = ["rand_crate", "uuid"] rand = ["rand_crate", "uuid"]
serde = ["ruma-serde", "serde1"] serde = ["ruma-serde", "serde1"]
unstable-spec = []
[dependencies] [dependencies]
either = { version = "1.6.1", optional = true } either = { version = "1.6.1", optional = true }

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

@ -46,11 +46,9 @@ pub enum RoomVersionId {
V7, V7,
/// A version 8 room. /// A version 8 room.
#[cfg(feature = "unstable-spec")]
V8, V8,
/// A version 9 room. /// A version 9 room.
#[cfg(feature = "unstable-spec")]
V9, V9,
#[doc(hidden)] #[doc(hidden)]
@ -70,9 +68,7 @@ impl RoomVersionId {
Self::V5 => "5", Self::V5 => "5",
Self::V6 => "6", Self::V6 => "6",
Self::V7 => "7", Self::V7 => "7",
#[cfg(feature = "unstable-spec")]
Self::V8 => "8", Self::V8 => "8",
#[cfg(feature = "unstable-spec")]
Self::V9 => "9", Self::V9 => "9",
Self::_Custom(version) => version.as_str(), Self::_Custom(version) => version.as_str(),
} }
@ -94,9 +90,7 @@ impl From<RoomVersionId> for String {
RoomVersionId::V5 => "5".to_owned(), RoomVersionId::V5 => "5".to_owned(),
RoomVersionId::V6 => "6".to_owned(), RoomVersionId::V6 => "6".to_owned(),
RoomVersionId::V7 => "7".to_owned(), RoomVersionId::V7 => "7".to_owned(),
#[cfg(feature = "unstable-spec")]
RoomVersionId::V8 => "8".to_owned(), RoomVersionId::V8 => "8".to_owned(),
#[cfg(feature = "unstable-spec")]
RoomVersionId::V9 => "9".to_owned(), RoomVersionId::V9 => "9".to_owned(),
RoomVersionId::_Custom(version) => version.into(), RoomVersionId::_Custom(version) => version.into(),
} }
@ -164,9 +158,7 @@ where
"5" => RoomVersionId::V5, "5" => RoomVersionId::V5,
"6" => RoomVersionId::V6, "6" => RoomVersionId::V6,
"7" => RoomVersionId::V7, "7" => RoomVersionId::V7,
#[cfg(feature = "unstable-spec")]
"8" => RoomVersionId::V8, "8" => RoomVersionId::V8,
#[cfg(feature = "unstable-spec")]
"9" => RoomVersionId::V9, "9" => RoomVersionId::V9,
custom => { custom => {
ruma_identifiers_validation::room_version_id::validate(custom)?; ruma_identifiers_validation::room_version_id::validate(custom)?;

2
crates/ruma-signatures/Cargo.toml
View File

@ -17,7 +17,7 @@ all-features = true
[features] [features]
compat = ["tracing"] compat = ["tracing"]
unstable-exhaustive-types = [] unstable-exhaustive-types = []
unstable-pre-spec = ["ruma-identifiers/unstable-spec"] unstable-pre-spec = []
[dependencies] [dependencies]
base64 = "0.13.0" base64 = "0.13.0"

2
crates/ruma-state-res/Cargo.toml
View File

@ -17,7 +17,7 @@ all-features = true
[features] [features]
compat = [] compat = []
unstable-exhaustive-types = [] unstable-exhaustive-types = []
unstable-spec = ["ruma-events/unstable-spec", "ruma-identifiers/unstable-spec"] unstable-spec = ["ruma-events/unstable-spec"]
# Private, only used in test / benchmarking code # Private, only used in test / benchmarking code
__unstable-pre-spec = ["ruma-events/unstable-pre-spec", "unstable-spec"] __unstable-pre-spec = ["ruma-events/unstable-pre-spec", "unstable-spec"]

1
crates/ruma/Cargo.toml
View File

@ -122,7 +122,6 @@ unstable-pre-spec = [
unstable-spec = [ unstable-spec = [
"ruma-client-api/unstable-spec", "ruma-client-api/unstable-spec",
"ruma-events/unstable-spec", "ruma-events/unstable-spec",
"ruma-identifiers/unstable-spec",
] ]
[dependencies] [dependencies]