From bbd84b7bbbb9dfe9f9e77b4b84d5298e303746ea Mon Sep 17 00:00:00 2001
From: Ian Hobson <ian.r.hobson@gmail.com>
Date: Fri, 12 May 2023 16:52:06 +0200
Subject: [PATCH] clippy: Remove unnecessary uses of `?`

---
 src/wavereader.rs | 9 ++++-----
 src/wavewriter.rs | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/wavereader.rs b/src/wavereader.rs
index 79ba81b..ad0465f 100644
--- a/src/wavereader.rs
+++ b/src/wavereader.rs
@@ -216,7 +216,7 @@ impl WaveReader<BufReader<File>> {
     pub fn open<P: AsRef<Path>>(path: P) -> Result<Self, ParserError> {
         let f = File::open(path)?;
         let inner = BufReader::new(f);
-        Ok(Self::new(inner)?)
+        Self::new(inner)
     }
 }
 
@@ -224,10 +224,9 @@ impl WaveReader<File> {
     /// Open a file for reading with unbuffered IO.
     ///
     /// A convenience that opens `path` and calls `Self::new()`
-
     pub fn open_unbuffered<P: AsRef<Path>>(path: P) -> Result<Self, ParserError> {
         let inner = File::open(path)?;
-        return Ok(Self::new(inner)?);
+        Self::new(inner)
     }
 }
 
@@ -279,12 +278,12 @@ impl<R: Read + Seek> WaveReader<R> {
     pub fn audio_frame_reader(mut self) -> Result<AudioFrameReader<R>, ParserError> {
         let format = self.format()?;
         let audio_chunk_reader = self.get_chunk_extent_at_index(DATA_SIG, 0)?;
-        Ok(AudioFrameReader::new(
+        AudioFrameReader::new(
             self.inner,
             format,
             audio_chunk_reader.0,
             audio_chunk_reader.1,
-        )?)
+        )
     }
 
     /// The count of audio frames in the file.
diff --git a/src/wavewriter.rs b/src/wavewriter.rs
index a620143..0e97103 100644
--- a/src/wavewriter.rs
+++ b/src/wavewriter.rs
@@ -249,7 +249,7 @@ impl WaveWriter<BufWriter<File>> {
     pub fn create<P: AsRef<Path>>(path: P, format: WaveFmt) -> Result<Self, Error> {
         let f = File::create(path)?;
         let b = BufWriter::new(f);
-        Ok(Self::new(b, format)?)
+        Self::new(b, format)
     }
 }
 
@@ -257,7 +257,7 @@ impl WaveWriter<File> {
     /// Creare a new Wave file with unbuffered IO at `path`
     pub fn create_unbuffered<P: AsRef<Path>>(path: P, format: WaveFmt) -> Result<Self, Error> {
         let f = File::create(path)?;
-        Ok(Self::new(f, format)?)
+        Self::new(f, format)
     }
 }