diff options
| author | bors <bors@rust-lang.org> | 2019-05-29 21:55:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-29 21:55:59 +0000 |
| commit | 413790186c65e782e2c0183e933686f7bf35e158 (patch) | |
| tree | f21577d7e36bcdacd546f0163aa3bbc4490a6758 /src/libstd | |
| parent | 37d001e4deb206ed954fde5d91690221e8306fc3 (diff) | |
| parent | 83660b62734c4f966c536b60864bb51fac696f6c (diff) | |
| download | rust-413790186c65e782e2c0183e933686f7bf35e158.tar.gz rust-413790186c65e782e2c0183e933686f7bf35e158.zip | |
Auto merge of #61203 - memoryruins:bare_trait_objects, r=Centril
Warn on bare_trait_objects by default The `bare_trait_objects` lint is set to `warn` by default. Most ui tests have been updated to use `dyn` to avoid creating noise in stderr files. r? @Centril cc #54910
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/error.rs | 18 | ||||
| -rw-r--r-- | src/libstd/fs.rs | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index aeb822fa99e..c8978a94fcd 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -94,7 +94,7 @@ pub trait Error: Debug + Display { /// "I'm the superhero of errors" /// } /// - /// fn cause(&self) -> Option<&Error> { + /// fn cause(&self) -> Option<&dyn Error> { /// Some(&self.side) /// } /// } @@ -244,7 +244,7 @@ impl<'a, E: Error + 'a> From<E> for Box<dyn Error + 'a> { /// /// let an_error = AnError; /// assert!(0 == mem::size_of_val(&an_error)); - /// let a_boxed_error = Box::<Error>::from(an_error); + /// let a_boxed_error = Box::<dyn Error>::from(an_error); /// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error)) /// ``` fn from(err: E) -> Box<dyn Error + 'a> { @@ -287,7 +287,7 @@ impl<'a, E: Error + Send + Sync + 'a> From<E> for Box<dyn Error + Send + Sync + /// /// let an_error = AnError; /// assert!(0 == mem::size_of_val(&an_error)); - /// let a_boxed_error = Box::<Error + Send + Sync>::from(an_error); + /// let a_boxed_error = Box::<dyn Error + Send + Sync>::from(an_error); /// assert!( /// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error)) /// ``` @@ -309,7 +309,7 @@ impl From<String> for Box<dyn Error + Send + Sync> { /// use std::mem; /// /// let a_string_error = "a string error".to_string(); - /// let a_boxed_error = Box::<Error + Send + Sync>::from(a_string_error); + /// let a_boxed_error = Box::<dyn Error + Send + Sync>::from(a_string_error); /// assert!( /// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error)) /// ``` @@ -344,7 +344,7 @@ impl From<String> for Box<dyn Error> { /// use std::mem; /// /// let a_string_error = "a string error".to_string(); - /// let a_boxed_error = Box::<Error>::from(a_string_error); + /// let a_boxed_error = Box::<dyn Error>::from(a_string_error); /// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error)) /// ``` fn from(str_err: String) -> Box<dyn Error> { @@ -367,7 +367,7 @@ impl<'a> From<&str> for Box<dyn Error + Send + Sync + 'a> { /// use std::mem; /// /// let a_str_error = "a str error"; - /// let a_boxed_error = Box::<Error + Send + Sync>::from(a_str_error); + /// let a_boxed_error = Box::<dyn Error + Send + Sync>::from(a_str_error); /// assert!( /// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error)) /// ``` @@ -389,7 +389,7 @@ impl From<&str> for Box<dyn Error> { /// use std::mem; /// /// let a_str_error = "a str error"; - /// let a_boxed_error = Box::<Error>::from(a_str_error); + /// let a_boxed_error = Box::<dyn Error>::from(a_str_error); /// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error)) /// ``` fn from(err: &str) -> Box<dyn Error> { @@ -412,7 +412,7 @@ impl<'a, 'b> From<Cow<'b, str>> for Box<dyn Error + Send + Sync + 'a> { /// use std::borrow::Cow; /// /// let a_cow_str_error = Cow::from("a str error"); - /// let a_boxed_error = Box::<Error + Send + Sync>::from(a_cow_str_error); + /// let a_boxed_error = Box::<dyn Error + Send + Sync>::from(a_cow_str_error); /// assert!( /// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error)) /// ``` @@ -436,7 +436,7 @@ impl<'a> From<Cow<'a, str>> for Box<dyn Error> { /// use std::borrow::Cow; /// /// let a_cow_str_error = Cow::from("a str error"); - /// let a_boxed_error = Box::<Error>::from(a_cow_str_error); + /// let a_boxed_error = Box::<dyn Error>::from(a_cow_str_error); /// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error)) /// ``` fn from(err: Cow<'a, str>) -> Box<dyn Error> { diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index 616b5eb836f..d41b3a3a123 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -1976,7 +1976,7 @@ pub fn remove_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> { /// use std::path::Path; /// /// // one possible implementation of walking a directory only visiting files -/// fn visit_dirs(dir: &Path, cb: &Fn(&DirEntry)) -> io::Result<()> { +/// fn visit_dirs(dir: &Path, cb: &dyn Fn(&DirEntry)) -> io::Result<()> { /// if dir.is_dir() { /// for entry in fs::read_dir(dir)? { /// let entry = entry?; |
