diff --git a/rust/benches/evaluator.rs b/rust/benches/evaluator.rs
index 8213dfd9ea..79b553dbb0 100644
--- a/rust/benches/evaluator.rs
+++ b/rust/benches/evaluator.rs
@@ -14,6 +14,7 @@
#![feature(test)]
use std::collections::BTreeSet;
+
use synapse::push::{
evaluator::PushRuleEvaluator, Condition, EventMatchCondition, FilteredPushRules, JsonValue,
PushRules, SimpleJsonValue,
@@ -44,8 +45,6 @@ fn bench_match_exact(b: &mut Bencher) {
let eval = PushRuleEvaluator::py_new(
flattened_keys,
false,
- BTreeSet::new(),
- false,
10,
Some(0),
Default::default(),
@@ -54,15 +53,13 @@ fn bench_match_exact(b: &mut Bencher) {
vec![],
false,
false,
- false,
)
.unwrap();
let condition = Condition::Known(synapse::push::KnownCondition::EventMatch(
EventMatchCondition {
key: "room_id".into(),
- pattern: Some("!room:server".into()),
- pattern_type: None,
+ pattern: "!room:server".into(),
},
));
@@ -94,8 +91,6 @@ fn bench_match_word(b: &mut Bencher) {
let eval = PushRuleEvaluator::py_new(
flattened_keys,
false,
- BTreeSet::new(),
- false,
10,
Some(0),
Default::default(),
@@ -104,15 +99,13 @@ fn bench_match_word(b: &mut Bencher) {
vec![],
false,
false,
- false,
)
.unwrap();
let condition = Condition::Known(synapse::push::KnownCondition::EventMatch(
EventMatchCondition {
key: "content.body".into(),
- pattern: Some("test".into()),
- pattern_type: None,
+ pattern: "test".into(),
},
));
@@ -144,8 +137,6 @@ fn bench_match_word_miss(b: &mut Bencher) {
let eval = PushRuleEvaluator::py_new(
flattened_keys,
false,
- BTreeSet::new(),
- false,
10,
Some(0),
Default::default(),
@@ -154,15 +145,13 @@ fn bench_match_word_miss(b: &mut Bencher) {
vec![],
false,
false,
- false,
)
.unwrap();
let condition = Condition::Known(synapse::push::KnownCondition::EventMatch(
EventMatchCondition {
key: "content.body".into(),
- pattern: Some("foobar".into()),
- pattern_type: None,
+ pattern: "foobar".into(),
},
));
@@ -194,8 +183,6 @@ fn bench_eval_message(b: &mut Bencher) {
let eval = PushRuleEvaluator::py_new(
flattened_keys,
false,
- BTreeSet::new(),
- false,
10,
Some(0),
Default::default(),
@@ -204,7 +191,6 @@ fn bench_eval_message(b: &mut Bencher) {
vec![],
false,
false,
- false,
)
.unwrap();
|