notohh/rustlings
notohh/rustlings
1
0
Fork 0
mirror of https://github.com/notohh/rustlings.git synced 2024-11-29 16:44:18 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1259 from mfurak/format-errors5

Browse source 
style: format errors5 & errors6 with rustfmt
This commit is contained in:
liv 2022-11-07 15:14:06 +01:00 committed by GitHub
commit 82b79aac2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
exercises/error_handling/errors5.rs
View file

@ -46,7 +46,7 @@ impl PositiveNonzeroInteger {
match value { match value {
x if x < 0 => Err(CreationError::Negative), x if x < 0 => Err(CreationError::Negative),
x if x == 0 => Err(CreationError::Zero), x if x == 0 => Err(CreationError::Zero),
x => Ok(PositiveNonzeroInteger(x as u64)) x => Ok(PositiveNonzeroInteger(x as u64)),
} }
} }
} }

11
exercises/error_handling/errors6.rs
View file

@ -16,7 +16,7 @@ use std::num::ParseIntError;
#[derive(PartialEq, Debug)] #[derive(PartialEq, Debug)]
enum ParsePosNonzeroError { enum ParsePosNonzeroError {
Creation(CreationError), Creation(CreationError),
ParseInt(ParseIntError) ParseInt(ParseIntError),
} }
impl ParsePosNonzeroError { impl ParsePosNonzeroError {
@ -27,14 +27,11 @@ impl ParsePosNonzeroError {
// fn from_parseint... // fn from_parseint...
} }
fn parse_pos_nonzero(s: &str) fn parse_pos_nonzero(s: &str) -> Result<PositiveNonzeroInteger, ParsePosNonzeroError> {
-> Result<PositiveNonzeroInteger, ParsePosNonzeroError>
{
// TODO: change this to return an appropriate error instead of panicking // TODO: change this to return an appropriate error instead of panicking
// when `parse()` returns an error. // when `parse()` returns an error.
let x: i64 = s.parse().unwrap(); let x: i64 = s.parse().unwrap();
PositiveNonzeroInteger::new(x) PositiveNonzeroInteger::new(x).map_err(ParsePosNonzeroError::from_creation)
.map_err(ParsePosNonzeroError::from_creation)
} }
// Don't change anything below this line. // Don't change anything below this line.
@ -53,7 +50,7 @@ impl PositiveNonzeroInteger {
match value { match value {
x if x < 0 => Err(CreationError::Negative), x if x < 0 => Err(CreationError::Negative),
x if x == 0 => Err(CreationError::Zero), x if x == 0 => Err(CreationError::Zero),
x => Ok(PositiveNonzeroInteger(x as u64)) x => Ok(PositiveNonzeroInteger(x as u64)),
} }
} }
} }