Merge fc0cd8f0f8 into 38016cb2d6

solutions/13_error_handling/errors6.rs

@@ -29,15 +29,15 @@ impl ParsePosNonzeroError {
     }
 }
 
-/// As an alternative solution, implementing the `From` trait allows for the
+// As an alternative solution, implementing the `From` trait allows for the
-/// automatic conversion from a `ParseIntError` into a `ParsePosNonzeroError`
+// automatic conversion from a `ParseIntError` into a `ParsePosNonzeroError`
-/// using the `?` operator, without the need to call `map_err`.
+// using the `?` operator, without the need to call `map_err`.
-///
+//
-/// ```
+// ```
-/// let x: i64 = s.parse()?;
+// let x: i64 = s.parse()?;
-/// ```
+// ```
-///
+//
-/// Traits like `From` will be dealt with in later exercises.
+// Traits like `From` will be dealt with in later exercises.
 impl From<ParseIntError> for ParsePosNonzeroError {
     fn from(err: ParseIntError) -> Self {
         ParsePosNonzeroError::ParseInt(err)