Skip to content

clippy: fix warnings from latest stable rust 1.67.0 #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 31, 2023
Merged

clippy: fix warnings from latest stable rust 1.67.0 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/mp4box/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for DataBox {

reader.read_u32::<BigEndian>()?; // reserved = 0

let current = reader.seek(SeekFrom::Current(0))?;
let current = reader.stream_position()?;
let mut data = vec![0u8; (start + size - current) as usize];
reader.read_exact(&mut data)?;

Expand Down
8 changes: 4 additions & 4 deletions src/mp4box/dinf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for DinfBox {

let mut dref = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand All @@ -60,7 +60,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for DinfBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if dref.is_none() {
Expand Down Expand Up @@ -140,7 +140,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for DrefBox {
fn read_box(reader: &mut R, size: u64) -> Result<Self> {
let start = box_start(reader)?;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;

let (version, flags) = read_box_header_ext(reader)?;
let end = start + size;
Expand All @@ -166,7 +166,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for DrefBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

skip_bytes_to(reader, start + size)?;
Expand Down
8 changes: 4 additions & 4 deletions src/mp4box/ilst.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for IlstBox {

let mut items = HashMap::new();

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand All @@ -78,7 +78,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for IlstBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

skip_bytes_to(reader, start + size)?;
Expand Down Expand Up @@ -123,7 +123,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for IlstItemBox {

let mut data = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand All @@ -140,7 +140,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for IlstItemBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if data.is_none() {
Expand Down
6 changes: 3 additions & 3 deletions src/mp4box/mdia.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::Serialize;
use std::io::{Read, Seek, SeekFrom, Write};
use std::io::{Read, Seek, Write};

use crate::mp4box::*;
use crate::mp4box::{hdlr::HdlrBox, mdhd::MdhdBox, minf::MinfBox};
Expand Down Expand Up @@ -48,7 +48,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MdiaBox {
let mut hdlr = None;
let mut minf = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand All @@ -71,7 +71,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MdiaBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if mdhd.is_none() {
Expand Down
4 changes: 2 additions & 2 deletions src/mp4box/meta.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MetaBox {

let mut ilst = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;

match hdlr.handler_type {
Expand All @@ -117,7 +117,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MetaBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

Ok(MetaBox::Mdir { ilst })
Expand Down
6 changes: 3 additions & 3 deletions src/mp4box/minf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::Serialize;
use std::io::{Read, Seek, SeekFrom, Write};
use std::io::{Read, Seek, Write};

use crate::mp4box::*;
use crate::mp4box::{dinf::DinfBox, smhd::SmhdBox, stbl::StblBox, vmhd::VmhdBox};
Expand Down Expand Up @@ -63,7 +63,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MinfBox {
let mut dinf = None;
let mut stbl = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand All @@ -89,7 +89,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MinfBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if dinf.is_none() {
Expand Down
2 changes: 1 addition & 1 deletion src/mp4box/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ pub fn write_box_header_ext<W: Write>(w: &mut W, v: u8, f: u32) -> Result<u64> {
}

pub fn box_start<R: Seek>(seeker: &mut R) -> Result<u64> {
Ok(seeker.seek(SeekFrom::Current(0))? - HEADER_SIZE)
Ok(seeker.stream_position()? - HEADER_SIZE)
}

pub fn skip_bytes<S: Seek>(seeker: &mut S, size: u64) -> Result<()> {
Expand Down
6 changes: 3 additions & 3 deletions src/mp4box/moof.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::Serialize;
use std::io::{Read, Seek, SeekFrom, Write};
use std::io::{Read, Seek, Write};

use crate::mp4box::*;
use crate::mp4box::{mfhd::MfhdBox, traf::TrafBox};
Expand Down Expand Up @@ -52,7 +52,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MoofBox {
let mut mfhd = None;
let mut trafs = Vec::new();

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand All @@ -72,7 +72,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MoofBox {
skip_box(reader, s)?;
}
}
current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if mfhd.is_none() {
Expand Down
6 changes: 3 additions & 3 deletions src/mp4box/moov.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::Serialize;
use std::io::{Read, Seek, SeekFrom, Write};
use std::io::{Read, Seek, Write};

use crate::meta::MetaBox;
use crate::mp4box::*;
Expand Down Expand Up @@ -71,7 +71,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MoovBox {
let mut mvex = None;
let mut traks = Vec::new();

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand Down Expand Up @@ -101,7 +101,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MoovBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if mvhd.is_none() {
Expand Down
18 changes: 9 additions & 9 deletions src/mp4box/mp4a.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for Mp4aBox {
let samplerate = FixedPointU16::new_raw(reader.read_u32::<BigEndian>()?);

let mut esds = None;
let current = reader.seek(SeekFrom::Current(0))?;
let current = reader.stream_position()?;
if current < start + size {
let header = BoxHeader::read(reader)?;
let BoxHeader { name, size: s } = header;
Expand Down Expand Up @@ -181,7 +181,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for EsdsBox {

let mut es_desc = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
let (desc_tag, desc_size) = read_desc(reader)?;
Expand All @@ -191,7 +191,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for EsdsBox {
}
_ => break,
}
current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if es_desc.is_none() {
Expand Down Expand Up @@ -313,15 +313,15 @@ impl Descriptor for ESDescriptor {

impl<R: Read + Seek> ReadDesc<&mut R> for ESDescriptor {
fn read_desc(reader: &mut R, size: u32) -> Result<Self> {
let start = reader.seek(SeekFrom::Current(0))?;
let start = reader.stream_position()?;

let es_id = reader.read_u16::<BigEndian>()?;
reader.read_u8()?; // XXX flags must be 0

let mut dec_config = None;
let mut sl_config = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size as u64;
while current < end {
let (desc_tag, desc_size) = read_desc(reader)?;
Expand All @@ -336,7 +336,7 @@ impl<R: Read + Seek> ReadDesc<&mut R> for ESDescriptor {
skip_bytes(reader, desc_size as u64)?;
}
}
current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

Ok(ESDescriptor {
Expand Down Expand Up @@ -402,7 +402,7 @@ impl Descriptor for DecoderConfigDescriptor {

impl<R: Read + Seek> ReadDesc<&mut R> for DecoderConfigDescriptor {
fn read_desc(reader: &mut R, size: u32) -> Result<Self> {
let start = reader.seek(SeekFrom::Current(0))?;
let start = reader.stream_position()?;

let object_type_indication = reader.read_u8()?;
let byte_a = reader.read_u8()?;
Expand All @@ -414,7 +414,7 @@ impl<R: Read + Seek> ReadDesc<&mut R> for DecoderConfigDescriptor {

let mut dec_specific = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size as u64;
while current < end {
let (desc_tag, desc_size) = read_desc(reader)?;
Expand All @@ -426,7 +426,7 @@ impl<R: Read + Seek> ReadDesc<&mut R> for DecoderConfigDescriptor {
skip_bytes(reader, desc_size as u64)?;
}
}
current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

Ok(DecoderConfigDescriptor {
Expand Down
6 changes: 3 additions & 3 deletions src/mp4box/mvex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::Serialize;
use std::io::{Read, Seek, SeekFrom, Write};
use std::io::{Read, Seek, Write};

use crate::mp4box::*;
use crate::mp4box::{mehd::MehdBox, trex::TrexBox};
Expand Down Expand Up @@ -46,7 +46,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MvexBox {
let mut mehd = None;
let mut trex = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand All @@ -66,7 +66,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for MvexBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if trex.is_none() {
Expand Down
6 changes: 3 additions & 3 deletions src/mp4box/stbl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::Serialize;
use std::io::{Read, Seek, SeekFrom, Write};
use std::io::{Read, Seek, Write};

use crate::mp4box::*;
use crate::mp4box::{
Expand Down Expand Up @@ -86,7 +86,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for StblBox {
let mut stco = None;
let mut co64 = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand Down Expand Up @@ -123,7 +123,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for StblBox {
skip_box(reader, s)?;
}
}
current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if stsd.is_none() {
Expand Down
6 changes: 3 additions & 3 deletions src/mp4box/traf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::Serialize;
use std::io::{Read, Seek, SeekFrom, Write};
use std::io::{Read, Seek, Write};

use crate::mp4box::*;
use crate::mp4box::{tfdt::TfdtBox, tfhd::TfhdBox, trun::TrunBox};
Expand Down Expand Up @@ -53,7 +53,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for TrafBox {
let mut tfdt = None;
let mut trun = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand All @@ -76,7 +76,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for TrafBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if tfhd.is_none() {
Expand Down
6 changes: 3 additions & 3 deletions src/mp4box/trak.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use serde::Serialize;
use std::io::{Read, Seek, SeekFrom, Write};
use std::io::{Read, Seek, Write};

use crate::meta::MetaBox;
use crate::mp4box::*;
Expand Down Expand Up @@ -62,7 +62,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for TrakBox {
let mut meta = None;
let mut mdia = None;

let mut current = reader.seek(SeekFrom::Current(0))?;
let mut current = reader.stream_position()?;
let end = start + size;
while current < end {
// Get box header.
Expand All @@ -88,7 +88,7 @@ impl<R: Read + Seek> ReadBox<&mut R> for TrakBox {
}
}

current = reader.seek(SeekFrom::Current(0))?;
current = reader.stream_position()?;
}

if tkhd.is_none() {
Expand Down
Loading