Skip to content

Commit

Permalink
[CI] Upgrade to rustc 1.45
Browse files Browse the repository at this point in the history
Remove -Zno-landing-pads flag, because it was removed in
rust-lang/rust#70175
Its replacement is panic=abort, which... we already use.
  • Loading branch information
glandium committed Jul 18, 2020
1 parent 5c9a81f commit 9f94200
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
5 changes: 2 additions & 3 deletions CI/tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,6 @@ def prefix(p, s):
'-Zprofile',
'-Ccodegen-units=1',
'-Cinline-threshold=0',
'-Zno-landing-pads',
])
# Build without --release
environ['CARGO_BUILD_FLAGS'] = ''
Expand Down Expand Up @@ -364,9 +363,9 @@ def prefix(p, s):
elif os == 'linux':
environ['CARGO_TARGET'] = 'x86_64-unknown-linux-gnu'
if variant in ('coverage', 'asan'):
rust_version = 'nightly-2020-03-12'
rust_version = 'nightly-2020-06-05'
else:
rust_version = '1.42.0'
rust_version = '1.45.0'
rust_install += [
'{rustup} install {rust_version} --profile minimal',
'PATH={cargo_dir}:$PATH',
Expand Down
1 change: 1 addition & 0 deletions helper/GIT-VERSION.mk
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
GIT_VERSION ?= v2.27.0

WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1

0 comments on commit 9f94200

Please sign in to comment.