constify a couple thread_local statics

matthiaskrgr · matthiaskrgr · commit d0873c7a11e7 · 2024-02-12T16:25:39.000+01:00
diff --git a/compiler/rustc_data_structures/src/sync/worker_local.rs b/compiler/rustc_data_structures/src/sync/worker_local.rs
@@ -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 {
diff --git a/compiler/rustc_errors/src/markdown/term.rs b/compiler/rustc_errors/src/markdown/term.rs
@@ -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
diff --git a/library/proc_macro/src/bridge/client.rs b/library/proc_macro/src/bridge/client.rs
@@ -284,7 +284,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<'_> {
diff --git a/library/proc_macro/src/bridge/server.rs b/library/proc_macro/src/bridge/server.rs
@@ -152,7 +152,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)

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ pub struct Registry(Arc<RegistryData>);`
`42`	`42`	`thread_local! {`
`43`	`43`	`/// The registry associated with the thread.`
`44`	`44`	/// This allows the `WorkerLocal` type to clone the registry in its constructor.
`45`		`- static REGISTRY: OnceCell<Registry> = OnceCell::new();`
	`45`	`+ static REGISTRY: OnceCell<Registry> = const { OnceCell::new() };`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`struct ThreadData {`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ impl<'a> scoped_cell::ApplyL<'a> for BridgeStateL {`
`284`	`284`
`285`	`285`	`thread_local! {`
`286`	`286`	`static BRIDGE_STATE: scoped_cell::ScopedCell<BridgeStateL> =`
`287`		`- scoped_cell::ScopedCell::new(BridgeState::NotConnected);`
	`287`	`+ const { scoped_cell::ScopedCell::new(BridgeState::NotConnected) };`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`impl BridgeState<'_> {`
Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ thread_local! {`
`152`	`152`	`/// This is required as the thread-local state in the proc_macro client does`
`153`	`153`	/// not handle being re-entered, and will invalidate all `Symbol`s when
`154`	`154`	`/// entering a nested macro.`
`155`		`- static ALREADY_RUNNING_SAME_THREAD: Cell<bool> = Cell::new(false);`
	`155`	`+ static ALREADY_RUNNING_SAME_THREAD: Cell<bool> = const { Cell::new(false) };`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	/// Keep `ALREADY_RUNNING_SAME_THREAD` (see also its documentation)