Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions exercises/error_handling/errors6.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,25 @@ impl ParsePosNonzeroError {
}
}

fn parse_pos_nonzero(s: &str)
-> Result<PositiveNonzeroInteger, ParsePosNonzeroError>
fn parse_pos_nonzero(s: &str) -> Result<PositiveNonzeroInteger, ParsePosNonzeroError>
{
match s.parse() {
Ok(n) => {
match PositiveNonzeroInteger::new(n) {
Ok(n) => Ok(n),
Err(err) => Err(ParsePosNonzeroError::from_creation(err)),
}
}
Err(err) => Err(ParsePosNonzeroError::from_parse_int(err)),
}
// long way
// match s.parse() {
// Ok(n) => {
// match PositiveNonzeroInteger::new(n) {
// Ok(n) => Ok(n),
// Err(err) => Err(ParsePosNonzeroError::from_creation(err)),
// }
// }
// Err(err) => Err(ParsePosNonzeroError::from_parse_int(err)),
// }

// short way
let x: i64 = s.parse().map_err(ParsePosNonzeroError::from_parseint)?;
PositiveNonzeroInteger::new(x).map_err(ParsePosNonzeroError::from_creation)
}


// Don't change anything below this line.

#[derive(PartialEq, Debug)]
Expand Down