From 01f6f40ac24c32d61d2746d0f031279cf86ddd2f Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Fri, 7 Feb 2020 13:49:48 +0100
Subject: [PATCH] Rustup to rustc 1.43.0-nightly (442ae7f04 2020-02-06)

---
 build_sysroot/alloc_system/lib.rs |  4 ++--
 rust-toolchain                    |  2 +-
 src/common.rs                     |  1 +
 src/lib.rs                        | 14 +++++++++++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/build_sysroot/alloc_system/lib.rs b/build_sysroot/alloc_system/lib.rs
index a942fa8d95e..c9815853de1 100644
--- a/build_sysroot/alloc_system/lib.rs
+++ b/build_sysroot/alloc_system/lib.rs
@@ -41,7 +41,7 @@ const MIN_ALIGN: usize = 8;
               target_arch = "sparc64")))]
 #[allow(dead_code)]
 const MIN_ALIGN: usize = 16;
-use core::alloc::{Alloc, GlobalAlloc, AllocErr, Layout};
+use core::alloc::{AllocRef, GlobalAlloc, AllocErr, Layout};
 use core::ptr::NonNull;
 /// The default memory allocator provided by the operating system.
 ///
@@ -70,7 +70,7 @@ use core::ptr::NonNull;
 #[stable(feature = "alloc_system_type", since = "1.28.0")]
 pub struct System;
 #[unstable(feature = "allocator_api", issue = "32838")]
-unsafe impl Alloc for System {
+unsafe impl AllocRef for System {
     #[inline]
     unsafe fn alloc(&mut self, layout: Layout) -> Result<NonNull<u8>, AllocErr> {
         NonNull::new(GlobalAlloc::alloc(self, layout)).ok_or(AllocErr)
diff --git a/rust-toolchain b/rust-toolchain
index e2f2cd69e63..2580eba6f26 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-02-01
+nightly-2020-02-07
diff --git a/src/common.rs b/src/common.rs
index dcf47f6657a..07a1c91d385 100644
--- a/src/common.rs
+++ b/src/common.rs
@@ -329,6 +329,7 @@ impl<'tcx, B: Backend> BackendTypes for FunctionCx<'_, 'tcx, B> {
     type Type = Type;
     type Funclet = !;
     type DIScope = !;
+    type DIVariable = !;
 }
 
 impl<'tcx, B: Backend + 'static> FunctionCx<'_, 'tcx, B> {
diff --git a/src/lib.rs b/src/lib.rs
index 94c47d0d395..ad2ad82f0f2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -213,11 +213,19 @@ impl CodegenBackend for CraneliftCodegenBackend {
         res
     }
 
-    fn join_codegen_and_link(
+    fn join_codegen(
         &self,
-        res: Box<dyn Any>,
-        sess: &Session,
+        ongoing_codegen: Box<dyn Any>,
+        _sess: &Session,
         _dep_graph: &DepGraph,
+    ) -> Result<Box<dyn Any>, ErrorReported> {
+        Ok(ongoing_codegen)
+    }
+
+    fn link(
+        &self,
+        sess: &Session,
+        res: Box<dyn Any>,
         outputs: &OutputFilenames,
     ) -> Result<(), ErrorReported> {
         use rustc_codegen_ssa::back::link::link_binary;