nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-01 11:13:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
f36b137074
rust/.gitattributes

27 lines
944 B
Plaintext
Raw Normal View History

add gitattributes and fix whitespace issues
2013-05-03 23:25:04 +00: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 23:06:05 +00:00
* text=auto eol=lf
add gitattributes and fix whitespace issues
2013-05-03 23:25:04 +00: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 15:40:00 +00:00
*.rs rust diff=rust
Mark .fixed files as Rust syntax for GitHub
2018-05-28 09:36:13 +00:00
*.fixed linguist-language=Rust
Highlight MIR as Rust on GitHub
2020-11-17 22:16:18 +00: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-21 01:03:06 +00:00
src/etc/installer/gfx/* binary
fix gitattributes for vendor
2017-02-10 16:27:34 +00: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 13:56:46 +00:00
Cargo.lock linguist-generated=false
Tell GitHub to highlight `config.toml.example` as TOML 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-24 00:20:12 +00:00
config.toml.example linguist-language=TOML
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 10:54:23 +00:00
Fix gitattibutes for old git versions
2021-03-16 16:14:01 +00:00
# Older git versions try to fix line endings on images and fonts, this prevents it.
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 10:54:23 +00:00
*.png binary
*.ico binary
Fix gitattibutes for old git versions
2021-03-16 16:14:01 +00:00
*.woff binary
*.woff2 binary
add rustfmt crlf files to root gitattributes
2021-05-15 02:52:28 +00:00
# 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
Reference in New Issue Copy Permalink