rust/.gitattributes

[attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4

* text=auto eol=lf
*.cpp rust
*.h rust
*.rs rust diff=rust
*.fixed linguist-language=Rust
*.mir linguist-language=Rust
src/etc/installer/gfx/* binary
*.woff binary
src/vendor/** -text
Cargo.lock linguist-generated=false

# Older git versions try to fix line endings on images, this prevents it.
*.png binary
*.ico binary
add gitattributes and fix whitespace issues 2013-05-03 18:25:04 -05:00			`[attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4`

restore auto-detection of text files We force the usage of LF line endings, but only in text files. 2013-09-19 18:06:05 -05:00			`* text=auto eol=lf`
add gitattributes and fix whitespace issues 2013-05-03 18:25:04 -05:00			`*.cpp rust`
			`*.h rust`
Nicer hunk headers for rust files 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)) } ``` 2020-11-08 09:40:00 -06:00			`*.rs rust diff=rust`
Mark .fixed files as Rust syntax for GitHub 2018-05-28 04:36:13 -05:00			`*.fixed linguist-language=Rust`
Highlight MIR as Rust on GitHub 2020-11-17 16:16:18 -06:00			`*.mir linguist-language=Rust`
rustbuild: Start building --enable-extended 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. 2017-01-20 19:03:06 -06:00			`src/etc/installer/gfx/* binary`
webfonts: proper fix 2014-07-08 12:51:06 -05:00			`*.woff binary`
fix gitattributes for vendor 2017-02-10 10:27:34 -06:00			`src/vendor/** -text`
Allow git to merge `Cargo.lock` 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-08-20 08:56:46 -05:00			`Cargo.lock linguist-generated=false`
ignore images line ending on older git versions 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. 2019-01-23 04:54:23 -06:00
			`# Older git versions try to fix line endings on images, this prevents it.`
			`*.png binary`
			`*.ico binary`