Fix some warnings present in nightly

xiph · Aug 9, 2021 · e09f555 · e09f555
1 parent 8d1d0a6
commit e09f555
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 31 deletions.
diff --git a/benches/mc.rs b/benches/mc.rs
@@ -543,9 +543,9 @@ fn new_plane<T: Pixel>(
   p
 }
 
-fn get_params<'a, T: Pixel>(
-  rec_plane: &'a Plane<T>, po: PlaneOffset, mv: MotionVector,
-) -> (i32, i32, PlaneSlice<'a, T>) {
+fn get_params<T: Pixel>(
+  rec_plane: &Plane<T>, po: PlaneOffset, mv: MotionVector,
+) -> (i32, i32, PlaneSlice<T>) {
   let rec_cfg = &rec_plane.cfg;
   let shift_row = 3 + rec_cfg.ydec;
   let shift_col = 3 + rec_cfg.xdec;

diff --git a/clippy.toml b/clippy.toml
@@ -1,3 +1,4 @@
 too-many-arguments-threshold = 16
 cognitive-complexity-threshold = 40
 trivial-copy-size-limit = 16 # 128-bits = 2 64-bit registers
+msrv = "1.51"
diff --git a/src/asm/shared/predict.rs b/src/asm/shared/predict.rs
@@ -71,7 +71,7 @@ mod test {
       };
       for angle in angles {
         let expected = {
-          let mut plane = Plane::from_slice(&vec![0u8; 4 * 4], 4);
+          let mut plane = Plane::from_slice(&[0u8; 4 * 4], 4);
           rust::dispatch_predict_intra(
             *mode,
             *variant,
@@ -91,7 +91,7 @@ mod test {
           data
         };
 
-        let mut output = Plane::from_slice(&vec![0u8; 4 * 4], 4);
+        let mut output = Plane::from_slice(&[0u8; 4 * 4], 4);
         dispatch_predict_intra(
           *mode,
           *variant,

diff --git a/src/asm/x86/dist/mod.rs b/src/asm/x86/dist/mod.rs
@@ -495,9 +495,9 @@ mod test {
             let bsize = BlockSize::[<BLOCK_ $W X $H>];
             if $BD > 8 {
               // dynamic allocation: test
-              let mut src = Plane::from_slice(&vec![0u16; $W * $H], $W);
+              let mut src = Plane::from_slice(&[0u16; $W * $H], $W);
               // dynamic allocation: test
-              let mut dst = Plane::from_slice(&vec![0u16; $W * $H], $W);
+              let mut dst = Plane::from_slice(&[0u16; $W * $H], $W);
               for (s, d) in src.data.iter_mut().zip(dst.data.iter_mut()) {
                 *s = random::<u8>() as u16 * $BD / 8;
                 *d = random::<u8>() as u16 * $BD / 8;
@@ -508,9 +508,9 @@ mod test {
               assert_eq!(rust_result, result);
             } else {
               // dynamic allocation: test
-              let mut src = Plane::from_slice(&vec![0u8; $W * $H], $W);
+              let mut src = Plane::from_slice(&[0u8; $W * $H], $W);
               // dynamic allocation: test
-              let mut dst = Plane::from_slice(&vec![0u8; $W * $H], $W);
+              let mut dst = Plane::from_slice(&[0u8; $W * $H], $W);
               for (s, d) in src.data.iter_mut().zip(dst.data.iter_mut()) {
                 *s = random::<u8>();
                 *d = random::<u8>();

diff --git a/src/asm/x86/ec.rs b/src/asm/x86/ec.rs
@@ -106,7 +106,7 @@ mod test {
     }
 
     let mut cdf = [7297, 3820, 1617, 0];
-    let mut cdf2 = cdf.clone();
+    let mut cdf2 = cdf;
     for i in 0..4 {
       rust::update_cdf(&mut cdf, i);
       unsafe {

diff --git a/src/asm/x86/mc.rs b/src/asm/x86/mc.rs
@@ -710,9 +710,9 @@ mod test {
     8
   );
 
-  fn get_params<'a, T: Pixel>(
-    rec_plane: &'a Plane<T>, po: PlaneOffset, mv: MotionVector,
-  ) -> (i32, i32, PlaneSlice<'a, T>) {
+  fn get_params<T: Pixel>(
+    rec_plane: &Plane<T>, po: PlaneOffset, mv: MotionVector,
+  ) -> (i32, i32, PlaneSlice<T>) {
     let rec_cfg = &rec_plane.cfg;
     let shift_row = 3 + rec_cfg.ydec;
     let shift_col = 3 + rec_cfg.xdec;

diff --git a/src/capi.rs b/src/capi.rs
@@ -209,14 +209,11 @@ impl EncContext {
     ) -> Result<Packet, rav1e::EncoderStatus> {
       ctx.receive_packet().map(|p| {
         let mut p = std::mem::ManuallyDrop::new(p);
-        let opaque = p.opaque.take().map_or_else(
-          || std::ptr::null_mut(),
-          |o| {
-            let mut opaque = o.downcast::<FrameOpaque>().unwrap();
-            opaque.cb = None;
-            opaque.opaque
-          },
-        );
+        let opaque = p.opaque.take().map_or_else(std::ptr::null_mut, |o| {
+          let mut opaque = o.downcast::<FrameOpaque>().unwrap();
+          opaque.cb = None;
+          opaque.opaque
+        });
         let p = std::mem::ManuallyDrop::into_inner(p);
         let rav1e::Packet { data, input_frameno, frame_type, .. } = p;
         let len = data.len();
@@ -754,7 +751,7 @@ pub unsafe extern fn rav1e_frame_new(ctx: *const Context) -> *mut Frame {
   let fi = (*ctx).ctx.new_frame();
   let frame_type = rav1e::FrameTypeOverride::No;
   let f = Frame { fi, frame_type, opaque: None };
-  let frame = Box::new(f.into());
+  let frame = Box::new(f);
 
   Box::into_raw(frame)
 }
@@ -952,7 +949,7 @@ pub unsafe extern fn rav1e_rc_send_pass_data(
     .ctx
     .rc_send_pass_data(maybe_buf.unwrap())
     .map(|_v| None)
-    .unwrap_or_else(|e| Some(e));
+    .unwrap_or_else(Some);
 
   (*ctx).last_err = ret;
 
@@ -1025,14 +1022,14 @@ pub unsafe extern fn rav1e_send_frame(
   let maybe_opaque = if frame.is_null() {
     None
   } else {
-    (*frame).opaque.take().map(|o| rav1e::Opaque::new(o))
+    (*frame).opaque.take().map(rav1e::Opaque::new)
   };
 
   let ret = (*ctx)
     .ctx
     .send_frame(frame_internal, frame_type, maybe_opaque)
     .map(|_v| None)
-    .unwrap_or_else(|e| Some(e));
+    .unwrap_or_else(Some);
 
   (*ctx).last_err = ret;
 
@@ -1075,7 +1072,7 @@ pub unsafe extern fn rav1e_receive_packet(
       *pkt = Box::into_raw(Box::new(packet));
       None
     })
-    .unwrap_or_else(|e| Some(e));
+    .unwrap_or_else(Some);
 
   (*ctx).last_err = ret;
 

diff --git a/src/context/partition_unit.rs b/src/context/partition_unit.rs
@@ -500,7 +500,6 @@ impl<'a> BlockContext<'a> {
   pub fn update_partition_context(
     &mut self, bo: TileBlockOffset, subsize: BlockSize, bsize: BlockSize,
   ) {
-    #[allow(dead_code)]
     assert!(bsize.is_sqr());
 
     let bw = bsize.width_mi();

diff --git a/src/predict.rs b/src/predict.rs
@@ -1415,7 +1415,7 @@ mod test {
     let above = &edge_buf.data[MAX_TX_SIZE + 1..MAX_TX_SIZE + 5];
     let top_left = edge_buf.data[MAX_TX_SIZE];
 
-    let mut output = Plane::from_slice(&vec![0u8; 4 * 4], 4);
+    let mut output = Plane::from_slice(&[0u8; 4 * 4], 4);
 
     pred_dc(&mut output.as_region_mut(), above, left, 4, 4, 8);
     assert_eq!(&output.data[..], [32u8; 16]);
@@ -1467,7 +1467,7 @@ mod test {
 
     let left = &edge_buf.data[MAX_TX_SIZE - 8..MAX_TX_SIZE];
     let above = &edge_buf.data[MAX_TX_SIZE + 1..MAX_TX_SIZE + 9];
-    let top_left = &edge_buf.data[MAX_TX_SIZE..MAX_TX_SIZE + 1];
+    let top_left = &edge_buf.data[MAX_TX_SIZE..=MAX_TX_SIZE];
     let angles = [
       3, 6, 9, 14, 17, 20, 23, 26, 29, 32, 36, 39, 42, 45, 48, 51, 54, 58, 61,
       64, 67, 70, 73, 76, 81, 84, 87,

diff --git a/tests/binary.rs b/tests/binary.rs
@@ -6,7 +6,7 @@ mod binary {
   use std::env::temp_dir;
   use std::fs::File;
   use std::io::Read;
-  use std::path::PathBuf;
+  use std::path::{Path, PathBuf};
 
   fn get_y4m_input() -> Vec<u8> {
     let mut input = File::open(&format!(
@@ -43,7 +43,7 @@ mod binary {
     Command::cargo_bin("rav1e").unwrap()
   }
 
-  fn get_common_cmd(outfile: &PathBuf) -> Command {
+  fn get_common_cmd(outfile: &Path) -> Command {
     let mut cmd = get_rav1e_command();
     cmd.args(&["--bitrate", "1000"]).arg("-o").arg(outfile).arg("-y");
     cmd