update for new rust (Total[Eq|Ord])