Skip to content

Commit c21f421

Browse files
jszwedkojszwedko
committed
More needless_wraps
Signed-off-by: Jesse Szwedko <[email protected]>
1 parent 5a89924 commit c21f421

6 files changed

+40
-39
lines changed

‎lib/remap-functions/src/parse_aws_alb_log.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ impl Expression for ParseAwsAlbLogFn {
5555
self.value
5656
.type_def(state)
5757
.into_fallible(true) // Log parsing error
58-
.with_inner_type(inner_type_def())
58+
.with_inner_type(Some(inner_type_def()))
5959
.with_constraint(value::Kind::Map)
6060
}
6161
}
6262

6363
/// The type defs of the fields contained by the returned map.
64-
fn inner_type_def() -> Option<InnerTypeDef> {
65-
Some(inner_type_def! ({
64+
fn inner_type_def() -> InnerTypeDef {
65+
inner_type_def! ({
6666
"type": Kind::Bytes,
6767
"timestamp": Kind::Bytes,
6868
"elb": Kind::Bytes,
@@ -94,7 +94,7 @@ fn inner_type_def() -> Option<InnerTypeDef> {
9494
"target_status_code_list": Kind::Bytes,
9595
"classification": Kind::Bytes,
9696
"classification_reason": Kind::Bytes
97-
}))
97+
})
9898
}
9999

100100
fn parse_log(mut input: &str) -> Result<Value> {
@@ -240,12 +240,12 @@ mod tests {
240240
remap::test_type_def![
241241
value_string {
242242
expr: |_| ParseAwsAlbLogFn { value: Literal::from("foo").boxed() },
243-
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: inner_type_def() },
243+
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: Some(inner_type_def()) },
244244
}
245245

246246
value_optional {
247247
expr: |_| ParseAwsAlbLogFn { value: Box::new(Noop) },
248-
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: inner_type_def() },
248+
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: Some(inner_type_def()) },
249249
}
250250
];
251251

‎lib/remap-functions/src/parse_aws_cloudwatch_log_subscription_message.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ impl Expression for ParseAwsCloudWatchLogSubscriptionMessageFn {
5858
self.value
5959
.type_def(state)
6060
.into_fallible(true) // Message parsing error
61-
.with_inner_type(inner_type_def())
61+
.with_inner_type(Some(inner_type_def()))
6262
.with_constraint(value::Kind::Map)
6363
}
6464
}
6565

6666
/// The type defs of the fields contained by the returned map.
67-
fn inner_type_def() -> Option<InnerTypeDef> {
68-
Some(inner_type_def! ({
67+
fn inner_type_def() -> InnerTypeDef {
68+
inner_type_def! ({
6969
"owner": Kind::Bytes,
7070
"message_type": Kind::Bytes,
7171
"log_group": Kind::Bytes,
@@ -78,7 +78,7 @@ fn inner_type_def() -> Option<InnerTypeDef> {
7878
"timestamp": Kind::Timestamp,
7979
"message": Kind::Bytes,
8080
})))
81-
}))
81+
})
8282
}
8383

8484
#[cfg(test)]
@@ -150,7 +150,7 @@ mod tests {
150150
def: TypeDef {
151151
fallible: true,
152152
kind: Kind::Map,
153-
inner_type_def: inner_type_def(),
153+
inner_type_def: Some(inner_type_def()),
154154
},
155155
}];
156156
}

‎lib/remap-functions/src/parse_aws_vpc_flow_log.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,14 @@ impl Expression for ParseAwsVpcFlowLogFn {
6464
self.value
6565
.type_def(state)
6666
.into_fallible(true) // Log parsin_ error
67-
.with_inner_type(inner_type_def())
67+
.with_inner_type(Some(inner_type_def()))
6868
.with_constraint(value::Kind::Map)
6969
}
7070
}
7171

