Auto merge of #103172 - pcwalton:deduced-param-attrs, r=oli-obk

[rust.git] / .editorconfig

diff --git a/.editorconfig b/.editorconfig
index 5bb92df3e04329867d1ed8bc6449f84ed4efb5d5..ec6e107d547f0e6d7ff63e4866a641e3d2c4d1a5 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,26 +1,21 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
 root = true
 
 [*]
-charset = utf-8
 end_of_line = lf
-indent_size = 2
-indent_style = space
+charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+indent_style = space
+indent_size = 4
 
 [*.md]
+# double whitespace at end of line
+# denotes a line break in Markdown
 trim_trailing_whitespace = false
 
-[*.rs]
-indent_size = 4
-
-[tests/**/*.rs]
-charset = utf-8
-end_of_line = unset
-indent_size = unset
-indent_style = unset
-trim_trailing_whitespace = unset
-insert_final_newline = unset
-
-[appveyor.yml]
-end_of_line = unset
+[*.yml]
+indent_size = 2