@@ -34,14 +34,11 @@ fn parse_lane() {
34
34
}
35
35
36
36
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
+ ) ;
45
42
}
46
43
}
47
44
@@ -69,7 +66,7 @@ fn parse_lane() {
69
66
ok (
70
67
"$topic" ,
71
68
LaneSelector {
72
- segment : Segment :: Selector ( PubSubSelector :: inject ( TopicSelector :: default ( ) ) ) ,
69
+ segment : Segment :: Selector ( PubSubSelector :: inject ( TopicSelector ) ) ,
73
70
pattern : "$topic" . to_string ( ) ,
74
71
} ,
75
72
) ;
@@ -111,14 +108,11 @@ fn parse_node() {
111
108
}
112
109
113
110
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
+ ) ;
122
116
}
123
117
}
124
118
ok (
@@ -160,7 +154,7 @@ fn parse_node() {
160
154
NodeSelector {
161
155
segments : vec ! [
162
156
Segment :: Static ( "/node/" . to_string( ) ) ,
163
- Segment :: Selector ( PubSubSelector :: inject( TopicSelector :: default ( ) ) ) ,
157
+ Segment :: Selector ( PubSubSelector :: inject( TopicSelector ) ) ,
164
158
] ,
165
159
pattern : "/node/$topic" . to_string ( ) ,
166
160
} ,
@@ -226,7 +220,7 @@ fn parse_payload() {
226
220
PayloadSelector {
227
221
inner : Inner :: Value {
228
222
pattern : "$topic" . to_string ( ) ,
229
- segment : PayloadSegment :: Selector ( PubSubSelector :: inject ( TopicSelector :: default ( ) ) ) ,
223
+ segment : PayloadSegment :: Selector ( PubSubSelector :: inject ( TopicSelector ) ) ,
230
224
} ,
231
225
required : true ,
232
226
} ,
0 commit comments