Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

use Result::or for Either::from_str

Browse Source
This commit is contained in:
Isse 2023-11-26 15:37:14 +01:00
parent a151a6f550
commit a4caa2bc26
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/src/cmd.rs
View File

@ -4573,13 +4573,9 @@ fn handle_tether(
type Err = B::Err; type Err = B::Err;
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
match A::from_str(s) { A::from_str(s)
Ok(a) => Ok(Either::Left(a)), .map(Either::Left)
Err(_) => match B::from_str(s) { .or_else(|_| B::from_str(s).map(Either::Right))
Ok(b) => Ok(Either::Right(b)),
Err(e) => Err(e),
},
}
} }
} }
if let (Some(entity_target), length) = parse_cmd_args!(args, EntityTarget, Either<f32, bool>) { if let (Some(entity_target), length) = parse_cmd_args!(args, EntityTarget, Either<f32, bool>) {