Rollup merge of #85251 - BoxyUwU:constparamdefaultsany%, r=lcnr

[rust.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index d29c15fe712f301a375385e3ad9d624937721371..82599b1450386719fab9e732cc3502d342e4e850 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -9,9 +9,18 @@
 src/etc/installer/gfx/* binary
 src/vendor/** -text
 Cargo.lock linguist-generated=false
+config.toml.example linguist-language=TOML
 
 # Older git versions try to fix line endings on images and fonts, this prevents it.
 *.png binary
 *.ico binary
 *.woff binary
 *.woff2 binary
+
+# Needed as part of converting rustfmt to a subtree, can hopefully be removed later.
+src/tools/rustfmt/tests/source/issue-3494/crlf.rs -text
+src/tools/rustfmt/tests/source/comment_crlf_newline.rs -text
+src/tools/rustfmt/tests/source/configs/enum_discrim_align_threshold/40.rs -text
+src/tools/rustfmt/tests/target/issue-3494/crlf.rs -text
+src/tools/rustfmt/tests/target/comment_crlf_newline.rs -text
+src/tools/rustfmt/tests/target/configs/enum_discrim_align_threshold/40.rs -text