Skip to content

Commit 12dac5c

Browse files
committed
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 .
2 parents 80d6b56 + fc88c6c commit 12dac5c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b3ac52646f7591a811fa9bf55995b24fd17ece08
1+
36f1f04f18b89ba4a999bcfd6584663fd6fc1c5d

src/shims/tls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ impl<'tcx> TlsData<'tcx> {
174174
key: Option<TlsKey>,
175175
thread_id: ThreadId,
176176
) -> Option<(ty::Instance<'tcx>, Scalar<Tag>, TlsKey)> {
177-
use std::collections::Bound::*;
177+
use std::ops::Bound::*;
178178

179179
let thread_local = &mut self.keys;
180180
let start = match key {

0 commit comments

Comments
 (0)