Cherry-pick rustfmt test fixes

Mark-Simulacrum · Mark-Simulacrum · commit 59ced7b2b425 · 2020-04-21T16:18:07.000-04:00
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit a5cb5d26833cfda6fa2ed35735448953f728bd5e
+Subproject commit e417356684a36ae9c8c4014e8f0cd86650e40dd2
