diff options
| -rw-r--r-- | library/std/src/rt.rs | 4 | ||||
| -rw-r--r-- | library/std/src/thread/mod.rs | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/library/std/src/rt.rs b/library/std/src/rt.rs index 8e38f98105b..8465dfc0ab2 100644 --- a/library/std/src/rt.rs +++ b/library/std/src/rt.rs @@ -16,6 +16,8 @@ #![deny(unsafe_op_in_unsafe_fn)] #![allow(unused_macros)] +use crate::ffi::CString; + // Re-export some of our utilities which are expected by other crates. pub use crate::panicking::{begin_panic, begin_panic_fmt, panic_count}; @@ -38,7 +40,7 @@ unsafe fn init(argc: isize, argv: *const *const u8) { // created. Note that this isn't necessary in general for new threads, // but we just do this to name the main thread and to give it correct // info about the stack bounds. - let thread = Thread::new(Some("main".to_owned())); + let thread = Thread::new(Some(CString::new("main").unwrap())); thread_info::set(main_guard, thread); } } diff --git a/library/std/src/thread/mod.rs b/library/std/src/thread/mod.rs index f44df845bf4..9d659102b03 100644 --- a/library/std/src/thread/mod.rs +++ b/library/std/src/thread/mod.rs @@ -457,7 +457,9 @@ impl Builder { let stack_size = stack_size.unwrap_or_else(thread::min_stack); - let my_thread = Thread::new(name); + let my_thread = Thread::new(name.map(|name| { + CString::new(name).expect("thread name may not contain interior null bytes") + })); let their_thread = my_thread.clone(); let my_packet: Arc<UnsafeCell<Option<Result<T>>>> = Arc::new(UnsafeCell::new(None)); @@ -1073,12 +1075,8 @@ pub struct Thread { impl Thread { // Used only internally to construct a thread object without spawning // Panics if the name contains nuls. - pub(crate) fn new(name: Option<String>) -> Thread { - let cname = - name.map(|n| CString::new(n).expect("thread name may not contain interior null bytes")); - Thread { - inner: Arc::new(Inner { name: cname, id: ThreadId::new(), parker: Parker::new() }), - } + pub(crate) fn new(name: Option<CString>) -> Thread { + Thread { inner: Arc::new(Inner { name, id: ThreadId::new(), parker: Parker::new() }) } } /// Atomically makes the handle's token available if it is not already. |