Run cargo clippy -fix

alfg · May 31, 2022 · f7f6d12 · f7f6d12
1 parent fbe60de
commit f7f6d12
Show file tree

Hide file tree

Showing 44 changed files with 142 additions and 144 deletions.
diff --git a/benches/bench_main.rs b/benches/bench_main.rs
@@ -1,13 +1,13 @@
 use criterion::BenchmarkId;
 use criterion::{criterion_group, criterion_main, Criterion};
-use mp4;
+
 use std::fs::File;
 
 fn read_mp4(filename: &str) -> u64 {
     let f = File::open(filename).unwrap();
     let m = mp4::read_mp4(f).unwrap();
-    let size = m.size();
-    size
+
+    m.size()
 }
 
 fn criterion_benchmark(c: &mut Criterion) {

diff --git a/examples/mp4copy.rs b/examples/mp4copy.rs
@@ -34,7 +34,7 @@ fn copy<P: AsRef<Path>>(src_filename: &P, dst_filename: &P) -> Result<()> {
     let mut mp4_writer = mp4::Mp4Writer::write_start(
         writer,
         &Mp4Config {
-            major_brand: mp4_reader.major_brand().clone(),
+            major_brand: *mp4_reader.major_brand(),
             minor_version: mp4_reader.minor_version(),
             compatible_brands: mp4_reader.compatible_brands().to_vec(),
             timescale: mp4_reader.timescale(),

diff --git a/examples/mp4dump.rs b/examples/mp4dump.rs
@@ -133,11 +133,11 @@ fn get_boxes(file: File) -> Result<Vec<Box>> {
     Ok(boxes)
 }
 
-fn build_box<M: Mp4Box + std::fmt::Debug>(ref m: &M) -> Box {
-    return Box {
+fn build_box<M: Mp4Box + std::fmt::Debug>(m: &M) -> Box {
+    Box {
         name: m.box_type().to_string(),
         size: m.box_size(),
         summary: m.summary().unwrap(),
         indent: 0,
-    };
+    }
 }
diff --git a/examples/mp4info.rs b/examples/mp4info.rs
@@ -32,7 +32,7 @@ fn info<P: AsRef<Path>>(filename: &P) -> Result<()> {
     let mut compatible_brands = String::new();
     for brand in mp4.compatible_brands().iter() {
         compatible_brands.push_str(&brand.to_string());
-        compatible_brands.push_str(" ");
+        compatible_brands.push(' ');
     }
     println!("  compatible_brands:  {}\n", compatible_brands);
 

diff --git a/examples/simple.rs b/examples/simple.rs
@@ -1,4 +1,4 @@
-use mp4;
+
 use std::env;
 use std::fs::File;
 

diff --git a/src/mp4box/avc1.rs b/src/mp4box/avc1.rs
@@ -60,11 +60,11 @@ impl Avc1Box {
 
 impl Mp4Box for Avc1Box {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {

diff --git a/src/mp4box/co64.rs b/src/mp4box/co64.rs
@@ -25,11 +25,11 @@ impl Co64Box {
 
 impl Mp4Box for Co64Box {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {

diff --git a/src/mp4box/ctts.rs b/src/mp4box/ctts.rs
@@ -31,11 +31,11 @@ pub struct CttsEntry {
 
 impl Mp4Box for CttsBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {

diff --git a/src/mp4box/dinf.rs b/src/mp4box/dinf.rs
@@ -20,19 +20,19 @@ impl DinfBox {
 
 impl Mp4Box for DinfBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {
         Ok(serde_json::to_string(&self).unwrap())
     }
 
     fn summary(&self) -> Result<String> {
-        let s = format!("");
+        let s = String::new();
         Ok(s)
     }
 }
@@ -119,19 +119,19 @@ impl DrefBox {
 
 impl Mp4Box for DrefBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {
         Ok(serde_json::to_string(&self).unwrap())
     }
 
     fn summary(&self) -> Result<String> {
-        let s = format!("");
+        let s = String::new();
         Ok(s)
     }
 }
@@ -231,11 +231,11 @@ impl UrlBox {
 
 impl Mp4Box for UrlBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {

diff --git a/src/mp4box/edts.rs b/src/mp4box/edts.rs
@@ -29,19 +29,19 @@ impl EdtsBox {
 
 impl Mp4Box for EdtsBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {
         Ok(serde_json::to_string(&self).unwrap())
     }
 
     fn summary(&self) -> Result<String> {
-        let s = format!("");
+        let s = String::new();
         Ok(s)
     }
 }

diff --git a/src/mp4box/elst.rs b/src/mp4box/elst.rs
@@ -39,11 +39,11 @@ impl ElstBox {
 
 impl Mp4Box for ElstBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {

diff --git a/src/mp4box/ftyp.rs b/src/mp4box/ftyp.rs
@@ -23,11 +23,11 @@ impl FtypBox {
 
 impl Mp4Box for FtypBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {

diff --git a/src/mp4box/hdlr.rs b/src/mp4box/hdlr.rs
@@ -24,11 +24,11 @@ impl HdlrBox {
 
 impl Mp4Box for HdlrBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {
@@ -38,7 +38,7 @@ impl Mp4Box for HdlrBox {
     fn summary(&self) -> Result<String> {
         let s = format!(
             "handler_type={} name={}",
-            self.handler_type.to_string(),
+            self.handler_type,
             self.name
         );
         Ok(s)

diff --git a/src/mp4box/hev1.rs b/src/mp4box/hev1.rs
@@ -60,11 +60,11 @@ impl Hev1Box {
 
 impl Mp4Box for Hev1Box {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {
@@ -172,8 +172,8 @@ impl Mp4Box for HvcCBox {
     }
 
     fn box_size(&self) -> u64 {
-        let size = HEADER_SIZE + 1;
-        size
+
+        HEADER_SIZE + 1
     }
 
     fn to_json(&self) -> Result<String> {

diff --git a/src/mp4box/mdhd.rs b/src/mp4box/mdhd.rs
@@ -50,11 +50,11 @@ impl Default for MdhdBox {
 
 impl Mp4Box for MdhdBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {
@@ -151,7 +151,7 @@ fn language_string(language: u16) -> String {
         .map(|r| r.unwrap_or(REPLACEMENT_CHARACTER))
         .collect::<String>();
 
-    return lang_str;
+    lang_str
 }
 
 fn language_code(language: &str) -> u16 {

diff --git a/src/mp4box/mdia.rs b/src/mp4box/mdia.rs
@@ -23,19 +23,19 @@ impl MdiaBox {
 
 impl Mp4Box for MdiaBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {
         Ok(serde_json::to_string(&self).unwrap())
     }
 
     fn summary(&self) -> Result<String> {
-        let s = format!("");
+        let s = String::new();
         Ok(s)
     }
 }

diff --git a/src/mp4box/mehd.rs b/src/mp4box/mehd.rs
@@ -40,11 +40,11 @@ impl Default for MehdBox {
 
 impl Mp4Box for MehdBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {

diff --git a/src/mp4box/mfhd.rs b/src/mp4box/mfhd.rs
@@ -33,11 +33,11 @@ impl MfhdBox {
 
 impl Mp4Box for MfhdBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {

diff --git a/src/mp4box/minf.rs b/src/mp4box/minf.rs
@@ -37,19 +37,19 @@ impl MinfBox {
 
 impl Mp4Box for MinfBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {
         Ok(serde_json::to_string(&self).unwrap())
     }
 
     fn summary(&self) -> Result<String> {
-        let s = format!("");
+        let s = String::new();
         Ok(s)
     }
 }

diff --git a/src/mp4box/moof.rs b/src/mp4box/moof.rs
@@ -28,11 +28,11 @@ impl MoofBox {
 
 impl Mp4Box for MoofBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {

diff --git a/src/mp4box/moov.rs b/src/mp4box/moov.rs
@@ -31,11 +31,11 @@ impl MoovBox {
 
 impl Mp4Box for MoovBox {
     fn box_type(&self) -> BoxType {
-        return self.get_type();
+        self.get_type()
     }
 
     fn box_size(&self) -> u64 {
-        return self.get_size();
+        self.get_size()
     }
 
     fn to_json(&self) -> Result<String> {