rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update libstd doctests to use dyn

Browse Source
This commit is contained in:
memoryruins
2019-05-28 14:48:04 -04:00
parent fd347a8735
commit 83660b6273
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/libstd/error.rs
View File

@@ -94,7 +94,7 @@ pub trait Error: Debug + Display {
/// "I'm the superhero of errors" /// "I'm the superhero of errors"
/// } /// }
/// ///
/// fn cause(&self) -> Option<&Error> { /// fn cause(&self) -> Option<&dyn Error> {
/// Some(&self.side) /// Some(&self.side)
/// } /// }
/// } /// }
@@ -244,7 +244,7 @@ impl<'a, E: Error + 'a> From<E> for Box<dyn Error + 'a> {
/// ///
/// let an_error = AnError; /// let an_error = AnError;
/// assert!(0 == mem::size_of_val(&an_error)); /// 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)) /// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error))
/// ``` /// ```
fn from(err: E) -> Box<dyn Error + 'a> { 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; /// let an_error = AnError;
/// assert!(0 == mem::size_of_val(&an_error)); /// 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!( /// assert!(
/// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error)) /// 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; /// use std::mem;
/// ///
/// let a_string_error = "a string error".to_string(); /// 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!( /// assert!(
/// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error)) /// 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; /// use std::mem;
/// ///
/// let a_string_error = "a string error".to_string(); /// 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)) /// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error))
/// ``` /// ```
fn from(str_err: String) -> Box<dyn 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; /// use std::mem;
/// ///
/// let a_str_error = "a str error"; /// 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!( /// assert!(
/// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error)) /// 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; /// use std::mem;
/// ///
/// let a_str_error = "a str error"; /// 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)) /// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error))
/// ``` /// ```
fn from(err: &str) -> Box<dyn 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; /// use std::borrow::Cow;
/// ///
/// let a_cow_str_error = Cow::from("a str error"); /// 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!( /// assert!(
/// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error)) /// 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; /// use std::borrow::Cow;
/// ///
/// let a_cow_str_error = Cow::from("a str error"); /// 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)) /// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error))
/// ``` /// ```
fn from(err: Cow<'a, str>) -> Box<dyn Error> { fn from(err: Cow<'a, str>) -> Box<dyn Error> {

2
src/libstd/fs.rs
View File

@@ -1976,7 +1976,7 @@ pub fn remove_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> {
/// use std::path::Path; /// use std::path::Path;
/// ///
/// // one possible implementation of walking a directory only visiting files /// // 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() { /// if dir.is_dir() {
/// for entry in fs::read_dir(dir)? { /// for entry in fs::read_dir(dir)? {
/// let entry = entry?; /// let entry = entry?;