diff options
author | Daniel Silverstone <dsilvers@digital-scurf.org> | 2019-09-26 11:53:32 +0200 |
---|---|---|
committer | Neal H. Walfield <neal@pep.foundation> | 2019-09-27 22:12:11 +0200 |
commit | 424ce126a56660168f8284fa34ae80cb93d74289 (patch) | |
tree | 2c0440c1f3b0d557def5e1a496ee4ede22045a9b /buffered-reader/src/lib.rs | |
parent | a69ec9f9c5097bb8acd1a4fe2144328c9dc4ade7 (diff) |
linting: Clear up bare trait object warnings
Newer Rust compilers requre `dyn` marking trait objects.
Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
Diffstat (limited to 'buffered-reader/src/lib.rs')
-rw-r--r-- | buffered-reader/src/lib.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/buffered-reader/src/lib.rs b/buffered-reader/src/lib.rs index d0e10ffb..f3099343 100644 --- a/buffered-reader/src/lib.rs +++ b/buffered-reader/src/lib.rs @@ -799,7 +799,7 @@ pub trait BufferedReader<C> : io::Read + fmt::Debug + fmt::Display { /// ```text /// let inner = Box::new(br).into_inner(); /// ``` - fn into_inner<'a>(self: Box<Self>) -> Option<Box<BufferedReader<C> + 'a>> + fn into_inner<'a>(self: Box<Self>) -> Option<Box<dyn BufferedReader<C> + 'a>> where Self: 'a; /// Returns a mutable reference to the inner `BufferedReader`, if @@ -809,10 +809,10 @@ pub trait BufferedReader<C> : io::Read + fmt::Debug + fmt::Display { /// `BufferedReader`, because this `BufferedReader` may have some /// data buffered. However, this function can be useful to get /// the cookie. - fn get_mut(&mut self) -> Option<&mut BufferedReader<C>>; + fn get_mut(&mut self) -> Option<&mut dyn BufferedReader<C>>; /// Returns a reference to the inner `BufferedReader`, if any. - fn get_ref(&self) -> Option<&BufferedReader<C>>; + fn get_ref(&self) -> Option<&dyn BufferedReader<C>>; /// Sets the `BufferedReader`'s cookie and returns the old value. fn cookie_set(&mut self, cookie: C) -> C; @@ -865,7 +865,7 @@ pub fn buffered_reader_generic_read_impl<T: BufferedReader<C>, C> } /// Make a `Box<BufferedReader>` look like a BufferedReader. -impl <'a, C> BufferedReader<C> for Box<BufferedReader<C> + 'a> { +impl <'a, C> BufferedReader<C> for Box<dyn BufferedReader<C> + 'a> { fn buffer(&self) -> &[u8] { return self.as_ref().buffer(); } @@ -924,17 +924,17 @@ impl <'a, C> BufferedReader<C> for Box<BufferedReader<C> + 'a> { return self.as_mut().drop_eof(); } - fn get_mut(&mut self) -> Option<&mut BufferedReader<C>> { + fn get_mut(&mut self) -> Option<&mut dyn BufferedReader<C>> { // Strip the outer box. self.as_mut().get_mut() } - fn get_ref(&self) -> Option<&BufferedReader<C>> { + fn get_ref(&self) -> Option<&dyn BufferedReader<C>> { // Strip the outer box. self.as_ref().get_ref() } - fn into_inner<'b>(self: Box<Self>) -> Option<Box<BufferedReader<C> + 'b>> + fn into_inner<'b>(self: Box<Self>) -> Option<Box<dyn BufferedReader<C> + 'b>> where Self: 'b { // Strip the outer box. (*self).into_inner() |