7272
/// The type defs of the fields contained by the returned map.
73-
fn inner_type_def() -> Option<InnerTypeDef> {
74-
Some(inner_type_def! ({
73+
fn inner_type_def() -> InnerTypeDef {
74+
inner_type_def! ({
7575
"version": Kind::Integer | Kind::Null,
7676
"account_id": Kind::Integer | Kind::Null,
7777
"interface_id": Kind::Bytes | Kind::Null,
@@ -96,11 +96,12 @@ fn inner_type_def() -> Option<InnerTypeDef> {
9696
"region": Kind::Bytes | Kind::Null,
9797
"az_id": Kind::Bytes | Kind::Null,
9898
"sublocation_type": Kind::Bytes | Kind::Null,
99-
}))
99+
})
100100
}
101101

102102
type ParseResult<T> = std::result::Result<T, String>;
103103

104+
#[allow(clippy::unnecessary_wraps)] // match other parse methods
104105
fn identity<'a>(_key: &'a str, value: &'a str) -> ParseResult<&'a str> {
105106
Ok(value)
106107
}
@@ -185,22 +186,22 @@ mod tests {
185186
remap::test_type_def![
186187
value_noop {
187188
expr: |_| ParseAwsVpcFlowLogFn::new(Box::new(Noop), None),
188-
def: TypeDef { fallible: true, kind: Kind::Map, inner_type_def: inner_type_def() },
189+
def: TypeDef { fallible: true, kind: Kind::Map, inner_type_def: Some(inner_type_def()) },
189190
}
190191

191192
value_non_string {
192193
expr: |_| ParseAwsVpcFlowLogFn::new(Literal::from(1).boxed(), None),
193-
def: TypeDef { fallible: true, kind: Kind::Map, inner_type_def: inner_type_def() },
194+
def: TypeDef { fallible: true, kind: Kind::Map, inner_type_def: Some(inner_type_def()) },
194195
}
195196

196197
value_string {
197198
expr: |_| ParseAwsVpcFlowLogFn::new(Literal::from("foo").boxed(), None),
198-
def: TypeDef { fallible: true, kind: Kind::Map, inner_type_def: inner_type_def() },
199+
def: TypeDef { fallible: true, kind: Kind::Map, inner_type_def: Some(inner_type_def()) },
199200
}
200201

201202
format_non_string {
202203
expr: |_| ParseAwsVpcFlowLogFn::new(Literal::from("foo").boxed(), Some(Literal::from(1).boxed())),
203-
def: TypeDef { fallible: true, kind: Kind::Map, inner_type_def: inner_type_def() },
204+
def: TypeDef { fallible: true, kind: Kind::Map, inner_type_def: Some(inner_type_def()) },
204205
}
205206
];
206207

‎lib/remap-functions/src/parse_glog.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -114,21 +114,21 @@ impl Expression for ParseGlogFn {
114114
.type_def(state)
115115
.into_fallible(true)
116116
.with_constraint(value::Kind::Map)
117-
.with_inner_type(inner_type_def())
117+
.with_inner_type(Some(inner_type_def()))
118118
}
119119
}
120120

121-
fn inner_type_def() -> Option<InnerTypeDef> {
121+
fn inner_type_def() -> InnerTypeDef {
122122
use value::Kind;
123123

124-
Some(inner_type_def!({
124+
inner_type_def!({
125125
"level": Kind::Bytes,
126126
"timestamp": Kind::Timestamp,
127127
"id": Kind::Integer,
128128
"file": Kind::Bytes,
129129
"line": Kind::Integer,
130130
"message": Kind::Bytes,
131-
}))
131+
})
132132
}
133133

134134
#[cfg(test)]
@@ -188,17 +188,17 @@ mod tests {
188188
test_type_def![
189189
value_string {
190190
expr: |_| ParseGlogFn { value: Literal::from("foo").boxed() },
191-
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: inner_type_def() },
191+
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: Some(inner_type_def()) },
192192
}
193193

194194
value_non_string {
195195
expr: |_| ParseGlogFn { value: Literal::from(1).boxed() },
196-
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: inner_type_def() },
196+
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: Some(inner_type_def()) },
197197
}
198198

199199
value_optional {
200200
expr: |_| ParseGlogFn { value: Box::new(Noop) },
201-
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: inner_type_def() },
201+
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: Some(inner_type_def()) },
202202
}
203203
];
204204
}

