Remove extra::par fixes #5626
fix merge conflicts due to bit rot
auto merge of #7034 : nickdesaulniers/rust/removePar, r=brson

review? @brson