Skip to content

Commit 2506613

Browse files
committed
chore: cargo clippy --fix
1 parent 616958b commit 2506613

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

rad/src/operators/array.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ pub fn join(
118118
operator: "ArrayJoin".to_string(),
119119
});
120120
}
121-
let separator = if args.len() > 0 {
121+
let separator = if !args.is_empty() {
122122
from_value::<String>(args[0].to_owned()).unwrap_or_default()
123123
} else {
124124
String::from("")
@@ -131,14 +131,14 @@ pub fn join(
131131
Ok(RadonTypes::from(RadonString::from(string_list.join(separator.as_str()))))
132132
}
133133
Some(first_item) => {
134-
return Err(RadError::UnsupportedOperator {
134+
Err(RadError::UnsupportedOperator {
135135
input_type: first_item.radon_type_name().to_string(),
136136
operator: "ArrayJoin".to_string(),
137137
args: Some(args.to_vec())
138-
});
138+
})
139139
}
140140
_ => {
141-
return Err(RadError::EmptyArray)
141+
Err(RadError::EmptyArray)
142142
}
143143
}
144144
}

rad/src/operators/bytes.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ pub fn stringify(input: &RadonBytes, args: &Option<Vec<Value>>) -> Result<RadonS
6666
let wrong_args = || RadError::WrongArguments {
6767
input_type: RadonString::radon_type_name(),
6868
operator: "Stringify".to_string(),
69-
args: args.to_owned().unwrap_or(Vec::<Value>::default()).to_vec(),
69+
args: args.to_owned().unwrap_or_default().to_vec(),
7070
};
7171
let mut bytes_encoding = RadonBytesEncoding::Hex;
7272
match args {
7373
Some(args) => {
74-
if args.len() > 0 {
74+
if !args.is_empty() {
7575
let arg = args.first().ok_or_else(wrong_args)?.to_owned();
7676
let bytes_encoding_u8 = from_value::<u8>(arg).map_err(|_| wrong_args())?;
7777
bytes_encoding = RadonBytesEncoding::try_from(bytes_encoding_u8).map_err(|_| wrong_args())?;

rad/src/operators/string.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub fn as_bytes(input: &RadonString, args: &Option<Vec<Value>>) -> Result<RadonB
3737
let wrong_args = || RadError::WrongArguments {
3838
input_type: RadonString::radon_type_name(),
3939
operator: "AsBytes".to_string(),
40-
args: args.to_owned().unwrap_or(Vec::<Value>::default()).to_vec(),
40+
args: args.to_owned().unwrap_or_default().to_vec(),
4141
};
4242
let mut input_string = input.value();
4343
if input_string.starts_with("0x") {
@@ -49,7 +49,7 @@ pub fn as_bytes(input: &RadonString, args: &Option<Vec<Value>>) -> Result<RadonB
4949
let mut bytes_encoding = RadonBytesEncoding::Hex;
5050
match args {
5151
Some(args) => {
52-
if args.len() > 0 {
52+
if !args.is_empty() {
5353
let arg = args.first().ok_or_else(wrong_args)?.to_owned();
5454
let bytes_encoding_u8 = from_value::<u8>(arg).map_err(|_| wrong_args())?;
5555
bytes_encoding = RadonBytesEncoding::try_from(bytes_encoding_u8).map_err(|_| wrong_args())?;
@@ -203,7 +203,7 @@ pub fn parse_json_array(input: &RadonString, args: &Option<Vec<Value>>) -> Resul
203203
description: err.to_string(),
204204
})?;
205205
let mut subitems: Vec<RadonTypes> = selector.find(&json_input)
206-
.map(|item| into_radon_types(item))
206+
.map(into_radon_types)
207207
.collect();
208208
if subitems.len() > 1 {
209209
items.insert(items.len(), RadonArray::from(subitems).into());
@@ -222,7 +222,7 @@ pub fn parse_json_array(input: &RadonString, args: &Option<Vec<Value>>) -> Resul
222222
description: err.to_string(),
223223
})?;
224224
let items: Vec<RadonTypes> = selector.find(&json_input)
225-
.map(|item| into_radon_types(item))
225+
.map(into_radon_types)
226226
.collect();
227227
Ok(RadonArray::from(items))
228228
}
@@ -254,7 +254,7 @@ fn into_radon_types(value: &serde_json::Value) -> RadonTypes {
254254
serde_json::Value::Array(values) => {
255255
let items: Vec<RadonTypes> = values
256256
.iter()
257-
.map(|item| into_radon_types(item))
257+
.map(into_radon_types)
258258
.collect();
259259
RadonTypes::from(RadonArray::from(items))
260260
}

rad/src/types/string.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,10 @@ impl Operable for RadonString {
131131
(RadonOpCodes::StringMatch, Some(args)) => {
132132
string_operators::string_match(self, args.as_slice()).map(RadonTypes::from)
133133
}
134-
(RadonOpCodes::StringParseJSONArray, args) => string_operators::parse_json_array(self, &args)
134+
(RadonOpCodes::StringParseJSONArray, args) => string_operators::parse_json_array(self, args)
135135
.map(RadonTypes::from)
136136
.map_err(Into::into),
137-
(RadonOpCodes::StringParseJSONMap, args) => string_operators::parse_json_map(self, &args)
137+
(RadonOpCodes::StringParseJSONMap, args) => string_operators::parse_json_map(self, args)
138138
.map(RadonTypes::from)
139139
.map_err(Into::into),
140140
(RadonOpCodes::StringParseXMLMap, None) => string_operators::parse_xml_map(self)

0 commit comments

Comments
 (0)