diff --git a/solana/rustfmt.toml b/solana/rustfmt.toml
index c3c8c3753..acf722632 100644
--- a/solana/rustfmt.toml
+++ b/solana/rustfmt.toml
@@ -1 +1,11 @@
+# Merge similar crates together to avoid multiple use statements.
 imports_granularity = "Crate"
+
+# Consistency in formatting makes tool based searching/editing better.
+empty_item_single_line = false
+
+# Easier editing when arbitrary mixed use statements do not collapse.
+imports_layout = "HorizontalVertical"
+
+# Default rustfmt formatting of match arms with branches is awful.
+match_arm_leading_pipes = "Preserve"