mirror/rustlings
1
0
Fork 0
mirror of https://github.com/rust-lang/rustlings.git synced 2024-12-26 00:00:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #212 - sosnowski:fix/add-dyn-trait, r=komaeda

Browse source 
fix(errorsn.rs) Update the deprecated syntax by adding dyn to trait o…

fix(errorsn.rs) Update the deprecated syntax by adding dyn to trait objects.

closes #211

Related issue: https://github.com/rust-lang/rustlings/issues/211
This commit is contained in:
bors 2019-08-21 11:01:11 +00:00
parent c5bb32253b 8109cbad97
commit f9987c8bed
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
exercises/error_handling/errorsn.rs
View file

@ -20,7 +20,7 @@ use std::fmt;
use std::io; use std::io;
// PositiveNonzeroInteger is a struct defined below the tests. // PositiveNonzeroInteger is a struct defined below the tests.
fn read_and_validate(b: &mut io::BufRead) -> Result<PositiveNonzeroInteger, ???> { fn read_and_validate(b: &mut dyn io::BufRead) -> Result<PositiveNonzeroInteger, ???> {
let mut line = String::new(); let mut line = String::new();
b.read_line(&mut line); b.read_line(&mut line);
let num: i64 = line.trim().parse(); let num: i64 = line.trim().parse();
@ -29,7 +29,7 @@ fn read_and_validate(b: &mut io::BufRead) -> Result<PositiveNonzeroInteger, ???>
} }
// This is a test helper function that turns a &str into a BufReader. // This is a test helper function that turns a &str into a BufReader.
fn test_with_str(s: &str) -> Result<PositiveNonzeroInteger, Box<error::Error>> { fn test_with_str(s: &str) -> Result<PositiveNonzeroInteger, Box<dyn error::Error>> {
let mut b = io::BufReader::new(s.as_bytes()); let mut b = io::BufReader::new(s.as_bytes());
read_and_validate(&mut b) read_and_validate(&mut b)
} }
@ -98,7 +98,7 @@ enum CreationError {
impl fmt::Display for CreationError { impl fmt::Display for CreationError {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.write_str((self as &error::Error).description()) f.write_str((self as &dyn error::Error).description())
} }
} }
@ -190,7 +190,7 @@ impl error::Error for CreationError {
// Another hint: under the hood, the `?` operator calls `From::from` // Another hint: under the hood, the `?` operator calls `From::from`
// on the error value to convert it to a boxed trait object, a Box<error::Error>, // on the error value to convert it to a boxed trait object, a Box<dyn error::Error>,
// which is polymorphic-- that means that lots of different kinds of errors // which is polymorphic-- that means that lots of different kinds of errors
// can be returned from the same function because all errors act the same // can be returned from the same function because all errors act the same
// since they all implement the `error::Error` trait. // since they all implement the `error::Error` trait.