Skip to content

Commit 44af74f

Browse files
committed
Merge branch 'master' into hooks
2 parents a009e28 + a1dfd24 commit 44af74f

File tree

2,455 files changed

+95425
-42068
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,455 files changed

+95425
-42068
lines changed

.github/ISSUE_TEMPLATE/tracking_issue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The feature gate for the issue is `#![feature(FFF)]`.
2323
### About tracking issues
2424

2525
Tracking issues are used to record the overall progress of implementation.
26-
They are also uses as hubs connecting to other relevant issues, e.g., bugs or open design questions.
26+
They are also used as hubs connecting to other relevant issues, e.g., bugs or open design questions.
2727
A tracking issue is however *not* meant for large scale discussion, questions, or bug reports about a feature.
2828
Instead, open a dedicated issue for the specific matter and add the relevant feature gate label.
2929

.github/workflows/ci.yml

Lines changed: 140 additions & 143 deletions
Large diffs are not rendered by default.

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ __pycache__/
3333
/mingw-build/
3434
# Created by default with `src/ci/docker/run.sh`:
3535
/obj/
36-
/rustllvm/
3736
/unicode-downloads
3837
/target
3938
# Generated by compiletest for incremental:

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
[submodule "src/llvm-project"]
3838
path = src/llvm-project
3939
url = https://github.com/rust-lang/llvm-project.git
40-
branch = rustc/11.0-2020-08-20
40+
branch = rustc/11.0-2020-09-22
4141
[submodule "src/doc/embedded-book"]
4242
path = src/doc/embedded-book
4343
url = https://github.com/rust-embedded/book.git

.mailmap

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ Chris C Cerami <[email protected]> Chris C Cerami <chrisccer
5555
Chris Pressey <[email protected]>
5656
Chris Thorn <[email protected]> Chris Thorn <[email protected]>
5757
Chris Vittal <[email protected]> Christopher Vittal <[email protected]>
58+
59+
Christiaan Dirkx <[email protected]> CDirkx <[email protected]>
60+
Christiaan Dirkx <[email protected]> CDirkx <[email protected]>
5861
5962
6063

0 commit comments

Comments
 (0)