Skip to content

Commit 47f7726

Browse files
committed
Pleases clippy
1 parent af0dee4 commit 47f7726

File tree

2 files changed

+15
-21
lines changed

2 files changed

+15
-21
lines changed

server/swimos_connector/src/selector/pubsub/relay/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -476,9 +476,9 @@ impl Relay {
476476
})
477477
}
478478

479-
pub fn select_handler<'a>(
479+
pub fn select_handler(
480480
&self,
481-
args: &PubSubSelectorArgs<'a>,
481+
args: &PubSubSelectorArgs<'_>,
482482
) -> Result<GenericSendCommandOp, SelectorError> {
483483
let Relay {
484484
node,

server/swimos_connector/src/selector/pubsub/relay/tests.rs

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,11 @@ fn parse_lane() {
3434
}
3535

3636
fn err(pattern: &str) {
37-
match LaneSelector::from_str(pattern) {
38-
Ok(actual) => {
39-
panic!(
40-
"Expected parse error from pattern {}, but got {:?}",
41-
pattern, actual
42-
);
43-
}
44-
Err(_) => {}
37+
if let Ok(actual) = LaneSelector::from_str(pattern) {
38+
panic!(
39+
"Expected parse error from pattern {}, but got {:?}",
40+
pattern, actual
41+
);
4542
}
4643
}
4744

@@ -69,7 +66,7 @@ fn parse_lane() {
6966
ok(
7067
"$topic",
7168
LaneSelector {
72-
segment: Segment::Selector(PubSubSelector::inject(TopicSelector::default())),
69+
segment: Segment::Selector(PubSubSelector::inject(TopicSelector)),
7370
pattern: "$topic".to_string(),
7471
},
7572
);
@@ -111,14 +108,11 @@ fn parse_node() {
111108
}
112109

113110
fn err(pattern: &str) {
114-
match NodeSelector::from_str(pattern) {
115-
Ok(actual) => {
116-
panic!(
117-
"Expected parse error from pattern {}, but got {:?}",
118-
pattern, actual
119-
);
120-
}
121-
Err(_) => {}
111+
if let Ok(actual) = NodeSelector::from_str(pattern) {
112+
panic!(
113+
"Expected parse error from pattern {}, but got {:?}",
114+
pattern, actual
115+
);
122116
}
123117
}
124118
ok(
@@ -160,7 +154,7 @@ fn parse_node() {
160154
NodeSelector {
161155
segments: vec![
162156
Segment::Static("/node/".to_string()),
163-
Segment::Selector(PubSubSelector::inject(TopicSelector::default())),
157+
Segment::Selector(PubSubSelector::inject(TopicSelector)),
164158
],
165159
pattern: "/node/$topic".to_string(),
166160
},
@@ -226,7 +220,7 @@ fn parse_payload() {
226220
PayloadSelector {
227221
inner: Inner::Value {
228222
pattern: "$topic".to_string(),
229-
segment: PayloadSegment::Selector(PubSubSelector::inject(TopicSelector::default())),
223+
segment: PayloadSegment::Selector(PubSubSelector::inject(TopicSelector)),
230224
},
231225
required: true,
232226
},

0 commit comments

Comments
 (0)