Skip to content

Commit

Permalink
Rollup merge of rust-lang#85989 - jyn514:gitignore-cleanup, r=ehuss
Browse files Browse the repository at this point in the history
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 rust-lang#82208; I think it should be ok now that bors isn't trying to merge the `subtree add` changes.

cc `@calebcartwright`
  • Loading branch information
JohnTitor committed Jun 8, 2021
2 parents 2a23af6 + c6004a5 commit c302810
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit c302810

Please sign in to comment.