From 9bda9d44013e419c183bbc8950f296f6a22b19e4 Mon Sep 17 00:00:00 2001 From: Prabakaran Chinnasamy Date: Wed, 18 Mar 2026 13:14:33 +0530 Subject: [PATCH] mod: Rename `core` module to `common` Renamed `core` module as `common` in Kyron to avoid issues when imported crates use standard `core` items which are not available in Kyron's `core`. --- src/kyron/src/{core => common}/mod.rs | 0 src/kyron/src/{core => common}/types.rs | 0 src/kyron/src/lib.rs | 6 +++--- src/kyron/src/prelude.rs | 2 +- src/kyron/src/safety.rs | 2 +- src/kyron/src/scheduler/context.rs | 8 ++++---- src/kyron/src/scheduler/execution_engine.rs | 2 +- src/kyron/src/scheduler/join_handle.rs | 4 ++-- src/kyron/src/scheduler/scheduler_mt.rs | 4 ++-- src/kyron/src/scheduler/task/async_task.rs | 6 +++--- src/kyron/src/scheduler/task/task_context.rs | 2 +- src/kyron/src/scheduler/workers/worker_types.rs | 2 +- src/kyron/src/testing/mock.rs | 4 ++-- src/kyron/src/testing/mod.rs | 2 +- tests/test_scenarios/rust/src/internals/runtime_helper.rs | 2 +- .../rust/src/scenarios/runtime/worker/safety_worker.rs | 2 +- .../rust/src/scenarios/runtime/worker/spawn_methods.rs | 4 ++-- 17 files changed, 26 insertions(+), 26 deletions(-) rename src/kyron/src/{core => common}/mod.rs (100%) rename src/kyron/src/{core => common}/types.rs (100%) diff --git a/src/kyron/src/core/mod.rs b/src/kyron/src/common/mod.rs similarity index 100% rename from src/kyron/src/core/mod.rs rename to src/kyron/src/common/mod.rs diff --git a/src/kyron/src/core/types.rs b/src/kyron/src/common/types.rs similarity index 100% rename from src/kyron/src/core/types.rs rename to src/kyron/src/common/types.rs diff --git a/src/kyron/src/lib.rs b/src/kyron/src/lib.rs index 2561c05..b80100b 100644 --- a/src/kyron/src/lib.rs +++ b/src/kyron/src/lib.rs @@ -42,9 +42,9 @@ //! where it was originally spawned, providing strong execution locality guarantees when needed. use ::core::future::Future; -use core::types::{box_future, FutureBox}; +use common::types::{box_future, FutureBox}; -use crate::core::types::UniqueWorkerId; +use crate::common::types::UniqueWorkerId; use futures::reusable_box_future::ReusableBoxFuture; use kyron_foundation::{not_recoverable_error, prelude::*}; use scheduler::{ @@ -53,7 +53,7 @@ use scheduler::{ }; pub mod channels; -pub mod core; +pub mod common; pub mod futures; pub mod io; pub mod ipc; diff --git a/src/kyron/src/prelude.rs b/src/kyron/src/prelude.rs index 1ebc77a..277766e 100644 --- a/src/kyron/src/prelude.rs +++ b/src/kyron/src/prelude.rs @@ -11,6 +11,6 @@ // SPDX-License-Identifier: Apache-2.0 // ******************************************************************************* -pub use crate::core::types::UniqueWorkerId; +pub use crate::common::types::UniqueWorkerId; pub use crate::runtime::*; pub use crate::scheduler::workers::ThreadParameters; diff --git a/src/kyron/src/safety.rs b/src/kyron/src/safety.rs index 0e5ae37..45a5c33 100644 --- a/src/kyron/src/safety.rs +++ b/src/kyron/src/safety.rs @@ -12,7 +12,7 @@ // ******************************************************************************* use crate::{ - core::types::{box_future, FutureBox, UniqueWorkerId}, + common::types::{box_future, FutureBox, UniqueWorkerId}, ctx_get_handler, futures::reusable_box_future::ReusableBoxFuture, scheduler::{context::ctx_get_worker_id, join_handle::JoinHandle}, diff --git a/src/kyron/src/scheduler/context.rs b/src/kyron/src/scheduler/context.rs index 123ddcf..e0d1813 100644 --- a/src/kyron/src/scheduler/context.rs +++ b/src/kyron/src/scheduler/context.rs @@ -11,8 +11,8 @@ // SPDX-License-Identifier: Apache-2.0 // ******************************************************************************* -use crate::core::types::BoxCustom; -use crate::core::types::FutureBox; +use crate::common::types::BoxCustom; +use crate::common::types::FutureBox; use crate::futures::reusable_box_future::ReusableBoxFuture; use crate::safety::SafetyResult; use crate::scheduler::driver::Drivers; @@ -26,7 +26,7 @@ use kyron_foundation::prelude::error; use ::core::pin::Pin; use std::{rc::Rc, sync::Arc}; -use crate::core::types::TaskId; +use crate::common::types::TaskId; use crate::AsyncTask; use crate::JoinHandle; @@ -35,7 +35,7 @@ use super::scheduler_mt::DedicatedSchedulerLocal; use super::workers::worker_types::WorkerId; use super::{scheduler_mt::AsyncScheduler, task::async_task::TaskRef}; -use crate::core::types::UniqueWorkerId; +use crate::common::types::UniqueWorkerId; enum HandlerImpl { Async(AsyncInnerHandler), diff --git a/src/kyron/src/scheduler/execution_engine.rs b/src/kyron/src/scheduler/execution_engine.rs index c55275d..35c6bb3 100644 --- a/src/kyron/src/scheduler/execution_engine.rs +++ b/src/kyron/src/scheduler/execution_engine.rs @@ -22,7 +22,7 @@ use super::workers::worker_types::*; use crate::scheduler::driver::Drivers; use crate::{ box_future, - core::types::UniqueWorkerId, + common::types::UniqueWorkerId, scheduler::{workers::ThreadParameters, SchedulerType}, AsyncTask, Future, }; diff --git a/src/kyron/src/scheduler/join_handle.rs b/src/kyron/src/scheduler/join_handle.rs index 889f489..dc81f91 100644 --- a/src/kyron/src/scheduler/join_handle.rs +++ b/src/kyron/src/scheduler/join_handle.rs @@ -124,7 +124,7 @@ mod tests { use ::core::task::Context; use crate::{ - core::types::{box_future, ArcInternal}, + common::types::{box_future, ArcInternal}, AsyncTask, }; @@ -301,7 +301,7 @@ mod tests { use ::core::task::Context; use crate::{ - core::types::{box_future, ArcInternal}, + common::types::{box_future, ArcInternal}, scheduler::workers::worker_types::{WorkerId, WorkerType}, AsyncTask, }; diff --git a/src/kyron/src/scheduler/scheduler_mt.rs b/src/kyron/src/scheduler/scheduler_mt.rs index eaf50ea..c9d243c 100644 --- a/src/kyron/src/scheduler/scheduler_mt.rs +++ b/src/kyron/src/scheduler/scheduler_mt.rs @@ -12,8 +12,8 @@ // ******************************************************************************* use super::workers::worker_types::*; -use crate::core::types::BoxInternal; -use crate::core::types::UniqueWorkerId; +use crate::common::types::BoxInternal; +use crate::common::types::UniqueWorkerId; use crate::ctx_get_handler; use crate::io::driver::IoDriverUnparker; use crate::{scheduler::context::ctx_get_worker_id, TaskRef}; diff --git a/src/kyron/src/scheduler/task/async_task.rs b/src/kyron/src/scheduler/task/async_task.rs index 83863a9..241ea68 100644 --- a/src/kyron/src/scheduler/task/async_task.rs +++ b/src/kyron/src/scheduler/task/async_task.rs @@ -12,7 +12,7 @@ // ******************************************************************************* use super::task_state::*; -use crate::core::types::*; +use crate::common::types::*; use crate::scheduler::safety_waker::create_safety_waker; use crate::scheduler::scheduler_mt::SchedulerTrait; use crate::scheduler::workers::worker_types::WorkerId; @@ -647,7 +647,7 @@ mod tests { }; use crate::{ - core::types::{box_future, ArcInternal}, + common::types::{box_future, ArcInternal}, safety::SafetyResult, scheduler::{ scheduler_mt::SchedulerTrait, @@ -918,7 +918,7 @@ mod tests { use kyron_testing::prelude::*; use loom::model::Builder; - use crate::core::types::{box_future, ArcInternal}; + use crate::common::types::{box_future, ArcInternal}; async fn dummy() -> u32 { 0 diff --git a/src/kyron/src/scheduler/task/task_context.rs b/src/kyron/src/scheduler/task/task_context.rs index 181ee5a..646be40 100644 --- a/src/kyron/src/scheduler/task/task_context.rs +++ b/src/kyron/src/scheduler/task/task_context.rs @@ -12,7 +12,7 @@ // ******************************************************************************* use crate::{ - core::types::TaskId, + common::types::TaskId, scheduler::{ context::{ctx_get_running_task_id, ctx_get_worker_id, ctx_set_running_task, ctx_unset_running_task}, workers::worker_types::WorkerId, diff --git a/src/kyron/src/scheduler/workers/worker_types.rs b/src/kyron/src/scheduler/workers/worker_types.rs index af3904c..fb353b2 100644 --- a/src/kyron/src/scheduler/workers/worker_types.rs +++ b/src/kyron/src/scheduler/workers/worker_types.rs @@ -11,7 +11,7 @@ // SPDX-License-Identifier: Apache-2.0 // ******************************************************************************* -use crate::core::types::UniqueWorkerId; +use crate::common::types::UniqueWorkerId; use crate::io::driver::{IoDriver, IoDriverUnparker}; use crate::scheduler::scheduler_mt::AsyncScheduler; use crate::scheduler::task::async_task::TaskRef; diff --git a/src/kyron/src/testing/mock.rs b/src/kyron/src/testing/mock.rs index bc1b49b..cc24725 100644 --- a/src/kyron/src/testing/mock.rs +++ b/src/kyron/src/testing/mock.rs @@ -14,7 +14,7 @@ #![allow(dead_code)] use crate::{ - core::types::{box_future, FutureBox, UniqueWorkerId}, + common::types::{box_future, FutureBox, UniqueWorkerId}, futures::reusable_box_future::ReusableBoxFuture, scheduler::{join_handle::JoinHandle, task::async_task::TaskRef, waker::create_waker}, testing::*, @@ -298,7 +298,7 @@ pub mod safety { use ::core::future::Future; use crate::{ - core::types::{box_future, FutureBox}, + common::types::{box_future, FutureBox}, futures::reusable_box_future::ReusableBoxFuture, scheduler::join_handle::JoinHandle, }; diff --git a/src/kyron/src/testing/mod.rs b/src/kyron/src/testing/mod.rs index 04c1ceb..30d1c34 100644 --- a/src/kyron/src/testing/mod.rs +++ b/src/kyron/src/testing/mod.rs @@ -22,7 +22,7 @@ use kyron_foundation::prelude::FoundationAtomicU16; use kyron_testing::prelude::MockFn; use crate::{ - core::types::{box_future, ArcInternal}, + common::types::{box_future, ArcInternal}, scheduler::{ scheduler_mt::SchedulerTrait, waker::create_waker, diff --git a/tests/test_scenarios/rust/src/internals/runtime_helper.rs b/tests/test_scenarios/rust/src/internals/runtime_helper.rs index fcd56b6..697c6e7 100644 --- a/tests/test_scenarios/rust/src/internals/runtime_helper.rs +++ b/tests/test_scenarios/rust/src/internals/runtime_helper.rs @@ -10,7 +10,7 @@ // // SPDX-License-Identifier: Apache-2.0 // ******************************************************************************* -use kyron::core::types::UniqueWorkerId; +use kyron::common::types::UniqueWorkerId; use kyron::prelude::ThreadParameters as AsyncRtThreadParameters; use kyron::runtime::*; use kyron::scheduler::SchedulerType; diff --git a/tests/test_scenarios/rust/src/scenarios/runtime/worker/safety_worker.rs b/tests/test_scenarios/rust/src/scenarios/runtime/worker/safety_worker.rs index e452459..58f0a81 100644 --- a/tests/test_scenarios/rust/src/scenarios/runtime/worker/safety_worker.rs +++ b/tests/test_scenarios/rust/src/scenarios/runtime/worker/safety_worker.rs @@ -13,7 +13,7 @@ use crate::internals::execution_barrier::RuntimeJoiner; use crate::internals::runtime_helper::Runtime; use crate::internals::thread_params::{current_thread_priority_params, ThreadPriorityParams}; -use kyron::core::types::UniqueWorkerId; +use kyron::common::types::UniqueWorkerId; use kyron::futures::reusable_box_future::ReusableBoxFuturePool; use kyron::{safety, spawn}; use serde::Deserialize; diff --git a/tests/test_scenarios/rust/src/scenarios/runtime/worker/spawn_methods.rs b/tests/test_scenarios/rust/src/scenarios/runtime/worker/spawn_methods.rs index 0e645c4..8681ef4 100644 --- a/tests/test_scenarios/rust/src/scenarios/runtime/worker/spawn_methods.rs +++ b/tests/test_scenarios/rust/src/scenarios/runtime/worker/spawn_methods.rs @@ -12,9 +12,9 @@ // ******************************************************************************* use crate::internals::execution_barrier::RuntimeJoiner; use crate::internals::runtime_helper::Runtime; -use kyron::core::types::UniqueWorkerId; +use kyron::common::types::UniqueWorkerId; use kyron::futures::reusable_box_future::ReusableBoxFuturePool; -use kyron::{core::types::box_future, *}; +use kyron::{common::types::box_future, *}; use kyron_foundation::prelude::CommonErrors; use test_scenarios_rust::scenario::{Scenario, ScenarioGroup, ScenarioGroupImpl};