Merge branch 'master' into term1.1

Manishearth · web-flow · commit 68b1880089e3 · 2025-10-08T22:37:03.000-07:00
diff --git a/tests/source/issue-1278.rs b/tests/source/issue-1278.rs
@@ -1,4 +1,4 @@
-// rustfmt-indent_style = "block"
+// rustfmt-indent_style: Block
 
 #![feature(pub_restricted)]
 
diff --git a/tests/target/issue-1278.rs b/tests/target/issue-1278.rs
@@ -1,4 +1,4 @@
-// rustfmt-indent_style = "block"
+// rustfmt-indent_style: Block
 
 #![feature(pub_restricted)]
 
