about summary refs log tree commit diff
path: root/.gitattributes
AgeCommit message (Collapse)AuthorLines
2025-03-29Mark .pp files as RustLieselotte-0/+1
2024-12-12Revert "Stop git from merging generated files"Ralf Jung-4/+2
This reverts commit 4cbb599edf5b0762caa36ee4cbba00c5c86c1f5e. "-merge" makes git not even do merges if they are entirely conflict-free, which is not the behavior we want.
2024-12-04Stop git from merging generated filesOli Scherer-2/+4
2023-03-11Rename `config.toml.example` to `config.example.toml`Thom Chiovoloni-1/+0
2021-06-04Remove rustfmt tests from top-level .gitattributesJoshua Nelson-8/+0
These are tracked in src/tools/rustfmt/.gitattributes already, they don't need to be listed twice.
2021-05-14add rustfmt crlf files to root gitattributesCaleb Cartwright-0/+8
2021-03-23Tell GitHub to highlight `config.toml.example` as TOMLCamelid-0/+1
This should be a nice small quality of life improvement when looking at `config.toml.example` on GitHub or looking at diffs of it in PRs.
2021-03-17Fix gitattibutes for old git versionsJethro Beekman-3/+3
2021-03-15Specify *.woff2 files as binaryJulian Frimmel-0/+1
This prevents older git versions to change the "line endings".
2020-11-17Highlight MIR as Rust on GitHubCamelid-0/+1
2020-11-08Nicer hunk headers for rust filesbjorn3-1/+1
I found this trick at <https://tekin.co.uk/2020/10/better-git-diff-output-for-ruby-python-elixir-and-more> Before the hunk headers for changes in methods would refer to the impl: ```diff diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index 1c6937e685c..fa4264d729b 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -678,7 +678,7 @@ impl<'a, 'tcx> HashStable<StableHashingContext<'a>> for TypeckResults<'tcx> { ref closure_captures, ref generator_interior_types, } = *self; - + // foo hcx.with_node_id_hashing_mode(NodeIdHashingMode::HashDefPath, |hcx| { type_dependent_defs.hash_stable(hcx, hasher); field_indices.hash_stable(hcx, hasher); ``` After the hunk headers refer to the actual function signature: ```diff diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index 1c6937e685c..fa4264d729b 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -678,7 +678,7 @@ fn hash_stable(&self, hcx: &mut StableHashingContext<'a>, hasher: &mut StableHas ref closure_captures, ref generator_interior_types, } = *self; - + // foo hcx.with_node_id_hashing_mode(NodeIdHashingMode::HashDefPath, |hcx| { type_dependent_defs.hash_stable(hcx, hasher); field_indices.hash_stable(hcx, hasher); ``` When the function signature is visible, it will use the function signature of the previous method as hunk header: ```diff diff --git a/compiler/rustc_middle/src/ty/context.rs b/compiler/rustc_middle/src/ty/context.rs index 1c6937e685c..63058dfc837 100644 --- a/compiler/rustc_middle/src/ty/context.rs +++ b/compiler/rustc_middle/src/ty/context.rs @@ -992,6 +992,7 @@ pub fn typeck_opt_const_arg( } pub fn alloc_steal_mir(self, mir: Body<'tcx>) -> &'tcx Steal<Body<'tcx>> { + // foo self.arena.alloc(Steal::new(mir)) } ```
2019-08-20Allow git to merge `Cargo.lock`Alex Crichton-1/+1
This commit backs out #46539 in order to fully leverage #63579 where `git` should be able to merge `Cargo.lock` nowadays with only minimal conflicts.
2019-01-23ignore images line ending on older git versionsPietro Albini-0/+4
On Ubuntu 16.04 git 2.7.4 tries to fix the line ending of .png and .ico files, and obviously it ruins them. This commit adds an attribute to those files to properly mark them as binary.
2018-05-28Mark .fixed files as Rust syntax for GitHubManish Goregaokar-0/+1
2018-05-16GitHub: Stop treating Cargo.lock as a generated file.kennytm-1/+1
We do want to inspect the changes to Cargo.lock, hiding the diff by default would miss important details like https://github.com/rust-lang/rust/pull/50629#discussion_r187556602
2017-12-06Do not automatically merge Cargo.lockOliver Schneider-0/+1
2017-02-13fix gitattributes for vendorSteve Klabnik-1/+1
2017-01-24rustbuild: Start building --enable-extendedAlex Crichton-2/+1
This commit adds a new flag to the configure script, `--enable-extended`, which is intended for specifying a desire to compile the full suite of Rust tools such as Cargo, the RLS, etc. This is also an indication that the build system should create combined installers such as the pkg/exe/msi artifacts. Currently the `--enable-extended` flag just indicates that combined installers should be built, and Cargo is itself not compiled just yet but rather only downloaded from its location. The intention here is to quickly get to feature parity with the current release process and then we can start improving it afterwards. All new files in this PR inside `src/etc/installer` are copied from the rust-packaging repository.
2016-11-08rustbuild: Tweak for vendored dependenciesAlex Crichton-0/+1
A few changes are included here: * The `winapi` and `url` dependencies were dropped. The source code for these projects is pretty weighty, and we're about to vendor them, so let's not commit to that intake just yet. If necessary we can vendor them later but for now it shouldn't be necessary. * The `--frozen` flag is now always passed to Cargo, obviating the need for tidy's `cargo_lock` check. * Tidy was updated to not check the vendor directory Closes #34687
2015-07-27std: Remove msvc/valgrind headersAlex Crichton-2/+0
These aren't really used for anything any more, so there doesn't seem to be much reason to leave them around in the `rt` directory. There was some limiting of threads spawned or tests when run under valgrind, but very little is run under valgrind nowadays so there's also no real use keeping these around.
2014-07-08webfonts: proper fixAdrien Tétar-0/+1
2014-05-11make sure jemalloc valgrind support is enabledDaniel Micay-1/+1
This requires pointing it at the valgrind headers we carry in-tree.
2014-05-10gitattributes: rm obsolete jemalloc entryDaniel Micay-1/+0
2014-03-28dist: Tweak the OSX pkg installerAlex Crichton-0/+1
This performs a few touch-ups to the OSX installer: * A rust logo is shown during installation * The installation happens to /usr/local by default (instead of /) * A new welcome screen is shown that's slightly more relevant
2013-10-16drop the linenoise libraryDaniel Micay-1/+0
Closes #5038
2013-09-25stop fighting with rust logo filetype.Felix S. Klock II-0/+1
2013-09-19restore auto-detection of text filesDaniel Micay-1/+1
We force the usage of LF line endings, but *only* in text files.
2013-09-16gitattributes: force LF line endings for all filesadridu59-4/+1
This avoids default CRLF on msysgit for Windows which can cause trouble. Cf. https://help.github.com/articles/dealing-with-line-endings#text-eollf Commit dad2ccc9b3b27d3f438eeea53b771cc85f6dfa32 followup. Closes #7723.
2013-08-24Force line ending of '.in' files in jemalloc to LFMukilan Thiagarajan-0/+3
This fixes issue #8731 . On Windows, if the git option core.autocrlf is true (github recommends users to turn on this flag - see https://help.github.com/articles/dealing-with-line-endings), the headers generated from the .in files will have syntatic errors, causing compilation to fail.
2013-06-01add jemalloc to the runtimeDaniel Micay-0/+1
2013-05-03add gitattributes and fix whitespace issuesDaniel Micay-0/+9
generated by cgit-pink 1.4.1-3-g733a5 (git 2.37.1) at 2026-02-24 01:36:31 +0000