* cargo fix --edition * move to rust 2021 * simplify macro now that patterns are supported natively Co-authored-by: James Wilson <james@jsdw.me>