Skip to content

Commit

Permalink
Use expression::parse_num
Browse files Browse the repository at this point in the history
  • Loading branch information
justinmoon committed Nov 10, 2020
1 parent e495b51 commit cd4ad73
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/descriptor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1003,12 +1003,12 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> SortedMultiVec<Pk, Ctx> {
where
<Pk as FromStr>::Err: ToString,
{
let k = tree.args[0].name.parse::<usize>().unwrap(); // FIXME: unwrap
let k = expression::parse_num(tree.args[0].name)?;
let pks: Result<Vec<Pk>, _> = tree.args[1..]
.iter()
.map(|sub| expression::terminal(sub, Pk::from_str))
.collect();
pks.map(|pks| SortedMultiVec::new(k, pks))?
pks.map(|pks| SortedMultiVec::new(k as usize, pks))?
}
}

Expand Down

0 comments on commit cd4ad73

Please sign in to comment.