From 0ebb4839f673d911b148639009d264fb7ef02d24 Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Mon, 19 Jul 2021 15:32:22 +0200
Subject: [PATCH] Rustup to rustc 1.55.0-nightly (59216858a 2021-07-18)

---
 build_sysroot/Cargo.lock | 4 ++--
 rust-toolchain           | 2 +-
 src/lib.rs               | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/build_sysroot/Cargo.lock b/build_sysroot/Cargo.lock
index 431688abfa2..5e5c481cd9a 100644
--- a/build_sysroot/Cargo.lock
+++ b/build_sysroot/Cargo.lock
@@ -40,9 +40,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
 
 [[package]]
 name = "cc"
-version = "1.0.68"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787"
+checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2"
 
 [[package]]
 name = "cfg-if"
diff --git a/rust-toolchain b/rust-toolchain
index 586b05a0719..bc991acda62 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2021-07-08"
+channel = "nightly-2021-07-19"
 components = ["rust-src", "rustc-dev", "llvm-tools-preview"]
diff --git a/src/lib.rs b/src/lib.rs
index 366b9a7e24c..4ef53663ca0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -220,9 +220,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
     ) -> Result<(), ErrorReported> {
         use rustc_codegen_ssa::back::link::link_binary;
 
-        link_binary::<crate::archive::ArArchiveBuilder<'_>>(sess, &codegen_results, outputs);
-
-        Ok(())
+        link_binary::<crate::archive::ArArchiveBuilder<'_>>(sess, &codegen_results, outputs)
     }
 }