From 00a5cfc8bafa5a68e4a93cbbab753d0faaceb0d5 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Sun, 29 Oct 2023 18:28:13 -0400 Subject: [PATCH] fix: rename Thread_local_storage_ to not collide with the library --- src/dune | 6 +++--- src/moonpool.ml | 2 +- src/moonpool.mli | 2 +- src/{thread_local_storage.mli => thread_local_storage_.mli} | 0 ..._local_storage.real.ml => thread_local_storage_.real.ml} | 0 ..._local_storage.stub.ml => thread_local_storage_.stub.ml} | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename src/{thread_local_storage.mli => thread_local_storage_.mli} (100%) rename src/{thread_local_storage.real.ml => thread_local_storage_.real.ml} (100%) rename src/{thread_local_storage.stub.ml => thread_local_storage_.stub.ml} (100%) diff --git a/src/dune b/src/dune index 5275ab40..59005b54 100644 --- a/src/dune +++ b/src/dune @@ -6,9 +6,9 @@ (action (run %{project_root}/src/cpp/cpp.exe %{input-file}))) (libraries threads either - (select thread_local_storage.ml from - (thread-local-storage -> thread_local_storage.stub.ml) - (-> thread_local_storage.real.ml)) + (select thread_local_storage_.ml from + (thread-local-storage -> thread_local_storage_.stub.ml) + (-> thread_local_storage_.real.ml)) (select dla_.ml from (domain-local-await -> dla_.real.ml) ( -> dla_.dummy.ml)))) diff --git a/src/moonpool.ml b/src/moonpool.ml index cb82f668..21b4ccec 100644 --- a/src/moonpool.ml +++ b/src/moonpool.ml @@ -16,7 +16,7 @@ module Lock = Lock module Immediate_runner = Immediate_runner module Pool = Fifo_pool module Runner = Runner -module Thread_local_storage = Thread_local_storage +module Thread_local_storage = Thread_local_storage_ module Ws_pool = Ws_pool module Private = struct diff --git a/src/moonpool.mli b/src/moonpool.mli index 40b78891..0e46bd02 100644 --- a/src/moonpool.mli +++ b/src/moonpool.mli @@ -38,7 +38,7 @@ module Lock = Lock module Fut = Fut module Chan = Chan module Fork_join = Fork_join -module Thread_local_storage = Thread_local_storage +module Thread_local_storage = Thread_local_storage_ (** A simple blocking queue. diff --git a/src/thread_local_storage.mli b/src/thread_local_storage_.mli similarity index 100% rename from src/thread_local_storage.mli rename to src/thread_local_storage_.mli diff --git a/src/thread_local_storage.real.ml b/src/thread_local_storage_.real.ml similarity index 100% rename from src/thread_local_storage.real.ml rename to src/thread_local_storage_.real.ml diff --git a/src/thread_local_storage.stub.ml b/src/thread_local_storage_.stub.ml similarity index 100% rename from src/thread_local_storage.stub.ml rename to src/thread_local_storage_.stub.ml