Skip to content

Commit caccb7e

Browse files
MabezDevMabezDev
committed
Merge from upstream
2 parents 5206880 + 4512721 commit caccb7e

File tree

1,368 files changed

+116963
-3319
lines changed

Some content is hidden

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

1,368 files changed

+116963
-3319
lines changed

‎.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
[submodule "src/tools/rls"]
1717
path = src/tools/rls
1818
url = https://github.com/rust-lang/rls.git
19-
[submodule "src/tools/clippy"]
20-
path = src/tools/clippy
21-
url = https://github.com/rust-lang/rust-clippy.git
2219
[submodule "src/tools/rustfmt"]
2320
path = src/tools/rustfmt
2421
url = https://github.com/rust-lang/rustfmt.git

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ or reading the [rustc dev guide][rustcguidebuild].
4343
1. Make sure you have installed the dependencies:
4444

4545
* `g++` 5.1 or later or `clang++` 3.5 or later
46-
* `python` 2.7 (but not 3.x)
46+
* `python` 3 or 2.7
4747
* GNU `make` 3.81 or later
4848
* `cmake` 3.4.3 or later
4949
* `curl`
@@ -129,7 +129,7 @@ build.
129129
make \
130130
diffutils \
131131
tar \
132-
mingw-w64-x86_64-python2 \
132+
mingw-w64-x86_64-python \
133133
mingw-w64-x86_64-cmake \
134134
mingw-w64-x86_64-gcc
135135
```

‎src/ci/docker/x86_64-gnu-llvm-7/Dockerfile

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎src/libcore/unicode/version.rs

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎src/librustc_codegen_llvm/back/bytecode.rs

Lines changed: 0 additions & 141 deletions
This file was deleted.

‎src/librustc_error_codes/error_codes/E0738.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/librustc_infer/infer/error_reporting/nice_region_error/outlives_closure.rs

Lines changed: 0 additions & 116 deletions
This file was deleted.

0 commit comments

Comments
 (0)