Skip to content

Commit e653658

Browse files
committed
Remove outdated part of comment claiming thread_local re-enters global allocator
1 parent f0161e9 commit e653658

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

library/std/src/thread/current.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -236,15 +236,16 @@ fn init_current(current: *mut ()) -> Thread {
236236
// extra TLS write above shouldn't matter. The alternative is nearly always
237237
// a stack overflow.
238238

239-
// If you came across this message, contact the author of your allocator.
240-
// If you are said author: A surprising amount of functions inside the
241-
// standard library (e.g. `Mutex`, `thread_local!`, `File` when using long
242-
// paths, even `panic!` when using unwinding), need memory allocation, so
243-
// you'll get circular dependencies all over the place when using them.
244-
// I (joboet) highly recommend using only APIs from core in your allocator
245-
// and implementing your own system abstractions. Still, if you feel that
246-
// a particular API should be entirely allocation-free, feel free to open
247-
// an issue on the Rust repository, we'll see what we can do.
239+
// If you came across this message, contact the author of your
240+
// allocator. If you are said author: A surprising amount of functions
241+
// inside the standard library (e.g. `Mutex`, `File` when using long
242+
// paths, even `panic!` when using unwinding), need memory allocation,
243+
// so you'll get circular dependencies all over the place when using
244+
// them. I (joboet) highly recommend using only APIs from core in your
245+
// allocator and implementing your own system abstractions. Still, if
246+
// you feel that a particular API should be entirely allocation-free,
247+
// feel free to open an issue on the Rust repository, we'll see what we
248+
// can do.
248249
rtabort!(
249250
"\n\
250251
Attempted to access thread-local data while allocating said data.\n\

0 commit comments

Comments
 (0)