Merge pull request #1 from rust-lang/master

update

Author: mattwilkinsonn

.gitattributes

@@ -7,10 +7,12 @@
 *.fixed linguist-language=Rust
 *.mir linguist-language=Rust
 src/etc/installer/gfx/* binary
-*.woff binary
 src/vendor/** -text
 Cargo.lock linguist-generated=false
+config.toml.example linguist-language=TOML
 
-# Older git versions try to fix line endings on images, this prevents it.
+# Older git versions try to fix line endings on images and fonts, this prevents it.
 *.png binary
 *.ico binary
+*.woff binary
+*.woff2 binary

.github/ISSUE_TEMPLATE/diagnostics.md

@@ -0,0 +1,46 @@
+---
+name: Diagnostic issue
+about: Create a bug report or feature request for a change to `rustc`'s error output
+labels: A-diagnostics, T-compiler
+---
+<!--
+Thank you for filing a bug report! 🐛 Please provide a short summary of the bug,
+along with any information you feel relevant to replicating the bug.
+
+If you cannot produce a minimal reproduction case (something that would work in
+isolation), please provide the steps or even link to a repository that causes
+the problematic output to occur. 
+-->
+
+Given the following code: <!-- Please provide a link to play.rust-lang.org -->
+
+```rust
+<code>
+```
+
+The current output is:
+
+```
+<rustc output>
+```
+
+<!-- The following is not always necessary. -->
+Ideally the output should look like:
+
+```
+<proposed output>
+```
+
+<!--
+If the problem is not self-explanatory, please provide a rationale for the
+change.
+-->
+
+<!--
+If dramatically different output is caused by small changes, consider also
+adding them here.
+
+If you're using the stable version of the compiler, you should also check if the
+bug also exists in the beta or nightly versions. The output might also be
+different depending on the Edition.
+-->

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
           - name: mingw-check
             os: ubuntu-latest-xl
             env: {}
-          - name: x86_64-gnu-llvm-9
+          - name: x86_64-gnu-llvm-10
             os: ubuntu-latest-xl
             env: {}
           - name: x86_64-gnu-tools
@@ -63,7 +63,7 @@ jobs:
         run: "echo \"[CI_PR_NUMBER=$num]\""
         env:
           num: "${{ github.event.number }}"
-        if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
+        if: "success() && !env.SKIP_JOB && github.event_name == 'pull_request'"
       - name: add extra environment variables
         run: src/ci/scripts/setup-environment.sh
         env:
@@ -265,7 +265,7 @@ jobs:
           - name: x86_64-gnu-distcheck
             os: ubuntu-latest-xl
             env: {}
-          - name: x86_64-gnu-llvm-9
+          - name: x86_64-gnu-llvm-10
             env:
               RUST_BACKTRACE: 1
             os: ubuntu-latest-xl
@@ -349,6 +349,7 @@ jobs:
             env:
               SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
               RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json"
+              DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
             os: windows-latest-xl
           - name: i686-mingw-1
             env:
@@ -424,7 +425,7 @@ jobs:
         run: "echo \"[CI_PR_NUMBER=$num]\""
         env:
           num: "${{ github.event.number }}"
-        if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
+        if: "success() && !env.SKIP_JOB && github.event_name == 'pull_request'"
       - name: add extra environment variables
         run: src/ci/scripts/setup-environment.sh
         env:
@@ -531,7 +532,7 @@ jobs:
         run: "echo \"[CI_PR_NUMBER=$num]\""
         env:
           num: "${{ github.event.number }}"
-        if: "success() && !env.SKIP_JOBS && github.event_name == 'pull_request'"
+        if: "success() && !env.SKIP_JOB && github.event_name == 'pull_request'"
       - name: add extra environment variables
         run: src/ci/scripts/setup-environment.sh
         env:
@@ -621,7 +622,7 @@ jobs:
     if: "github.event_name == 'push' && github.ref == 'refs/heads/master' && github.repository == 'rust-lang-ci/rust'"
     steps:
       - name: checkout the source code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           fetch-depth: 2
       - name: publish toolstate

.gitignore

@@ -7,6 +7,8 @@
 # configure your local ignore list.
 # FIXME: This needs cleanup.
 *~
+*.swp
+*.swo
 .#*
 .DS_Store
 .cproject
@@ -50,4 +52,6 @@ Session.vim
 .cargo
 !/src/test/run-make/thumb-none-qemu/example/.cargo
 no_llvm_build
+**node_modules
+**package-lock.json
 # Before adding new lines, see the comment at the top.

.gitmodules

@@ -37,7 +37,7 @@
 [submodule "src/llvm-project"]
 	path = src/llvm-project
 	url = https://github.com/rust-lang/llvm-project.git
-	branch = rustc/11.0-2021-01-05
+	branch = rustc/12.0-2021-04-15
 [submodule "src/doc/embedded-book"]
 	path = src/doc/embedded-book
 	url = https://github.com/rust-embedded/book.git

.mailmap

@@ -235,6 +235,7 @@ Philipp Matthias Schäfer <[email protected]>
 Przemysław Wesołek <[email protected]> Przemek Wesołek <[email protected]>
 Rafael Ávila de Espíndola <[email protected]> Rafael Avila de Espindola <espindola@dream.(none)>
 Ralph Giles <[email protected]> Ralph Giles <[email protected]>
+Ramkumar Ramachandra <[email protected]> <[email protected]>
 Renato Riccieri Santos Zannon <[email protected]>
 Richard Diamond <[email protected]> <[email protected]>
 Rob Arnold <[email protected]>
@@ -285,7 +286,7 @@ Xuefeng Wu <[email protected]> Xuefeng Wu <[email protected]>
 Xuefeng Wu <[email protected]> XuefengWu <[email protected]>
 York Xiang <[email protected]>
 Youngsoo Son <[email protected]> <[email protected]>
-Yuki Okushi <[email protected]>
+Yuki Okushi <[email protected]> <[email protected]>
 Zach Pomerantz <[email protected]>
 Zack Corr <[email protected]> <[email protected]>
 Zack Slayton <[email protected]>

CONTRIBUTING.md

@@ -1,8 +1,31 @@
 # Contributing to Rust
 
-Thank you for your interest in contributing to Rust!
+Thank you for your interest in contributing to Rust! There are many ways to contribute
+and we appreciate all of them.
 
-To get started, read the [Contributing to Rust] chapter of the [rustc-dev-guide].
+Documentation for contributing to Rust is located in the [Guide to Rustc Development](https://rustc-dev-guide.rust-lang.org/),
+commonly known as the [rustc-dev-guide]. Despite the name, this guide documents
+not just how to develop rustc (the Rust compiler), but also how to contribute to any part
+of the Rust project.
+
+To get started with contributing, please read the [Contributing to Rust] chapter of the guide.
+That chapter explains how to get your development environment set up and how to get help.
+
+## About the [rustc-dev-guide]
+
+The [rustc-dev-guide] is meant to help document how rustc –the Rust compiler– works,
+as well as to help new contributors get involved in rustc development. It is recommend
+to read and understand the [rustc-dev-guide] before making a contribution. This guide
+talks about the different bots in the Rust ecosystem, the Rust development tools,
+bootstrapping, the compiler architecture, source code representation, and more.
+
+## [Getting help](https://rustc-dev-guide.rust-lang.org/getting-started.html#asking-questions)
+
+There are many ways you can get help when you're stuck. Rust has many platforms for this:
+[internals], [rust-zulip], and [rust-discord]. It is recommended to ask for help on
+the [rust-zulip], but any of these platforms are a great way to seek help and even
+find a mentor! You can learn more about asking questions and getting help in the
+[Asking Questions](https://rustc-dev-guide.rust-lang.org/getting-started.html#asking-questions) chapter of the [rustc-dev-guide].
 
 ## Bug reports
 
@@ -13,3 +36,6 @@ refer to [this section][contributing-bug-reports] and [open an issue][issue temp
 [rustc-dev-guide]: https://rustc-dev-guide.rust-lang.org/
 [contributing-bug-reports]: https://rustc-dev-guide.rust-lang.org/contributing.html#bug-reports
 [issue template]: https://github.com/rust-lang/rust/issues/new/choose
+[internals]: https://internals.rust-lang.org
+[rust-discord]: http://discord.gg/rust-lang
+[rust-zulip]: https://rust-lang.zulipchat.com