Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 961a9d6

Browse files
committedJun 11, 2019
Auto merge of #61741 - Centril:rollup-fgro5kz, r=Centril
Rollup of 11 pull requests Successful merges: - #61518 (Add loops to doc list of things not stable in const fn) - #61526 (move some tests into subfolders) - #61550 (Windows 10 SDK is also required now.) - #61606 (Remove some legacy proc macro flavors) - #61652 (Mention slice patterns in array) - #61686 (librustc_errors: Add some more documentation) - #61698 (typeck: Fix const generic in repeat param ICE.) - #61707 (Azure: retry failed awscli installs) - #61715 (make sure make_ascii_lowercase actually leaves upper-case non-ASCII characters alone) - #61724 (core: use memcmp optimization for 128 bit integer slices) - #61726 (Use `for_each` in `Iterator::partition`) Failed merges: r? @ghost
2 parents 5f3656c + 681712b commit 961a9d6

Some content is hidden

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

48 files changed

+386
-749
lines changed
 

‎.azure-pipelines/steps/run.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,9 @@ steps:
7474
# images, etc.
7575
- bash: |
7676
set -e
77+
source src/ci/shared.sh
7778
sudo apt-get install -y python3-setuptools
78-
pip3 install awscli --upgrade --user
79+
retry pip3 install awscli --upgrade --user
7980
echo "##vso[task.prependpath]$HOME/.local/bin"
8081
displayName: Install awscli (Linux)
8182
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ build.
130130

131131
MSVC builds of Rust additionally require an installation of Visual Studio 2017
132132
(or later) so `rustc` can use its linker. The simplest way is to get the
133-
[Visual Studio Build Tools] and check the “C++ build tools” workload.
133+
[Visual Studio], check the “C++ build tools” and “Windows 10 SDK” workload.
134134

135-
[Visual Studio Build Tools]: https://visualstudio.microsoft.com/downloads/#build-tools-for-visual-studio-2019
135+
[Visual Studio]: https://visualstudio.microsoft.com/downloads/
136136

137137
(If you're installing cmake yourself, be careful that “C++ CMake tools for
138138
Windows” doesn't get included under “Individual components”.)

0 commit comments

Comments
 (0)
Please sign in to comment.