From 9f9420062fc97b2cc27e777e68f7a9b9d0f5bed6 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh@glandium.org>
Date: Fri, 17 Jul 2020 20:04:03 +0900
Subject: [PATCH] [CI] Upgrade to rustc 1.45

Remove -Zno-landing-pads flag, because it was removed in
https://github.com/rust-lang/rust/pull/70175
Its replacement is panic=abort, which... we already use.
---
 CI/tools.py           | 5 ++---
 helper/GIT-VERSION.mk | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CI/tools.py b/CI/tools.py
index 3bb2eb1e1..884c4697e 100644
--- a/CI/tools.py
+++ b/CI/tools.py
@@ -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'] = ''
@@ -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',
diff --git a/helper/GIT-VERSION.mk b/helper/GIT-VERSION.mk
index 1593a6ee3..0b4c807f3 100644
--- a/helper/GIT-VERSION.mk
+++ b/helper/GIT-VERSION.mk
@@ -1,2 +1,3 @@
 GIT_VERSION ?= v2.27.0
+
 WINDOWS_GIT_VERSION ?= $(GIT_VERSION).windows.1