diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-06-08 13:26:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-08 13:26:30 +0900 |
| commit | c3028101a22b8f67457221267e7f35dfd8a15c0d (patch) | |
| tree | 66c29f842c758507ea5a275863293972903f0f37 | |
| parent | 2a23af63418a3b7c069ab414e3477184893eabcb (diff) | |
| parent | c6004a5d3b3c62725b74a2bcb1e731ca054af06f (diff) | |
| download | rust-c3028101a22b8f67457221267e7f35dfd8a15c0d.tar.gz rust-c3028101a22b8f67457221267e7f35dfd8a15c0d.zip | |
Rollup merge of #85989 - jyn514:gitignore-cleanup, r=ehuss
Remove rustfmt tests from top-level .gitattributes These are tracked in src/tools/rustfmt/.gitattributes already, they don't need to be listed twice. r? `@ehuss` since you suggested adding them in https://github.com/rust-lang/rust/pull/82208/#issuecomment-841440199; I think it should be ok now that bors isn't trying to merge the `subtree add` changes. cc `@calebcartwright`
| -rw-r--r-- | .gitattributes | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/.gitattributes b/.gitattributes index 82599b14503..51a670b5fbe 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,11 +16,3 @@ config.toml.example linguist-language=TOML *.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 |