nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-03 18:43:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #133464 - RalfJung:whitespace-panic, r=joboet

Browse Source 
std:🧵 avoid leading whitespace in some panic messages

This:
```
        panic!(
            "use of std:🧵:current() is not possible after the thread's
         local data has been destroyed"
        )
```
will print a newline followed by a bunch of spaces, since the entire string literal is interpreted literally.

I think the intention was to print the message without the newline and the spaces, so let's add some `\` to make that happen.

r? ``@joboet``
This commit is contained in:
Guillaume Gomez 2024-11-26 15:32:17 +01:00 committed by GitHub
commit a06532e639
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
library/std/src/thread/current.rs
View File

@ -243,17 +243,17 @@ fn init_current(current: *mut ()) -> Thread {
// a particular API should be entirely allocation-free, feel free to open // a particular API should be entirely allocation-free, feel free to open
// an issue on the Rust repository, we'll see what we can do. // an issue on the Rust repository, we'll see what we can do.
rtabort!( rtabort!(
"\n "\n\
Attempted to access thread-local data while allocating said data.\n Attempted to access thread-local data while allocating said data.\n\
Do not access functions that allocate in the global allocator!\n Do not access functions that allocate in the global allocator!\n\
This is a bug in the global allocator.\n This is a bug in the global allocator.\n\
" "
) )
} else { } else {
debug_assert_eq!(current, DESTROYED); debug_assert_eq!(current, DESTROYED);
panic!( panic!(
"use of std::thread::current() is not possible after the thread's "use of std::thread::current() is not possible after the thread's \
local data has been destroyed" local data has been destroyed"
) )
} }
} }