‎lib/remap-functions/src/parse_syslog.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,12 @@ impl Expression for ParseSyslogFn {
115115
.type_def(state)
116116
.into_fallible(true)
117117
.with_constraint(Kind::Map)
118-
.with_inner_type(inner_type_def())
118+
.with_inner_type(Some(inner_type_def()))
119119
}
120120
}
121121

122-
fn inner_type_def() -> Option<InnerTypeDef> {
123-
Some(inner_type_def! ({
122+
fn inner_type_def() -> InnerTypeDef {
123+
inner_type_def! ({
124124
"message": Kind::Bytes,
125125
"hostname": Kind::Bytes | Kind::Null,
126126
"severity": Kind::Bytes | Kind::Null,
@@ -129,7 +129,7 @@ fn inner_type_def() -> Option<InnerTypeDef> {
129129
"msgid": Kind::Bytes | Kind::Null,
130130
"timestamp": Kind::Timestamp | Kind::Null,
131131
"procid": Kind::Bytes | Kind::Integer | Kind::Null
132-
}))
132+
})
133133
}
134134

135135
#[cfg(test)]
@@ -143,23 +143,23 @@ mod tests {
143143
expr: |_| ParseSyslogFn { value: Literal::from("foo").boxed() },
144144
def: TypeDef { kind: Kind::Map,
145145
fallible: true,
146-
inner_type_def: inner_type_def(),
146+
inner_type_def: Some(inner_type_def()),
147147
},
148148
}
149149

150150
value_non_string {
151151
expr: |_| ParseSyslogFn { value: Literal::from(1).boxed() },
152152
def: TypeDef { fallible: true,
153153
kind: Kind::Map,
154-
inner_type_def: inner_type_def(),
154+
inner_type_def: Some(inner_type_def()),
155155
},
156156
}
157157

158158
value_optional {
159159
expr: |_| ParseSyslogFn { value: Box::new(Noop) },
160160
def: TypeDef { fallible: true,
161161
kind: Kind::Map,
162-
inner_type_def: inner_type_def(),
162+
inner_type_def: Some(inner_type_def()),
163163
},
164164
}
165165
];

‎lib/remap-functions/src/parse_url.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ impl Expression for ParseUrlFn {
5353
self.value
5454
.type_def(state)
5555
.into_fallible(true) // URL parsing error
56-
.with_inner_type(inner_type_def())
56+
.with_inner_type(Some(inner_type_def()))
5757
.with_constraint(value::Kind::Map)
5858
}
5959
}
6060

6161
/// The type defs of the fields contained by the returned map.
62-
fn inner_type_def() -> Option<InnerTypeDef> {
63-
Some(inner_type_def! ({
62+
fn inner_type_def() -> InnerTypeDef {
63+
inner_type_def! ({
6464
"scheme": Kind::Bytes,
6565
"username": Kind::Bytes,
6666
"password": Kind::Bytes,
@@ -69,7 +69,7 @@ fn inner_type_def() -> Option<InnerTypeDef> {
6969
"port": Kind::Bytes,
7070
"fragment": Kind::Bytes | Kind::Null,
7171
"query": Kind::Map,
72-
}))
72+
})
7373
}
7474

7575
fn url_to_value(url: Url) -> Value {
@@ -108,12 +108,12 @@ mod tests {
108108
remap::test_type_def![
109109
value_string {
110110
expr: |_| ParseUrlFn { value: Literal::from("foo").boxed() },
111-
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: inner_type_def() },
111+
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: Some(inner_type_def()) },
112112
}
113113

114114
value_optional {
115115
expr: |_| ParseUrlFn { value: Box::new(Noop) },
116-
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: inner_type_def() },
116+
def: TypeDef { fallible: true, kind: value::Kind::Map, inner_type_def: Some(inner_type_def()) },
117117
}
118118
];
119119

0 commit comments

Comments
 (0)