Skip to content

Merge in Rust 1.38.0 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 108 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
2bd94a0
The xtensa triples are recognized by the compiler. Need to implement …
MabezDev Mar 5, 2019
4ea0e93
Preliminary call abi for xtensa, it almost certainly has mistakes/ mi…
MabezDev Mar 5, 2019
3007287
Tweaks to the xtensa call abi, small arrays arguments still need to b…
MabezDev Mar 7, 2019
29de921
Add built in target, based on msp430. This uses external gcc to gener…
MabezDev Mar 12, 2019
ad570c5
Add xtensa-esp32-none-elf, xtensa-esp8266-none-elf targets. Remove xt…
MabezDev May 27, 2019
bba6c06
Update README.md
MabezDev May 31, 2019
0723506
Switch to beta channel
Mark-Simulacrum Jul 3, 2019
2ddaaa1
Amend release notes with compat-notes for stdsimd
Mark-Simulacrum Jul 2, 2019
421160e
HashMap is UnwindSafe
SimonSapin Jul 2, 2019
178aa66
Auto merge of #62332 - Mark-Simulacrum:beta-next, r=pietroalbini
bors Jul 4, 2019
a787575
Swap to stable release
Mark-Simulacrum Jul 4, 2019
74e5a0d
Auto merge of #62374 - Mark-Simulacrum:beta-next, r=pietroalbini
bors Jul 8, 2019
095f8e8
Permit unwinding through FFI by default
Mark-Simulacrum Feb 28, 2019
c284078
Revert "Allow a dirty MirBuilt for make_extern and make_method_extern"
cuviper Apr 2, 2019
f56bb3f
Force #[unwind(aborts)] in test/codegen/c-variadic.rs
cuviper May 10, 2019
2ba6de7
Auto merge of #62505 - cuviper:beta-1.37-no-unwind-abort, r=joshtriplett
bors Jul 12, 2019
decd7f2
Don't drop DiagnosticBuilder if parsing fails
goodmanjonathan Jul 18, 2019
d380987
Only error about MSVC + PGO + unwind if we're generating code
wesleywiser Jul 12, 2019
1320cb7
rustc_target: avoid negative register counts in the SysV x86_64 ABI.
eddyb Jul 4, 2019
4dd5baa
Fixed up a few comments.
alexreg Jul 5, 2019
dd0bba8
Fixed ICEs.
alexreg Jul 5, 2019
eeb4e0a
Added tests for issues.
alexreg Jul 6, 2019
587e468
Blessed tests.
alexreg Jul 6, 2019
6a8b495
Raise the default recursion limit to 128
nagisa Jul 6, 2019
dc925be
Handle errors during error recovery gracefully
estebank Jul 11, 2019
bc8f0dd
Correctly break out of recovery loop
estebank Jul 12, 2019
620ed3a
add test case
estebank Jul 12, 2019
2c3f8b8
Cancel unemitted diagnostics during error recovery
estebank Jul 13, 2019
76b34f4
ci: pin awscli dependencies
pietroalbini Jul 21, 2019
f1d8d32
Ensure that checkout is with \n line endings
Mark-Simulacrum Jul 9, 2019
2c14d3a
Rollup merge of #62792 - goodmanjonathan:beta, r=estebank
pietroalbini Jul 22, 2019
1d5b47d
Rollup merge of #62793 - wesleywiser:pgo_error_backport, r=zackmdavis
pietroalbini Jul 22, 2019
61d1607
Auto merge of #62866 - pietroalbini:beta-rollup, r=Centril
bors Jul 22, 2019
1f53815
Add missing bracers in classify_arg_ty().
0ndorio Jul 25, 2019
28f3d6f
Pass big aggregated arguments indirectly.
0ndorio Jul 25, 2019
8b4a5a9
Merge pull request #3 from 0ndorio/fix/register_calculation
MabezDev Jul 25, 2019
501f828
[BETA] Update cargo
ehuss Jul 23, 2019
d86bab4
Updated RELEASES.md for 1.37.0
XAMPPRocky Jul 13, 2019
5310736
Require a value for configure --debuginfo-level
cuviper Jul 23, 2019
16a69ed
Make the parser TokenStream more resilient after mismatched delimiter…
estebank Jul 23, 2019
d8c0748
Fix another case
estebank Jul 23, 2019
639cb88
review comments
estebank Jul 23, 2019
6db3310
ci: move .azure-pipelines to src/ci/azure-pipelines
pietroalbini Aug 3, 2019
8effd53
Rollup merge of #62911 - ehuss:update-beta-cargo, r=alexcrichton
pietroalbini Aug 3, 2019
7a75a66
Allow lifetime elision in `Pin<&(mut) Self>`
taiki-e May 26, 2019
ee53d9a
Remove query for `.pin_type()`
taiki-e May 27, 2019
07903fe
Make is_self_ty a method on SelfVisitor
taiki-e May 29, 2019
a2b4ec2
Use Set1<Region> instead of Option<Region>
taiki-e May 29, 2019
bdc8b93
add a bevy of new test cases
nikomatsakis Jun 28, 2019
3f55d29
Update src/test/ui/self/elision/README.md
taiki-e Jul 15, 2019
857a8dd
Add main functions and check-pass annotations
taiki-e Jul 15, 2019
dc04a4e
Minor clean up
taiki-e Jul 15, 2019
f916aa9
Add test for multiple ref-self
taiki-e Jul 15, 2019
fdf1cc4
Add tests for `self: (&)AssocType`
taiki-e Jul 26, 2019
62a1c11
Fix typo
taiki-e Jul 26, 2019
d27529f
arbitrary_self_types lifetime elision: --bless --compare-mode=nll
taiki-e Jul 27, 2019
b23bbd8
Rollup merge of #63254 - taiki-e:arbitrary_self_types-lifetime-elisio…
pietroalbini Aug 4, 2019
775ffd9
bless ui tests
pietroalbini Aug 5, 2019
3f55461
Auto merge of #63262 - pietroalbini:beta-rollup, r=pietroalbini
bors Aug 5, 2019
c24cb35
Switch to stable channel
Mark-Simulacrum Aug 12, 2019
2c0bc3d
Avoid ICE when referencing desugared local binding in borrow error
estebank Jul 27, 2019
0a2bd28
fix cycle when looking up size and align of a static
RalfJung Aug 12, 2019
c9be294
Add date debug to CI
Mark-Simulacrum Aug 13, 2019
eae3437
Auto merge of #63498 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
bors Aug 13, 2019
211c04d
prepare beta for rust 1.38.0
pietroalbini Aug 13, 2019
e450539
Auto merge of #63524 - pietroalbini:beta-next, r=Mark-Simulacrum
bors Aug 13, 2019
539db81
RELEASES.md: ? is one of three Kleene operators
andersk Aug 13, 2019
10d6521
Do not ICE when synthesizing spans falling inside unicode chars
estebank Aug 13, 2019
bcd353c
review comment: remove unecessary error in test
estebank Aug 13, 2019
2d2448b
review comments
estebank Aug 13, 2019
3288766
ci: move mirrors to their standalone bucket
pietroalbini Aug 12, 2019
641586c
Auto merge of #63771 - pietroalbini:beta-rollup, r=pietroalbini
bors Aug 21, 2019
2f7efef
[BETA] Update cargo
ehuss Aug 27, 2019
72bfc37
Auto merge of #63957 - ehuss:beta-update-cargo, r=alexcrichton
bors Aug 27, 2019
15a07a8
Use released stable for beta
Mark-Simulacrum Aug 31, 2019
a06cba2
Update rust-installer to limit memory use
cuviper Aug 28, 2019
7014774
debuginfo: give unique names to closure and generator types
philipc Aug 25, 2019
981dea5
debuginfo: always include disambiguator in type names
philipc Aug 27, 2019
57f845c
ci: move libc mirrors to the rust-lang-ci-mirrors bucket
pietroalbini Aug 21, 2019
29fe076
Add a test for an opaque macro eagerly expanding its arguments
petrochenkov Aug 19, 2019
1e77ef8
Add a regression test for issue #63460
petrochenkov Aug 21, 2019
3d95d17
expand: Keep the correct current expansion ID for eager expansions
petrochenkov Aug 19, 2019
f2e3031
expand: Do not do questionable span adjustment before eagerly expandi…
petrochenkov Aug 24, 2019
02c4da1
Rollup merge of #64046 - Mark-Simulacrum:beta-next, r=pietroalbini
pietroalbini Sep 2, 2019
5f51210
bump clippy
pietroalbini Sep 3, 2019
d097af1
Auto merge of #64097 - pietroalbini:beta-rollup, r=pietroalbini
bors Sep 3, 2019
946fb89
Permit unwinding through FFI by default
Mark-Simulacrum Feb 28, 2019
ceaf4dd
Revert "Allow a dirty MirBuilt for make_extern and make_method_extern"
cuviper Apr 2, 2019
46049e7
Force #[unwind(aborts)] in test/codegen/c-variadic.rs
cuviper May 10, 2019
31b4b77
pprust: Do not print spaces before some tokens
petrochenkov Aug 25, 2019
3a93713
Account for doc comments coming from proc macros without spans
estebank Aug 27, 2019
ee6de6c
add regression test
estebank Aug 27, 2019
852014a
Support "soft" feature-gating using a lint
petrochenkov Sep 1, 2019
0c04419
Turn `soft_unstable` into a future-compatibility lint
petrochenkov Sep 7, 2019
2fe39b6
Update xLTO compatibility table in rustc book.
michaelwoerister Sep 2, 2019
29e4a42
Include compiler-rt in the source tarball
maurer Sep 6, 2019
e086278
Update LLVM submodule
nikic Sep 9, 2019
fdd4856
Auto merge of #64438 - cuviper:beta-rollup, r=Mark-Simulacrum
bors Sep 14, 2019
2eb6447
Merge remote-tracking branch 'upstream/stable' into rebase
MabezDev Sep 17, 2019
b365cff
Merge pull request #8 from MabezDev/rebase
MabezDev Sep 18, 2019
d8052d8
Updated RELEASES.md for 1.38.0
XAMPPRocky Sep 8, 2019
f3ebfab
Make fn ptr always structural match, regardless of whether formal typ…
pnkfelix Sep 13, 2019
73c70ca
Regression tests for fn ptr and `#[structural_match]` as discussed in…
pnkfelix Sep 13, 2019
e8d2957
ci: split aws credentials in two separate users with scoped perms
pietroalbini Sep 18, 2019
1c65325
Auto merge of #64661 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
bors Sep 21, 2019
e67a223
[stable] 1.38.0 release
Mark-Simulacrum Sep 23, 2019
625451e
Auto merge of #64709 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum
bors Sep 23, 2019
d7b76db
Merge tag '1.38.0' into mc-xtensa-target
mattcaron Oct 17, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
# The Rust Programming Language
# The Rust Programming Language For Xtensa processors

