Auto merge of #1746 - bstrie:depfix, r=RalfJung

Replace deprecated `collections::Bound` with `ops::Bound` Cc rust-lang/rust#83242 , which resulted from rust-lang/rust#82122 .
rust-lang · Mar 17, 2021 · 12dac5c · 12dac5c
2 parents 80d6b56 + fc88c6c
commit 12dac5c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-b3ac52646f7591a811fa9bf55995b24fd17ece08
+36f1f04f18b89ba4a999bcfd6584663fd6fc1c5d
diff --git 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 {