Skip to content

Commit 3a30b0c

Browse files
committed
Clippy cleanup.
1 parent 95ccfe4 commit 3a30b0c

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

src/bluejay.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,17 +96,15 @@ fn adjunct_lines(file: &File, header: &Header, lines: &mut Vec<String>) {
9696
}
9797

9898
fn keyword_lines(header: &Header, lines: &mut Vec<String>) {
99-
if header.keywords.len() == 0 {
99+
if header.keywords.is_empty() {
100100
lines.push(" \"keywords\": [],".to_string());
101101
return;
102102
}
103103

104104
lines.push(" \"keywords\": [".to_string());
105105
let last_index = header.keywords.len() - 1;
106106

107-
for i in 0..header.keywords.len() {
108-
let keyword = &header.keywords[i];
109-
107+
for (i, keyword) in header.keywords.iter().enumerate() {
110108
if i == last_index {
111109
lines.push(format!(" {{ \"name\": \"{}\", \"value\": \"{}\" }}", keyword.name, keyword.value));
112110
} else {
@@ -126,17 +124,15 @@ fn ext_header_lines(file: &File, header: &Header, lines: &mut Vec<String>) {
126124
},
127125
};
128126

129-
if keywords.len() == 0 {
127+
if keywords.is_empty() {
130128
lines.push(" \"ext_header\": []".to_string());
131129
return;
132130
}
133131

134132
lines.push(" \"ext_header\": [".to_string());
135133
let last_index = keywords.len() - 1;
136134

137-
for i in 0..keywords.len() {
138-
let keyword = &keywords[i];
139-
135+
for (i, keyword) in keywords.iter().enumerate() {
140136
if i == last_index {
141137
lines.push(format!(" {{ \"name\": \"{}\", \"value\": {}, \"format\": \"{}\" }}", keyword.tag, keyword.value, keyword.value.format));
142138
} else {

src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ pub struct ExtKeywordValue {
157157
impl fmt::Display for ExtKeywordValue {
158158
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
159159
match self.format {
160-
'A' | 'S' | 'Z' => write!(f, "\"{}\"", from_utf8(&self.raw_value).unwrap().to_string()),
160+
'A' | 'S' | 'Z' => write!(f, "\"{}\"", from_utf8(&self.raw_value).unwrap()),
161161
'B' => write!(f, "{}", byte_to_i8(self.raw_value[0]).unwrap()),
162162
'I' => write!(f, "{}", bytes_to_i16(&self.raw_value[0..1], self.endianness).unwrap()),
163163
'L' => write!(f, "{}", bytes_to_i32(&self.raw_value[0..4], self.endianness).unwrap()),

0 commit comments

Comments
 (0)