Matrix-Mirrors/forked-synapse
1
0
Fork 0
mirror of https://mau.dev/maunium/synapse.git synced 2024-10-01 01:36:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use nightly rustfmt in CI (#15188)

Browse Source 
As we use some nightly only options, e.g. to group and sort imports
consistently.
This commit is contained in:
Erik Johnston 2023-03-03 14:26:14 +00:00 committed by GitHub
parent 6b6e91e610
commit 242d2a27ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/tests.yml vendored
View File

@ -156,7 +156,8 @@ jobs:
# We pin to a specific commit for paranoia's sake. # We pin to a specific commit for paranoia's sake.
uses: dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295 uses: dtolnay/rust-toolchain@e12eda571dc9a5ee5d58eecf4738ec291c66f295
with: with:
toolchain: 1.58.1 # We use nightly so that it correctly groups together imports
toolchain: nightly-2022-12-01
components: rustfmt components: rustfmt
- uses: Swatinem/rust-cache@v2 - uses: Swatinem/rust-cache@v2

1
changelog.d/15188.misc Normal file
View File

@ -0,0 +1 @@
Use nightly rustfmt in CI.

1
rust/benches/evaluator.rs
View File

@ -14,6 +14,7 @@
#![feature(test)] #![feature(test)]
use std::collections::BTreeSet; use std::collections::BTreeSet;
use synapse::push::{ use synapse::push::{
evaluator::PushRuleEvaluator, Condition, EventMatchCondition, FilteredPushRules, JsonValue, evaluator::PushRuleEvaluator, Condition, EventMatchCondition, FilteredPushRules, JsonValue,
PushRules, SimpleJsonValue, PushRules, SimpleJsonValue,

2
rust/src/push/evaluator.rs
View File

@ -15,7 +15,6 @@
use std::borrow::Cow; use std::borrow::Cow;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use crate::push::{EventMatchPatternType, JsonValue};
use anyhow::{Context, Error}; use anyhow::{Context, Error};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use log::warn; use log::warn;
@ -27,6 +26,7 @@ use super::{
Action, Condition, ExactEventMatchCondition, FilteredPushRules, KnownCondition, Action, Condition, ExactEventMatchCondition, FilteredPushRules, KnownCondition,
SimpleJsonValue, SimpleJsonValue,
}; };
use crate::push::{EventMatchPatternType, JsonValue};
lazy_static! { lazy_static! {
/// Used to parse the `is` clause in the room member count condition. /// Used to parse the `is` clause in the room member count condition.