Fix breakage when running compiletest with --test-args=--edition=2015
#139578
+208
−151
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.