Skip to content

Commit e57e6aa

Browse files
committed
rustup
1 parent eb98ed6 commit e57e6aa

File tree

2 files changed

+1
-24
lines changed

2 files changed

+1
-24
lines changed

rust-src.diff

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +0,0 @@
1-
diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs
2-
index 479669647c1..555b2130dee 100644
3-
--- a/library/std/src/thread/mod.rs
4-
+++ b/library/std/src/thread/mod.rs
5-
@@ -203,8 +203,18 @@
6-
7-
#[unstable(feature = "libstd_thread_internals", issue = "none")]
8-
#[cfg(target_thread_local)]
9-
+#[cfg(not(test))]
10-
#[doc(hidden)]
11-
pub use self::local::fast::Key as __FastLocalKeyInner;
12-
+#[unstable(feature = "libstd_thread_internals", issue = "none")]
13-
+#[cfg(target_thread_local)]
14-
+#[cfg(test)] // when building for tests, use real std's key
15-
+pub use realstd::thread::__FastLocalKeyInner;
16-
+#[unstable(feature = "libstd_thread_internals", issue = "none")]
17-
+#[cfg(target_thread_local)]
18-
+#[cfg(test)]
19-
+pub use self::local::fast::Key as __FastLocalKeyInnerUnused; // we import this anyway to silence 'unused' warnings
20-
+
21-
#[unstable(feature = "libstd_thread_internals", issue = "none")]
22-
#[doc(hidden)]
23-
pub use self::local::os::Key as __OsLocalKeyInner;

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2022-08-22
1+
nightly-2022-09-08

0 commit comments

Comments
 (0)