upgrade to rivet 2.2.0 and yoda 1.3.0