Cherry-pick rustfmt unstable-dependent fixes

Mark-Simulacrum · Mark-Simulacrum · commit 5afb70a48564 · 2020-06-02T21:05:28.000-04:00
diff --git a/src/tools/rustfmt b/src/tools/rustfmt
@@ -1 +1 @@
-Subproject commit aedff61f7ac4fc2b287ff76d33f2584e1f63a3af
+Subproject commit 530eadf4b42ddf35b209d4f4acd120f3fcc467ce
