projects
/
nihav.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nihav_registry: fix clippy warnings and tests in detect module
[nihav.git]
/
nihav-registry
/
src
/
detect.rs
diff --git
a/nihav-registry/src/detect.rs
b/nihav-registry/src/detect.rs
index f10b76e931bb43e18f38d7689094fb9021b98d62..2d2c3ac03d30e6adfd01861064adbacfa0e025af 100644
(file)
--- a/
nihav-registry/src/detect.rs
+++ b/
nihav-registry/src/detect.rs
@@
-7,7
+7,7
@@
//! # Examples
//!
//! ```no_run
//! # Examples
//!
//! ```no_run
-//! use nihav_
core
::detect::detect_format;
+//! use nihav_
registry
::detect::detect_format;
//! use std::fs::File;
//! use nihav_core::io::byteio::*;
//!
//! use std::fs::File;
//! use nihav_core::io::byteio::*;
//!
@@
-118,29
+118,39
@@
impl Arg {
}
}
fn eq(&self, src: &mut ByteReader) -> bool {
}
}
fn eq(&self, src: &mut ByteReader) -> bool {
- let val = self.read_val(src);
- if val.is_none() { false }
- else { val.unwrap() == self.val() }
+ if let Some(rval) = self.read_val(src) {
+ rval == self.val()
+ } else {
+ false
+ }
}
fn ge(&self, src: &mut ByteReader) -> bool {
}
fn ge(&self, src: &mut ByteReader) -> bool {
- let val = self.read_val(src);
- if val.is_none() { false }
- else { val.unwrap() >= self.val() }
+ if let Some(rval) = self.read_val(src) {
+ rval >= self.val()
+ } else {
+ false
+ }
}
fn gt(&self, src: &mut ByteReader) -> bool {
}
fn gt(&self, src: &mut ByteReader) -> bool {
- let val = self.read_val(src);
- if val.is_none() { false }
- else { val.unwrap() > self.val() }
+ if let Some(rval) = self.read_val(src) {
+ rval > self.val()
+ } else {
+ false
+ }
}
fn le(&self, src: &mut ByteReader) -> bool {
}
fn le(&self, src: &mut ByteReader) -> bool {
- let val = self.read_val(src);
- if val.is_none() { false }
- else { val.unwrap() <= self.val() }
+ if let Some(rval) = self.read_val(src) {
+ rval <= self.val()
+ } else {
+ false
+ }
}
fn lt(&self, src: &mut ByteReader) -> bool {
}
fn lt(&self, src: &mut ByteReader) -> bool {
- let val = self.read_val(src);
- if val.is_none() { false }
- else { val.unwrap() < self.val() }
+ if let Some(rval) = self.read_val(src) {
+ rval < self.val()
+ } else {
+ false
+ }
}
}
}
}
@@
-395,7
+405,7
@@
pub fn detect_format_by_name(name: &str) -> Option<&'static str> {
mod test {
use super::*;
use std::fs::File;
mod test {
use super::*;
use std::fs::File;
- use
crat
e::io::byteio::*;
+ use
nihav_cor
e::io::byteio::*;
#[test]
fn test_avi_detect() {
#[test]
fn test_avi_detect() {