feat: clean up library namespace (#100)

Gets rid of the global namespace pollution while preserving a single package. You can still use riot in your libraries just to get access to the stdlib. You can now depend only on the runtime if you really wish to (riot_runtime). Next step is the camel-casification of everything but pushing this now means refactoring a bunch of things that break downstream so we'll wait a few weeks. Should finally fix #19
riot-ml · Oct 19, 2024 · c2d5266 · c2d5266
1 parent 0253c5e
commit c2d5266
Show file tree

Hide file tree

Showing 82 changed files with 24 additions and 30 deletions.
diff --git a/riot/runtime/core/core.ml → packages/riot-runtime/core/core.ml b/riot/runtime/core/core.ml → packages/riot-runtime/core/core.ml
diff --git a/riot/runtime/core/mailbox.ml → packages/riot-runtime/core/mailbox.ml b/riot/runtime/core/mailbox.ml → packages/riot-runtime/core/mailbox.ml
diff --git a/riot/runtime/core/mailbox.mli → packages/riot-runtime/core/mailbox.mli b/riot/runtime/core/mailbox.mli → packages/riot-runtime/core/mailbox.mli
diff --git a/riot/runtime/core/message.ml → packages/riot-runtime/core/message.ml b/riot/runtime/core/message.ml → packages/riot-runtime/core/message.ml
diff --git a/riot/runtime/core/pid.ml → packages/riot-runtime/core/pid.ml b/riot/runtime/core/pid.ml → packages/riot-runtime/core/pid.ml
diff --git a/riot/runtime/core/pid.mli → packages/riot-runtime/core/pid.mli b/riot/runtime/core/pid.mli → packages/riot-runtime/core/pid.mli
diff --git a/riot/runtime/core/proc_effect.ml → packages/riot-runtime/core/proc_effect.ml b/riot/runtime/core/proc_effect.ml → packages/riot-runtime/core/proc_effect.ml
diff --git a/riot/runtime/core/proc_queue.ml → packages/riot-runtime/core/proc_queue.ml b/riot/runtime/core/proc_queue.ml → packages/riot-runtime/core/proc_queue.ml
diff --git a/riot/runtime/core/proc_queue.mli → packages/riot-runtime/core/proc_queue.mli b/riot/runtime/core/proc_queue.mli → packages/riot-runtime/core/proc_queue.mli
diff --git a/riot/runtime/core/proc_registry.ml → packages/riot-runtime/core/proc_registry.ml b/riot/runtime/core/proc_registry.ml → packages/riot-runtime/core/proc_registry.ml
diff --git a/riot/runtime/core/proc_registry.mli → packages/riot-runtime/core/proc_registry.mli b/riot/runtime/core/proc_registry.mli → packages/riot-runtime/core/proc_registry.mli
diff --git a/riot/runtime/core/proc_set.ml → packages/riot-runtime/core/proc_set.ml b/riot/runtime/core/proc_set.ml → packages/riot-runtime/core/proc_set.ml
diff --git a/riot/runtime/core/proc_set.mli → packages/riot-runtime/core/proc_set.mli b/riot/runtime/core/proc_set.mli → packages/riot-runtime/core/proc_set.mli
diff --git a/riot/runtime/core/proc_state.ml → packages/riot-runtime/core/proc_state.ml b/riot/runtime/core/proc_state.ml → packages/riot-runtime/core/proc_state.ml
diff --git a/riot/runtime/core/proc_state.mli → packages/riot-runtime/core/proc_state.mli b/riot/runtime/core/proc_state.mli → packages/riot-runtime/core/proc_state.mli
diff --git a/riot/runtime/core/proc_table.ml → packages/riot-runtime/core/proc_table.ml b/riot/runtime/core/proc_table.ml → packages/riot-runtime/core/proc_table.ml
diff --git a/riot/runtime/core/proc_table.mli → packages/riot-runtime/core/proc_table.mli b/riot/runtime/core/proc_table.mli → packages/riot-runtime/core/proc_table.mli
diff --git a/riot/runtime/core/process.ml → packages/riot-runtime/core/process.ml b/riot/runtime/core/process.ml → packages/riot-runtime/core/process.ml
diff --git a/riot/runtime/core/ref.ml → packages/riot-runtime/core/ref.ml b/riot/runtime/core/ref.ml → packages/riot-runtime/core/ref.ml
diff --git a/riot/runtime/core/ref.mli → packages/riot-runtime/core/ref.mli b/riot/runtime/core/ref.mli → packages/riot-runtime/core/ref.mli
diff --git a/riot/runtime/core/scheduler_uid.ml → packages/riot-runtime/core/scheduler_uid.ml b/riot/runtime/core/scheduler_uid.ml → packages/riot-runtime/core/scheduler_uid.ml
diff --git a/riot/runtime/core/scheduler_uid.mli → packages/riot-runtime/core/scheduler_uid.mli b/riot/runtime/core/scheduler_uid.mli → packages/riot-runtime/core/scheduler_uid.mli
diff --git a/riot/runtime/dune → packages/riot-runtime/dune b/riot/runtime/dune → packages/riot-runtime/dune
@@ -1,14 +1,20 @@
+(include_subdirs qualified)
+
 (library
  (package riot)
  (name riot_runtime)
  (libraries
+  bytestring
   gluon
+  mirage-crypto
+  mirage-crypto-rng
+  mirage-crypto-rng.unix
   mtime
   mtime.clock.os
   ptime
   ptime.clock.os
   rio
   runtime_events
+  telemetry
+  tls
   unix))
-
-(include_subdirs unqualified)
diff --git a/riot/runtime/import.ml → packages/riot-runtime/import.ml b/riot/runtime/import.ml → packages/riot-runtime/import.ml
diff --git a/riot/runtime/log/log.ml → packages/riot-runtime/log/log.ml b/riot/runtime/log/log.ml → packages/riot-runtime/log/log.ml
diff --git a/riot/runtime/log/log.mli → packages/riot-runtime/log/log.mli b/riot/runtime/log/log.mli → packages/riot-runtime/log/log.mli
diff --git a/riot/runtime/rc.ml → packages/riot-runtime/rc.ml b/riot/runtime/rc.ml → packages/riot-runtime/rc.ml
diff --git a/riot/runtime/rc.mli → packages/riot-runtime/rc.mli b/riot/runtime/rc.mli → packages/riot-runtime/rc.mli
diff --git a/riot/runtime/riot_runtime.ml → packages/riot-runtime/riot_runtime.ml b/riot/runtime/riot_runtime.ml → packages/riot-runtime/riot_runtime.ml
diff --git a/riot/runtime/scheduler/scheduler.ml → packages/riot-runtime/scheduler/scheduler.ml b/riot/runtime/scheduler/scheduler.ml → packages/riot-runtime/scheduler/scheduler.ml
diff --git a/riot/runtime/scheduler/tracer.ml → packages/riot-runtime/scheduler/tracer.ml b/riot/runtime/scheduler/tracer.ml → packages/riot-runtime/scheduler/tracer.ml
diff --git a/riot/runtime/scheduler/tracer.mli → packages/riot-runtime/scheduler/tracer.mli b/riot/runtime/scheduler/tracer.mli → packages/riot-runtime/scheduler/tracer.mli
diff --git a/riot/runtime/time/time.ml → packages/riot-runtime/time/time.ml b/riot/runtime/time/time.ml → packages/riot-runtime/time/time.ml
diff --git a/riot/runtime/time/timer_wheel.ml → packages/riot-runtime/time/timer_wheel.ml b/riot/runtime/time/timer_wheel.ml → packages/riot-runtime/time/timer_wheel.ml
diff --git a/riot/runtime/time/timer_wheel.mli → packages/riot-runtime/time/timer_wheel.mli b/riot/runtime/time/timer_wheel.mli → packages/riot-runtime/time/timer_wheel.mli
diff --git a/riot/runtime/util/dashmap.ml → packages/riot-runtime/util/dashmap.ml b/riot/runtime/util/dashmap.ml → packages/riot-runtime/util/dashmap.ml
diff --git a/riot/runtime/util/lf_queue.ml → packages/riot-runtime/util/lf_queue.ml b/riot/runtime/util/lf_queue.ml → packages/riot-runtime/util/lf_queue.ml
diff --git a/riot/runtime/util/lf_queue.mli → packages/riot-runtime/util/lf_queue.mli b/riot/runtime/util/lf_queue.mli → packages/riot-runtime/util/lf_queue.mli
diff --git a/riot/runtime/util/min_heap.ml → packages/riot-runtime/util/min_heap.ml b/riot/runtime/util/min_heap.ml → packages/riot-runtime/util/min_heap.ml
diff --git a/riot/runtime/util/thread_local.ml → packages/riot-runtime/util/thread_local.ml b/riot/runtime/util/thread_local.ml → packages/riot-runtime/util/thread_local.ml
diff --git a/riot/runtime/util/thread_local.mli → packages/riot-runtime/util/thread_local.mli b/riot/runtime/util/thread_local.mli → packages/riot-runtime/util/thread_local.mli
diff --git a/riot/lib/timeout.ml → packages/riot-runtime/util/timeout.ml b/riot/lib/timeout.ml → packages/riot-runtime/util/timeout.ml
diff --git a/riot/runtime/util/trace.ml → packages/riot-runtime/util/trace.ml b/riot/runtime/util/trace.ml → packages/riot-runtime/util/trace.ml
diff --git a/riot/runtime/util/uid.ml → packages/riot-runtime/util/uid.ml b/riot/runtime/util/uid.ml → packages/riot-runtime/util/uid.ml
diff --git a/riot/runtime/util/uid.mli → packages/riot-runtime/util/uid.mli b/riot/runtime/util/uid.mli → packages/riot-runtime/util/uid.mli
diff --git a/riot/runtime/util/util.ml → packages/riot-runtime/util/util.ml b/riot/runtime/util/util.ml → packages/riot-runtime/util/util.ml
diff --git a/riot/runtime/util/weak_ref.ml → packages/riot-runtime/util/weak_ref.ml b/riot/runtime/util/weak_ref.ml → packages/riot-runtime/util/weak_ref.ml
diff --git a/riot/runtime/util/weak_ref.mli → packages/riot-runtime/util/weak_ref.mli b/riot/runtime/util/weak_ref.mli → packages/riot-runtime/util/weak_ref.mli
diff --git a/riot/lib/SSL.ml → packages/riot-stdlib/SSL.ml b/riot/lib/SSL.ml → packages/riot-stdlib/SSL.ml
diff --git a/riot/lib/application.ml → packages/riot-stdlib/application.ml b/riot/lib/application.ml → packages/riot-stdlib/application.ml
diff --git a/riot/lib/crypto.ml → packages/riot-stdlib/crypto.ml b/riot/lib/crypto.ml → packages/riot-stdlib/crypto.ml
diff --git a/riot/lib/global/dune → packages/riot-stdlib/dune b/riot/lib/global/dune → packages/riot-stdlib/dune
@@ -1,4 +1,6 @@
+(include_subdirs qualified)
+
 (library
  (package riot)
- (name global)
+ (name riot_stdlib)
  (libraries riot_runtime))
diff --git a/riot/lib/dynamic_supervisor.ml → packages/riot-stdlib/dynamic_supervisor.ml b/riot/lib/dynamic_supervisor.ml → packages/riot-stdlib/dynamic_supervisor.ml
diff --git a/riot/lib/fd.ml → packages/riot-stdlib/fd.ml b/riot/lib/fd.ml → packages/riot-stdlib/fd.ml
diff --git a/riot/lib/file.ml → packages/riot-stdlib/file.ml b/riot/lib/file.ml → packages/riot-stdlib/file.ml
diff --git a/riot/lib/gen_server.ml → packages/riot-stdlib/gen_server.ml b/riot/lib/gen_server.ml → packages/riot-stdlib/gen_server.ml
diff --git a/riot/lib/global/global.ml → packages/riot-stdlib/global/global.ml b/riot/lib/global/global.ml → packages/riot-stdlib/global/global.ml
diff --git a/riot/lib/hashmap.ml → packages/riot-stdlib/hashmap.ml b/riot/lib/hashmap.ml → packages/riot-stdlib/hashmap.ml
diff --git a/riot/lib/key_value_store.ml → packages/riot-stdlib/key_value_store.ml b/riot/lib/key_value_store.ml → packages/riot-stdlib/key_value_store.ml
diff --git a/riot/lib/lib_io.ml → packages/riot-stdlib/lib_io.ml b/riot/lib/lib_io.ml → packages/riot-stdlib/lib_io.ml
diff --git a/riot/lib/logger/logger.ml → packages/riot-stdlib/logger/logger.ml b/riot/lib/logger/logger.ml → packages/riot-stdlib/logger/logger.ml
diff --git a/riot/lib/logger_app.ml → packages/riot-stdlib/logger_app.ml b/riot/lib/logger_app.ml → packages/riot-stdlib/logger_app.ml
diff --git a/riot/lib/message.ml → packages/riot-stdlib/message.ml b/riot/lib/message.ml → packages/riot-stdlib/message.ml
diff --git a/riot/lib/net.ml → packages/riot-stdlib/net.ml b/riot/lib/net.ml → packages/riot-stdlib/net.ml
diff --git a/riot/lib/pid.ml → packages/riot-stdlib/pid.ml b/riot/lib/pid.ml → packages/riot-stdlib/pid.ml
diff --git a/riot/lib/process.ml → packages/riot-stdlib/process.ml b/riot/lib/process.ml → packages/riot-stdlib/process.ml
diff --git a/riot/lib/queue.ml → packages/riot-stdlib/queue.ml b/riot/lib/queue.ml → packages/riot-stdlib/queue.ml
diff --git a/riot/lib/ref.ml → packages/riot-stdlib/ref.ml b/riot/lib/ref.ml → packages/riot-stdlib/ref.ml
diff --git a/riot/lib/lib.ml → packages/riot-stdlib/riot_stdlib.ml b/riot/lib/lib.ml → packages/riot-stdlib/riot_stdlib.ml
diff --git a/riot/lib/runtime_lib.ml → packages/riot-stdlib/runtime_lib.ml b/riot/lib/runtime_lib.ml → packages/riot-stdlib/runtime_lib.ml
diff --git a/riot/lib/stream.ml → packages/riot-stdlib/stream.ml b/riot/lib/stream.ml → packages/riot-stdlib/stream.ml
diff --git a/riot/lib/supervisor.ml → packages/riot-stdlib/supervisor.ml b/riot/lib/supervisor.ml → packages/riot-stdlib/supervisor.ml
diff --git a/riot/lib/task.ml → packages/riot-stdlib/task.ml b/riot/lib/task.ml → packages/riot-stdlib/task.ml
diff --git a/riot/lib/telemetry_app.ml → packages/riot-stdlib/telemetry_app.ml b/riot/lib/telemetry_app.ml → packages/riot-stdlib/telemetry_app.ml
diff --git a/riot/runtime/util/timeout.ml → packages/riot-stdlib/timeout.ml b/riot/runtime/util/timeout.ml → packages/riot-stdlib/timeout.ml
diff --git a/packages/riot/dune b/packages/riot/dune
@@ -0,0 +1,6 @@
+(include_subdirs qualified)
+
+(library
+ (name riot)
+ (public_name riot)
+ (libraries riot_runtime riot_stdlib))
diff --git a/riot/riot.ml → packages/riot/riot.ml b/riot/riot.ml → packages/riot/riot.ml
@@ -1,4 +1,4 @@
-include Lib
+include Riot_stdlib
 
 open struct
   open Riot_runtime

diff --git a/riot/riot.mli → packages/riot/riot.mli b/riot/riot.mli → packages/riot/riot.mli
diff --git a/riot/dune b/riot/dune
diff --git a/riot/lib/dune b/riot/lib/dune
diff --git a/riot/lib/logger/dune b/riot/lib/logger/dune
diff --git a/test/dune b/test/dune
@@ -109,11 +109,12 @@
  (modules application_test)
  (libraries riot))
 
-(test
- (package riot)
- (name link_processes_test)
- (modules link_processes_test)
- (libraries riot))
+; TODO(@leostera): fix this flakey test
+; (test
+;  (package riot)
+;  (name link_processes_test)
+;  (modules link_processes_test)
+;  (libraries riot))
 
 (test
  (package riot)