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

identifiers: Shorten RoomVersionId variant names

Browse Source
This commit is contained in:
Jonas Platte
2021-11-26 00:50:01 +01:00
parent f03065793b
commit 6b76d7813e
14 changed files with 104 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/ruma-state-res/benches/state_res_bench.rs
View File

@@ -66,7 +66,7 @@ fn resolution_shallow_auth_chain(c: &mut Criterion) {
let ev_map = store.0.clone();
let state_sets = [&state_at_bob, &state_at_charlie];
let _ = match state_res::resolve(
&RoomVersionId::Version6,
&RoomVersionId::V6,
state_sets,
state_sets
.iter()
@@ -130,7 +130,7 @@ fn resolve_deeper_event_set(c: &mut Criterion) {
b.iter(|| {
let state_sets = [&state_set_a, &state_set_b];
let _ = match state_res::resolve(
&RoomVersionId::Version6,
&RoomVersionId::V6,
state_sets,
state_sets
.iter()

4
crates/ruma-state-res/src/lib.rs
View File

@@ -1039,7 +1039,7 @@ mod tests {
let ev_map: EventMap<Arc<StateEvent>> = store.0.clone();
let state_sets = [state_at_bob, state_at_charlie];
let resolved = match crate::resolve(
&RoomVersionId::Version2,
&RoomVersionId::V2,
&state_sets,
state_sets
.iter()
@@ -1143,7 +1143,7 @@ mod tests {
let ev_map: EventMap<Arc<StateEvent>> = store.0.clone();
let state_sets = [state_set_a, state_set_b];
let resolved = match crate::resolve(
&RoomVersionId::Version6,
&RoomVersionId::V6,
&state_sets,
state_sets
.iter()

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

@@ -72,7 +72,7 @@ pub struct RoomVersion {
impl RoomVersion {
pub const VERSION1: Self = Self {
version: RoomVersionId::Version1,
version: RoomVersionId::V1,
disposition: RoomDisposition::Stable,
event_format: EventFormatVersion::V1,
state_res: StateResolutionVersion::V1,
@@ -86,29 +86,26 @@ impl RoomVersion {
};
pub const VERSION2: Self = Self {
version: RoomVersionId::Version2,
version: RoomVersionId::V2,
state_res: StateResolutionVersion::V2,
..Self::VERSION1
};
pub const VERSION3: Self = Self {
version: RoomVersionId::Version3,
version: RoomVersionId::V3,
event_format: EventFormatVersion::V2,
extra_redaction_checks: true,
..Self::VERSION2
};
pub const VERSION4: Self = Self {
version: RoomVersionId::Version4,
event_format: EventFormatVersion::V3,
..Self::VERSION3
};
pub const VERSION4: Self =
Self { version: RoomVersionId::V4, event_format: EventFormatVersion::V3, ..Self::VERSION3 };
pub const VERSION5: Self =
Self { version: RoomVersionId::Version5, enforce_key_validity: true, ..Self::VERSION4 };
Self { version: RoomVersionId::V5, enforce_key_validity: true, ..Self::VERSION4 };
pub const VERSION6: Self = Self {
version: RoomVersionId::Version5,
version: RoomVersionId::V5,
special_case_aliases_auth: false,
strict_canonicaljson: true,
limit_notifications_power_levels: true,
@@ -117,7 +114,7 @@ impl RoomVersion {
#[cfg(feature = "unstable-pre-spec")]
pub const VERSION7: Self = Self {
version: RoomVersionId::Version7,
version: RoomVersionId::V7,
// FIXME: once room version 7 is stabilized move this to version 8
disposition: RoomDisposition::Unstable,
allow_knocking: true,
@@ -126,25 +123,25 @@ impl RoomVersion {
#[cfg(feature = "unstable-pre-spec")]
pub const VERSION8: Self =
Self { version: RoomVersionId::Version8, restricted_join_rules: true, ..Self::VERSION7 };
Self { version: RoomVersionId::V8, restricted_join_rules: true, ..Self::VERSION7 };
#[cfg(feature = "unstable-pre-spec")]
pub const VERSION9: Self = Self { version: RoomVersionId::Version9, ..Self::VERSION8 };
pub const VERSION9: Self = Self { version: RoomVersionId::V9, ..Self::VERSION8 };
pub fn new(version: &RoomVersionId) -> Result<Self> {
Ok(match version {
RoomVersionId::Version1 => Self::VERSION1,
RoomVersionId::Version2 => Self::VERSION2,
RoomVersionId::Version3 => Self::VERSION3,
RoomVersionId::Version4 => Self::VERSION4,
RoomVersionId::Version5 => Self::VERSION5,
RoomVersionId::Version6 => Self::VERSION6,
RoomVersionId::V1 => Self::VERSION1,
RoomVersionId::V2 => Self::VERSION2,
RoomVersionId::V3 => Self::VERSION3,
RoomVersionId::V4 => Self::VERSION4,
RoomVersionId::V5 => Self::VERSION5,
RoomVersionId::V6 => Self::VERSION6,
#[cfg(feature = "unstable-pre-spec")]
RoomVersionId::Version7 => Self::VERSION7,
RoomVersionId::V7 => Self::VERSION7,
#[cfg(feature = "unstable-pre-spec")]
RoomVersionId::Version8 => Self::VERSION8,
RoomVersionId::V8 => Self::VERSION8,
#[cfg(feature = "unstable-pre-spec")]
RoomVersionId::Version9 => Self::VERSION9,
RoomVersionId::V9 => Self::VERSION9,
ver => return Err(Error::Unsupported(format!("found version `{}`", ver.as_str()))),
})
}

7
crates/ruma-state-res/src/test_utils.rs
View File

@@ -116,10 +116,9 @@ pub fn do_check(
})
.collect();
let resolved =
crate::resolve(&RoomVersionId::Version6, state_sets, auth_chain_sets, |id| {
event_map.get(id).map(Arc::clone)
});
let resolved = crate::resolve(&RoomVersionId::V6, state_sets, auth_chain_sets, |id| {
event_map.get(id).map(Arc::clone)
});
match resolved {
Ok(state) => state,
Err(e) => panic!("resolution for {} failed: {}", node, e),