Skip to content

Commit 9f94200

Browse files
committed
[CI] Upgrade to rustc 1.45
Remove -Zno-landing-pads flag, because it was removed in rust-lang/rust#70175 Its replacement is panic=abort, which... we already use.
1 parent 5c9a81f commit 9f94200

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CI/tools.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ def prefix(p, s):
313313
'-Zprofile',
314314
'-Ccodegen-units=1',
315315
'-Cinline-threshold=0',
316-
'-Zno-landing-pads',
317316
])
318317
# Build without --release
319318
environ['CARGO_BUILD_FLAGS'] = ''
@@ -364,9 +363,9 @@ def prefix(p, s):
364363
elif os == 'linux':
365364
environ['CARGO_TARGET'] = 'x86_64-unknown-linux-gnu'
366365
if variant in ('coverage', 'asan'):
367-
rust_version = 'nightly-2020-03-12'
366+
rust_version = 'nightly-2020-06-05'
368367
else:
369-
rust_version = '1.42.0'
368+
rust_version = '1.45.0'
370369
rust_install += [
371370
'{rustup} install {rust_version} --profile minimal',
372371
'PATH={cargo_dir}:$PATH',

helper/GIT-VERSION.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
GIT_VERSION ?= v2.27.0
2+
23
WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1

0 commit comments

Comments
 (0)