From 4f899ce9acb3827cc45fd4a8672372b1ff64b8b2 Mon Sep 17 00:00:00 2001
From: bstrie <865233+bstrie@users.noreply.github.com>
Date: Wed, 17 Mar 2021 18:34:44 -0400
Subject: [PATCH 1/2] Replace deprecated `collections::Bound`

---
 src/shims/tls.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shims/tls.rs b/src/shims/tls.rs
index ef77949efa..3339e3bee1 100644
--- a/src/shims/tls.rs
+++ b/src/shims/tls.rs
@@ -174,7 +174,7 @@ impl<'tcx> TlsData<'tcx> {
         key: Option<TlsKey>,
         thread_id: ThreadId,
     ) -> Option<(ty::Instance<'tcx>, Scalar<Tag>, TlsKey)> {
-        use std::collections::Bound::*;
+        use std::ops::Bound::*;
 
         let thread_local = &mut self.keys;
         let start = match key {

From fc88c6ccca6849b1e7909f8d10a8968e12bcbb29 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Thu, 18 Mar 2021 00:19:53 +0100
Subject: [PATCH 2/2] rustup

---
 rust-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-version b/rust-version
index f064064db1..bd571f788a 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-b3ac52646f7591a811fa9bf55995b24fd17ece08
+36f1f04f18b89ba4a999bcfd6584663fd6fc1c5d