Skip to content

Commit 9a15f5f

Browse files
committed
Fix clippy.
Added review suggestion.
1 parent ddf5b19 commit 9a15f5f

File tree

1 file changed

+17
-22
lines changed

1 file changed

+17
-22
lines changed

Diff for: atsc/src/header.rs

+17-22
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,19 @@ pub struct CompressorHeader {
2828
frame_count: i16,
2929
}
3030

31+
fn verify_header_versions(header: &CompressorHeader) {
32+
let current_version = env!("CARGO_PKG_VERSION").to_string();
33+
trace!("Versions: c:{} h:{}", current_version, header.version);
34+
match compare(&current_version, &header.version) {
35+
Ok(Cmp::Lt) => panic!(
36+
"Can't decompress! File is version ({}) is higher than compressor version ({})!",
37+
header.version, current_version
38+
),
39+
Ok(Cmp::Eq | Cmp::Gt) => debug!("File version: {}", header.version),
40+
_ => panic!("Wrong version number!"),
41+
}
42+
}
43+
3144
impl Decode for CompressorHeader {
3245
fn decode<__D: ::bincode::de::Decoder>(
3346
decoder: &mut __D,
@@ -37,16 +50,7 @@ impl Decode for CompressorHeader {
3750
version: Decode::decode(decoder)?,
3851
frame_count: Decode::decode(decoder)?,
3952
};
40-
let current_version = env!("CARGO_PKG_VERSION").to_string();
41-
trace!("Versions: c:{} h:{}", current_version, header.version);
42-
match compare(&current_version, &header.version) {
43-
Ok(Cmp::Lt) => panic!(
44-
"Can't decompress! File is version ({}) is higher than compressor version ({})!",
45-
header.version, current_version
46-
),
47-
Ok(Cmp::Eq | Cmp::Gt) => debug!("File version: {}", header.version),
48-
_ => panic!("Wrong version number!"),
49-
}
53+
verify_header_versions(&header);
5054
Ok(header)
5155
}
5256
}
@@ -60,16 +64,7 @@ impl<'__de> ::bincode::BorrowDecode<'__de> for CompressorHeader {
6064
version: bincode::BorrowDecode::borrow_decode(decoder)?,
6165
frame_count: bincode::BorrowDecode::borrow_decode(decoder)?,
6266
};
63-
let current_version = env!("CARGO_PKG_VERSION").to_string();
64-
trace!("Versions: c:{} h:{}", current_version, header.version);
65-
match compare(current_version.clone(), header.version.clone()) {
66-
Ok(Cmp::Lt) => panic!(
67-
"Can't decompress! File is version ({}) is higher than compressor version ({})!",
68-
header.version, current_version
69-
),
70-
Ok(Cmp::Eq | Cmp::Gt) => debug!("File version: {}", header.version),
71-
_ => panic!("Wrong version number!"),
72-
}
67+
verify_header_versions(&header);
7368
Ok(header)
7469
}
7570
}
@@ -104,7 +99,7 @@ mod tests {
10499
let b = cs.to_bytes();
105100
let cs2 = CompressedStream::from_bytes(&b);
106101
assert_eq!(
107-
compare(env!("CARGO_PKG_VERSION").to_string(), cs2.header.version),
102+
compare(env!("CARGO_PKG_VERSION"), cs2.header.version),
108103
Ok(Cmp::Eq)
109104
);
110105
}
@@ -118,7 +113,7 @@ mod tests {
118113
let b = cs.to_bytes();
119114
let cs2 = CompressedStream::from_bytes(&b);
120115
assert_eq!(
121-
compare(env!("CARGO_PKG_VERSION").to_string(), cs2.header.version),
116+
compare(env!("CARGO_PKG_VERSION"), cs2.header.version),
122117
Ok(Cmp::Gt)
123118
);
124119
}

0 commit comments

Comments
 (0)