diff options
| author | Chris Denton <chris@chrisdenton.dev> | 2024-04-05 12:50:31 +0000 |
|---|---|---|
| committer | Chris Denton <chris@chrisdenton.dev> | 2024-04-05 12:50:31 +0000 |
| commit | 7d008267dddcda74ebdb83d3da9b3f16c7f56973 (patch) | |
| tree | 1f81ffbe4a0a26b57ee74e588da8572718fcb6ef /library/std/src/thread | |
| parent | d009f60b55fe4527e7ddf122bc4520f351d7b9d4 (diff) | |
| download | rust-7d008267dddcda74ebdb83d3da9b3f16c7f56973.tar.gz rust-7d008267dddcda74ebdb83d3da9b3f16c7f56973.zip | |
Revert #121666
This reverts #121666 due to #123495
Diffstat (limited to 'library/std/src/thread')
| -rw-r--r-- | library/std/src/thread/mod.rs | 4 | ||||
| -rw-r--r-- | library/std/src/thread/tests.rs | 20 |
2 files changed, 1 insertions, 23 deletions
diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs index f7eb92bc61e..5d9f452c556 100644 --- a/library/std/src/thread/mod.rs +++ b/library/std/src/thread/mod.rs @@ -694,9 +694,7 @@ pub(crate) fn set_current(thread: Thread) { /// In contrast to the public `current` function, this will not panic if called /// from inside a TLS destructor. pub(crate) fn try_current() -> Option<Thread> { - CURRENT - .try_with(|current| current.get_or_init(|| Thread::new(imp::Thread::get_name())).clone()) - .ok() + CURRENT.try_with(|current| current.get_or_init(|| Thread::new(None)).clone()).ok() } /// Gets a handle to the thread that invokes it. diff --git a/library/std/src/thread/tests.rs b/library/std/src/thread/tests.rs index 589a5fdad1d..af649f93126 100644 --- a/library/std/src/thread/tests.rs +++ b/library/std/src/thread/tests.rs @@ -69,26 +69,6 @@ fn test_named_thread_truncation() { result.unwrap().join().unwrap(); } -#[cfg(any( - all(target_os = "windows", not(target_vendor = "win7")), - target_os = "linux", - target_os = "macos", - target_os = "ios", - target_os = "tvos", - target_os = "watchos" -))] -#[test] -fn test_get_os_named_thread() { - use crate::sys::thread::Thread; - // Spawn a new thread to avoid interfering with other tests running on this thread. - let handler = thread::spawn(|| { - let name = c"test me please"; - Thread::set_name(name); - assert_eq!(name, Thread::get_name().unwrap().as_c_str()); - }); - handler.join().unwrap(); -} - #[test] #[should_panic] fn test_invalid_named_thread() { |
