mirror of
https://github.com/rust-lang/rust.git
synced 2024-10-30 05:51:58 +00:00
Rollup merge of #120976 - matthiaskrgr:constify_TL_statics, r=lcnr
constify a couple thread_local statics
This commit is contained in:
commit
706fe0b7d8
@ -42,7 +42,7 @@ pub struct Registry(Arc<RegistryData>);
|
||||
thread_local! {
|
||||
/// The registry associated with the thread.
|
||||
/// This allows the `WorkerLocal` type to clone the registry in its constructor.
|
||||
static REGISTRY: OnceCell<Registry> = OnceCell::new();
|
||||
static REGISTRY: OnceCell<Registry> = const { OnceCell::new() };
|
||||
}
|
||||
|
||||
struct ThreadData {
|
||||
|
@ -9,9 +9,9 @@ const DEFAULT_COLUMN_WIDTH: usize = 140;
|
||||
|
||||
thread_local! {
|
||||
/// Track the position of viewable characters in our buffer
|
||||
static CURSOR: Cell<usize> = Cell::new(0);
|
||||
static CURSOR: Cell<usize> = const { Cell::new(0) };
|
||||
/// Width of the terminal
|
||||
static WIDTH: Cell<usize> = Cell::new(DEFAULT_COLUMN_WIDTH);
|
||||
static WIDTH: Cell<usize> = const { Cell::new(DEFAULT_COLUMN_WIDTH) };
|
||||
}
|
||||
|
||||
/// Print to terminal output to a buffer
|
||||
|
@ -209,7 +209,7 @@ impl<'a> scoped_cell::ApplyL<'a> for BridgeStateL {
|
||||
|
||||
thread_local! {
|
||||
static BRIDGE_STATE: scoped_cell::ScopedCell<BridgeStateL> =
|
||||
scoped_cell::ScopedCell::new(BridgeState::NotConnected);
|
||||
const { scoped_cell::ScopedCell::new(BridgeState::NotConnected) };
|
||||
}
|
||||
|
||||
impl BridgeState<'_> {
|
||||
|
@ -223,7 +223,7 @@ thread_local! {
|
||||
/// This is required as the thread-local state in the proc_macro client does
|
||||
/// not handle being re-entered, and will invalidate all `Symbol`s when
|
||||
/// entering a nested macro.
|
||||
static ALREADY_RUNNING_SAME_THREAD: Cell<bool> = Cell::new(false);
|
||||
static ALREADY_RUNNING_SAME_THREAD: Cell<bool> = const { Cell::new(false) };
|
||||
}
|
||||
|
||||
/// Keep `ALREADY_RUNNING_SAME_THREAD` (see also its documentation)
|
||||
|
Loading…
Reference in New Issue
Block a user