Skip to content

Commit 83660b6

Browse files
committed
Update libstd doctests to use dyn
1 parent fd347a8 commit 83660b6

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

src/libstd/error.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ pub trait Error: Debug + Display {
9494
/// "I'm the superhero of errors"
9595
/// }
9696
///
97-
/// fn cause(&self) -> Option<&Error> {
97+
/// fn cause(&self) -> Option<&dyn Error> {
9898
/// Some(&self.side)
9999
/// }
100100
/// }
@@ -244,7 +244,7 @@ impl<'a, E: Error + 'a> From<E> for Box<dyn Error + 'a> {
244244
///
245245
/// let an_error = AnError;
246246
/// assert!(0 == mem::size_of_val(&an_error));
247-
/// let a_boxed_error = Box::<Error>::from(an_error);
247+
/// let a_boxed_error = Box::<dyn Error>::from(an_error);
248248
/// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error))
249249
/// ```
250250
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 +
287287
///
288288
/// let an_error = AnError;
289289
/// assert!(0 == mem::size_of_val(&an_error));
290-
/// let a_boxed_error = Box::<Error + Send + Sync>::from(an_error);
290+
/// let a_boxed_error = Box::<dyn Error + Send + Sync>::from(an_error);
291291
/// assert!(
292292
/// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error))
293293
/// ```
@@ -309,7 +309,7 @@ impl From<String> for Box<dyn Error + Send + Sync> {
309309
/// use std::mem;
310310
///
311311
/// let a_string_error = "a string error".to_string();
312-
/// let a_boxed_error = Box::<Error + Send + Sync>::from(a_string_error);
312+
/// let a_boxed_error = Box::<dyn Error + Send + Sync>::from(a_string_error);
313313
/// assert!(
314314
/// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error))
315315
/// ```
@@ -344,7 +344,7 @@ impl From<String> for Box<dyn Error> {
344344
/// use std::mem;
345345
///
346346
/// let a_string_error = "a string error".to_string();
347-
/// let a_boxed_error = Box::<Error>::from(a_string_error);
347+
/// let a_boxed_error = Box::<dyn Error>::from(a_string_error);
348348
/// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error))
349349
/// ```
350350
fn from(str_err: String) -> Box<dyn Error> {
@@ -367,7 +367,7 @@ impl<'a> From<&str> for Box<dyn Error + Send + Sync + 'a> {
367367
/// use std::mem;
368368
///
369369
/// let a_str_error = "a str error";
370-
/// let a_boxed_error = Box::<Error + Send + Sync>::from(a_str_error);
370+
/// let a_boxed_error = Box::<dyn Error + Send + Sync>::from(a_str_error);
371371
/// assert!(
372372
/// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error))
373373
/// ```
@@ -389,7 +389,7 @@ impl From<&str> for Box<dyn Error> {
389389
/// use std::mem;
390390
///
391391
/// let a_str_error = "a str error";
392-
/// let a_boxed_error = Box::<Error>::from(a_str_error);
392+
/// let a_boxed_error = Box::<dyn Error>::from(a_str_error);
393393
/// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error))
394394
/// ```
395395
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> {
412412
/// use std::borrow::Cow;
413413
///
414414
/// let a_cow_str_error = Cow::from("a str error");
415-
/// let a_boxed_error = Box::<Error + Send + Sync>::from(a_cow_str_error);
415+
/// let a_boxed_error = Box::<dyn Error + Send + Sync>::from(a_cow_str_error);
416416
/// assert!(
417417
/// mem::size_of::<Box<dyn Error + Send + Sync>>() == mem::size_of_val(&a_boxed_error))
418418
/// ```
@@ -436,7 +436,7 @@ impl<'a> From<Cow<'a, str>> for Box<dyn Error> {
436436
/// use std::borrow::Cow;
437437
///
438438
/// let a_cow_str_error = Cow::from("a str error");
439-
/// let a_boxed_error = Box::<Error>::from(a_cow_str_error);
439+
/// let a_boxed_error = Box::<dyn Error>::from(a_cow_str_error);
440440
/// assert!(mem::size_of::<Box<dyn Error>>() == mem::size_of_val(&a_boxed_error))
441441
/// ```
442442
fn from(err: Cow<'a, str>) -> Box<dyn Error> {

src/libstd/fs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1976,7 +1976,7 @@ pub fn remove_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> {
19761976
/// use std::path::Path;
19771977
///
19781978
/// // one possible implementation of walking a directory only visiting files
1979-
/// fn visit_dirs(dir: &Path, cb: &Fn(&DirEntry)) -> io::Result<()> {
1979+
/// fn visit_dirs(dir: &Path, cb: &dyn Fn(&DirEntry)) -> io::Result<()> {
19801980
/// if dir.is_dir() {
19811981
/// for entry in fs::read_dir(dir)? {
19821982
/// let entry = entry?;

0 commit comments

Comments
 (0)