This fork enables projects to be built for the ESP32 and ESP8266 using [espressif's llvm fork](https://github.com/espressif/llvm-xtensa). The [esp-rs](https://github.com/esp-rs) organization has been formed to develop runtime, pac and hal crates for the esp32 and eventually esp8266.

## Using this fork

The [quickstart repo](https://github.com/MabezDev/xtensa-rust-quickstart) has more information on how to build this fork and use it to build xtensa compatible code.

This is the main source code repository for [Rust]. It contains the compiler,
standard library, and documentation.
Expand Down
116 changes: 115 additions & 1 deletion RELEASES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,117 @@
Version 1.38.0 (2019-09-26)
==========================

Language
--------
- [The `#[global_allocator]` attribute can now be used in submodules.][62735]
- [The `#[deprecated]` attribute can now be used on macros.][62042]

Compiler
--------
- [Added pipelined compilation support to `rustc`.][62766] This will
improve compilation times in some cases. For further information please refer
to the [_"Evaluating pipelined rustc compilation"_][pipeline-internals] thread.
- [Added tier 3\* support for the `aarch64-uwp-windows-msvc`, `i686-uwp-windows-gnu`,
`i686-uwp-windows-msvc`, `x86_64-uwp-windows-gnu`, and
`x86_64-uwp-windows-msvc` targets.][60260]
- [Added tier 3 support for the `armv7-unknown-linux-gnueabi` and
`armv7-unknown-linux-musleabi` targets.][63107]
- [Added tier 3 support for the `hexagon-unknown-linux-musl` target.][62814]
- [Added tier 3 support for the `riscv32i-unknown-none-elf` target.][62784]

\* Refer to Rust's [platform support page][forge-platform-support] for more
information on Rust's tiered platform support.

Libraries
---------
- [`ascii::EscapeDefault` now implements `Clone` and `Display`.][63421]
- [Derive macros for prelude traits (e.g. `Clone`, `Debug`, `Hash`) are now
available at the same path as the trait.][63056] (e.g. The `Clone` derive macro
is available at `std::clone::Clone`). This also makes all built-in macros
available in `std`/`core` root. e.g. `std::include_bytes!`.
- [`str::Chars` now implements `Debug`.][63000]
- [`slice::{concat, connect, join}` now accepts `&[T]` in addition to `&T`.][62528]
- [`*const T` and `*mut T` now implement `marker::Unpin`.][62583]
- [`Arc<[T]>` and `Rc<[T]>` now implement `FromIterator<T>`.][61953]
- [Added euclidean remainder and division operations (`div_euclid`,
`rem_euclid`) to all numeric primitives.][61884] Additionally `checked`,
`overflowing`, and `wrapping` versions are available for all
integer primitives.
- [`thread::AccessError` now implements `Clone`, `Copy`, `Eq`, `Error`, and
`PartialEq`.][61491]
- [`iter::{StepBy, Peekable, Take}` now implement `DoubleEndedIterator`.][61457]

Stabilized APIs
---------------
- [`<*const T>::cast`]
- [`<*mut T>::cast`]
- [`Duration::as_secs_f32`]
- [`Duration::as_secs_f64`]
- [`Duration::div_duration_f32`]
- [`Duration::div_duration_f64`]
- [`Duration::div_f32`]
- [`Duration::div_f64`]
- [`Duration::from_secs_f32`]
- [`Duration::from_secs_f64`]
- [`Duration::mul_f32`]
- [`Duration::mul_f64`]
- [`any::type_name`]

Cargo
-----
- [Added pipelined compilation support to `cargo`.][cargo/7143]
- [You can now pass the `--features` option multiple times to enable
multiple features.][cargo/7084]

Misc
----
- [`rustc` will now warn about some incorrect uses of
`mem::{uninitialized, zeroed}` that are known to cause undefined behaviour.][63346]

Compatibility Notes
-------------------
- Unfortunately the [`x86_64-unknown-uefi` platform can not be built][62785]
with rustc 1.39.0.
- The [`armv7-unknown-linux-gnueabihf` platform is also known to have
issues][62896] for certain crates such as libc.

[60260]: https://github.com/rust-lang/rust/pull/60260/
[61457]: https://github.com/rust-lang/rust/pull/61457/
[61491]: https://github.com/rust-lang/rust/pull/61491/
[61884]: https://github.com/rust-lang/rust/pull/61884/
[61953]: https://github.com/rust-lang/rust/pull/61953/
[62042]: https://github.com/rust-lang/rust/pull/62042/
[62528]: https://github.com/rust-lang/rust/pull/62528/
[62583]: https://github.com/rust-lang/rust/pull/62583/
[62735]: https://github.com/rust-lang/rust/pull/62735/
[62766]: https://github.com/rust-lang/rust/pull/62766/
[62784]: https://github.com/rust-lang/rust/pull/62784/
[62785]: https://github.com/rust-lang/rust/issues/62785/
[62814]: https://github.com/rust-lang/rust/pull/62814/
[62896]: https://github.com/rust-lang/rust/issues/62896/
[63000]: https://github.com/rust-lang/rust/pull/63000/
[63056]: https://github.com/rust-lang/rust/pull/63056/
[63107]: https://github.com/rust-lang/rust/pull/63107/
[63346]: https://github.com/rust-lang/rust/pull/63346/
[63421]: https://github.com/rust-lang/rust/pull/63421/
[cargo/7084]: https://github.com/rust-lang/cargo/pull/7084/
[cargo/7143]: https://github.com/rust-lang/cargo/pull/7143/
[`<*const T>::cast`]: https://doc.rust-lang.org/std/primitive.pointer.html#method.cast
[`<*mut T>::cast`]: https://doc.rust-lang.org/std/primitive.pointer.html#method.cast
[`Duration::as_secs_f32`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.as_secs_f32
[`Duration::as_secs_f64`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.as_secs_f64
[`Duration::div_duration_f32`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.div_duration_f32
[`Duration::div_duration_f64`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.div_duration_f64
[`Duration::div_f32`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.div_f32
[`Duration::div_f64`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.div_f64
[`Duration::from_secs_f32`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.from_secs_f32
[`Duration::from_secs_f64`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.from_secs_f64
[`Duration::mul_f32`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.mul_f32
[`Duration::mul_f64`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.mul_f64
[`any::type_name`]: https://doc.rust-lang.org/std/any/fn.type_name.html
[forge-platform-support]: https://forge.rust-lang.org/platform-support.html
[pipeline-internals]: https://internals.rust-lang.org/t/evaluating-pipelined-rustc-compilation/10199

Version 1.37.0 (2019-08-15)
==========================

Expand All @@ -22,7 +136,7 @@ Language
- [You can now use `_` as an identifier for consts.][61347] e.g. You can write
`const _: u32 = 5;`.
- [You can now use `#[repr(align(X)]` on enums.][61229]
- [The `?`/_"Kleene"_ macro operator is now available in the
- [The `?` Kleene macro operator is now available in the
2015 edition.][60932]

Compiler
Expand Down
1 change: 1 addition & 0 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -808,6 +808,7 @@ fn copy_src_dirs(builder: &Builder<'_>, src_dirs: &[&str], exclude_dirs: &[&str]
"llvm-project/lld", "llvm-project\\lld",
"llvm-project/lldb", "llvm-project\\lldb",
"llvm-project/llvm", "llvm-project\\llvm",
"llvm-project/compiler-rt", "llvm-project\\compiler-rt",
];
if spath.contains("llvm-project") && !spath.ends_with("llvm-project")
&& !LLVM_PROJECTS.iter().any(|path| spath.contains(path))
Expand Down
13 changes: 13 additions & 0 deletions src/ci/awscli-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
awscli==1.16.201
botocore==1.12.191
colorama==0.3.9
docutils==0.14
jmespath==0.9.4
pyasn1==0.4.5
python-dateutil==2.8.0
PyYAML==5.1
rsa==3.4.2
s3transfer==0.2.1
six==1.12.0
urllib3==1.25.3
futures==3.3.0; python_version < '3.0'
8 changes: 4 additions & 4 deletions src/ci/azure-pipelines/auto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ jobs:

dist-x86_64-apple:
SCRIPT: ./x.py dist
RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --set rust.jemalloc
RUST_CONFIGURE_ARGS: --target=aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios --enable-full-tools --enable-sanitizers --enable-profiler --enable-lldb --set rust.jemalloc
DEPLOY: 1
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
MACOSX_DEPLOYMENT_TARGET: 10.7
Expand All @@ -184,7 +184,7 @@ jobs:

dist-x86_64-apple-alt:
SCRIPT: ./x.py dist
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --set rust.jemalloc
RUST_CONFIGURE_ARGS: --enable-extended --enable-profiler --enable-lldb --set rust.jemalloc
DEPLOY_ALT: 1
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
MACOSX_DEPLOYMENT_TARGET: 10.7
Expand All @@ -202,7 +202,7 @@ jobs:

dist-i686-apple:
SCRIPT: ./x.py dist
RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --enable-full-tools --enable-profiler --set rust.jemalloc
RUST_CONFIGURE_ARGS: --build=i686-apple-darwin --enable-full-tools --enable-profiler --enable-lldb --set rust.jemalloc
DEPLOY: 1
RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
MACOSX_DEPLOYMENT_TARGET: 10.7
Expand Down Expand Up @@ -254,7 +254,7 @@ jobs:
x86_64-msvc-tools:
MSYS_BITS: 64
SCRIPT: src/ci/docker/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstates.json windows
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstates.json
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstates.json --enable-test-miri

# 32/64-bit MinGW builds.
#
Expand Down
24 changes: 11 additions & 13 deletions src/ci/azure-pipelines/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ trigger: none
pr:
- master

variables:
- group: public-credentials

jobs:
- job: Linux
timeoutInMinutes: 600
Expand All @@ -23,13 +20,14 @@ jobs:
mingw-check:
IMAGE: mingw-check

- job: LinuxTools
timeoutInMinutes: 600
pool:
vmImage: ubuntu-16.04
steps:
- template: steps/run.yml
parameters:
only_on_updated_submodules: 'yes'
variables:
IMAGE: x86_64-gnu-tools
# TODO: enable this job if the commit message matches this regex, need tools
# figure out how to get the current commit message on azure and stick it in a
# condition somewhere
# if: commit_message =~ /(?i:^update.*\b(rls|rustfmt|clippy|miri|cargo)\b)/
# - job: Linux-x86_64-gnu-tools
# pool:
# vmImage: ubuntu-16.04
# steps:
# - template: steps/run.yml
# variables:
# IMAGE: x86_64-gnu-tools
18 changes: 6 additions & 12 deletions src/ci/azure-pipelines/steps/install-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,12 @@ steps:
#
# Original downloaded here came from
# http://releases.llvm.org/7.0.0/LLVM-7.0.0-win64.exe
# That installer was run through `wine` on Linux and then the resulting
# installation directory (found in `$HOME/.wine/drive_c/Program Files/LLVM`) was
# packaged up into a tarball. We've had issues otherwise that the installer will
# randomly hang, provide not a lot of useful information, pollute global state,
# etc. In general the tarball is just more confined and easier to deal with when
# working with various CI environments.
- bash: |
set -e
mkdir -p citools
cd citools
curl -f https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-7.0.0-win64.tar.gz | tar xzf -
echo "##vso[task.setvariable variable=RUST_CONFIGURE_ARGS]$RUST_CONFIGURE_ARGS --set llvm.clang-cl=`pwd`/clang-rust/bin/clang-cl.exe"
- script: |
powershell -Command "$ProgressPreference = 'SilentlyContinue'; iwr -outf %TEMP%\LLVM-7.0.0-win64.exe https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/LLVM-7.0.0-win64.exe"
set CLANG_DIR=%CD%\citools\clang-rust
%TEMP%\LLVM-7.0.0-win64.exe /S /NCRC /D=%CLANG_DIR%
set RUST_CONFIGURE_ARGS=%RUST_CONFIGURE_ARGS% --set llvm.clang-cl=%CLANG_DIR%\bin\clang-cl.exe
echo ##vso[task.setvariable variable=RUST_CONFIGURE_ARGS]%RUST_CONFIGURE_ARGS%
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'), eq(variables['MINGW_URL'],''))
displayName: Install clang (Windows)

Expand Down
25 changes: 0 additions & 25 deletions src/ci/azure-pipelines/steps/install-windows-build-deps.yml
Original file line number Diff line number Diff line change
@@ -1,29 +1,4 @@
steps:
# We use the WIX toolset to create combined installers for Windows, and these
# binaries are downloaded from
# https://github.com/wixtoolset/wix3 originally
- bash: |
set -e
curl -O https://rust-lang-ci2.s3-us-west-1.amazonaws.com/rust-ci-mirror/wix311-binaries.zip
echo "##vso[task.setvariable variable=WIX]`pwd`/wix"
mkdir -p wix/bin
cd wix/bin
7z x ../../wix311-binaries.zip
displayName: Install wix
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))

# We use InnoSetup and its `iscc` program to also create combined installers.
# Honestly at this point WIX above and `iscc` are just holdovers from
# oh-so-long-ago and are required for creating installers on Windows. I think
# one is MSI installers and one is EXE, but they're not used so frequently at
# this point anyway so perhaps it's a wash!
- script: |
powershell -Command "$ProgressPreference = 'SilentlyContinue'; iwr -outf is-install.exe https://rust-lang-ci2.s3.amazonaws.com/rust-ci-mirror/2017-08-22-is.exe"
is-install.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
echo ##vso[task.prependpath]C:\Program Files (x86)\Inno Setup 5
displayName: Install InnoSetup
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))

# We've had issues with the default drive in use running out of space during a
# build, and it looks like the `C:` drive has more space than the default `D:`
# drive. We should probably confirm this with the azure pipelines team at some
Expand Down
Loading