Fix all warnings in vendored buf_redux and multipart

buf_redux/src/lib.rs:
- Remove deprecated description() impl from IntoInnerError Error trait

multipart/src/server/field.rs:
- Remove unused GENERIC_PARSE_ERR constant
- Remove unused std::error::Error import
- Replace x.description() calls with x (Display) in quick_error! macros

multipart/src/server/save.rs:
- Replace deprecated TempDir::into_path() with TempDir::keep() (both return PathBuf)

Author: defstream

vendor/buf_redux/src/lib.rs

@@ -370,8 +370,8 @@ impl<R: Read, P> BufReader<R, P> {
     }
 
     /// Box the inner reader without losing data.
-    pub fn boxed<'a>(self) -> BufReader<Box<Read + 'a>, P> where R: 'a {
-        let inner: Box<Read + 'a> = Box::new(self.inner);
+    pub fn boxed<'a>(self) -> BufReader<Box<dyn Read + 'a>, P> where R: 'a {
+        let inner: Box<dyn Read + 'a> = Box::new(self.inner);
 
         BufReader {
             inner,
@@ -864,11 +864,7 @@ impl<W> Into<io::Error> for IntoInnerError<W> {
 }
 
 impl<W: Any + Send + fmt::Debug> error::Error for IntoInnerError<W> {
-    fn description(&self) -> &str {
-        error::Error::description(self.error())
-    }
-
-    fn cause(&self) -> Option<&error::Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         Some(&self.1)
     }
 }
@@ -1047,7 +1043,7 @@ impl Buffer {
         }
 
         let read = {
-            let mut buf = unsafe { self.buf.write_buf() };
+            let buf = unsafe { self.buf.write_buf() };
             rdr.read(buf)?
         };
 
@@ -1065,7 +1061,7 @@ impl Buffer {
     /// space, this returns 0.
     pub fn copy_from_slice(&mut self, src: &[u8]) -> usize {
         let len = unsafe {
-            let mut buf = self.buf.write_buf();
+            let buf = self.buf.write_buf();
             let len = cmp::min(buf.len(), src.len());
             buf[..len].copy_from_slice(&src[..len]);
             len
@@ -1270,7 +1266,7 @@ pub fn copy_buf<B: BufRead, W: Write>(b: &mut B, w: &mut W) -> io::Result<u64> {
 }
 
 thread_local!(
-    static DROP_ERR_HANDLER: RefCell<Box<Fn(&mut Write, &mut Buffer, io::Error)>>
+    static DROP_ERR_HANDLER: RefCell<Box<dyn Fn(&mut dyn Write, &mut Buffer, io::Error)>>
         = RefCell::new(Box::new(|_, _, _| ()))
 );
 
@@ -1283,7 +1279,7 @@ thread_local!(
 /// ### Panics
 /// If called from within a handler previously provided to this function.
 pub fn set_drop_err_handler<F: 'static>(handler: F)
-where F: Fn(&mut Write, &mut Buffer, io::Error)
+where F: Fn(&mut dyn Write, &mut Buffer, io::Error)
 {
     DROP_ERR_HANDLER.with(|deh| *deh.borrow_mut() = Box::new(handler))
 }

vendor/multipart/src/server/field.rs

@@ -8,7 +8,6 @@
 //! `multipart` field header parsing.
 use mime::Mime;
 
-use std::error::Error;
 use std::io::{self, BufRead, Read};
 use std::{fmt, str};
 
@@ -531,38 +530,36 @@ impl<M: ReadEntry, Entry> ReadEntryResult<M, Entry> {
     }
 }
 
-const GENERIC_PARSE_ERR: &str = "an error occurred while parsing field headers";
-
 quick_error! {
     #[derive(Debug)]
     enum ParseHeaderError {
         /// The `Content-Disposition` header was not found
         MissingContentDisposition(headers: String) {
-            display(x) -> ("{}:\n{}", x.description(), headers)
+            display(x) -> ("{}:\n{}", x, headers)
             description("\"Content-Disposition\" header not found in field headers")
         }
         InvalidContDisp(reason: &'static str, cause: String) {
-            display(x) -> ("{}: {}: {}", x.description(), reason, cause)
+            display(x) -> ("{}: {}: {}", x, reason, cause)
             description("invalid \"Content-Disposition\" header")
         }
         /// The header was found but could not be parsed
         TokenizeError(err: HttparseError) {
-            description(GENERIC_PARSE_ERR)
-            display(x) -> ("{}: {}", x.description(), err)
+            description("an error occurred while parsing field headers")
+            display(x) -> ("{}: {}", x, err)
             cause(err)
             from()
         }
         MimeError(cont_type: String) {
             description("Failed to parse Content-Type")
-            display(this) -> ("{}: {}", this.description(), cont_type)
+            display(this) -> ("{}: {}", this, cont_type)
         }
         TooLarge {
             description("field headers section ridiculously long or missing trailing CRLF-CRLF")
         }
         /// IO error
         Io(err: io::Error) {
             description("an io error occurred while parsing the headers")
-            display(x) -> ("{}: {}", x.description(), err)
+            display(x) -> ("{}: {}", x, err)
             cause(err)
             from()
         }

vendor/multipart/src/server/save.rs

@@ -510,7 +510,7 @@ impl SavedData {
     /// Get an adapter for this data which implements `Read`.
     ///
     /// If the data is in a file, the file is opened in read-only mode.
-    pub fn readable(&self) -> io::Result<DataReader> {
+    pub fn readable(&self) -> io::Result<DataReader<'_>> {
         use self::SavedData::*;
 
         match *self {
@@ -664,7 +664,7 @@ impl Entries {
             Occupied(occupied) => {
                 // dedup the field name by reusing the key's `Arc`
                 headers.name = occupied.key().clone();
-                occupied.into_mut().push({ SavedField { headers, data }});
+                occupied.into_mut().push(SavedField { headers, data });
             },
         }
 
@@ -733,7 +733,7 @@ impl SaveDir {
         use self::SaveDir::*;
 
         match self {
-            Temp(tempdir) => tempdir.into_path(),
+            Temp(tempdir) => tempdir.keep(),
             Perm(pathbuf) => pathbuf,
         }
     }
@@ -751,7 +751,7 @@ impl SaveDir {
     pub fn keep(&mut self) {
         use self::SaveDir::*;
         *self = match mem::replace(self, Perm(PathBuf::new())) {
-            Temp(tempdir) => Perm(tempdir.into_path()),
+            Temp(tempdir) => Perm(tempdir.keep()),
             old_self => old_self,
         };
     }