From 2701f740a19903b2b2ce98851a92c2fd20b01f1d Mon Sep 17 00:00:00 2001 From: Nick Spinale Date: Wed, 11 Oct 2023 07:08:37 +0000 Subject: [PATCH] crates/sel4-async/time: Rename Signed-off-by: Nick Spinale --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- .../examples/microkit/http-server/pds/server/Cargo.toml | 2 +- .../microkit/http-server/pds/server/core/Cargo.toml | 2 +- .../microkit/http-server/pds/server/core/src/lib.rs | 2 +- .../microkit/http-server/pds/server/src/handler.rs | 2 +- crates/private/meta/Cargo.toml | 2 +- crates/private/meta/src/lib.rs | 2 +- crates/sel4-async/{timer-manager => time}/Cargo.toml | 2 +- crates/sel4-async/{timer-manager => time}/src/instant.rs | 0 crates/sel4-async/{timer-manager => time}/src/lib.rs | 0 crates/sel4-async/{timer-manager => time}/src/sub_key.rs | 0 .../sel4-async/{timer-manager => time}/src/timer_queue.rs | 0 .../microkit/http-server/pds/server/core/crate.nix | 2 +- .../examples/microkit/http-server/pds/server/crate.nix | 2 +- .../cargo-manifest-sources/crates/private/meta/crate.nix | 2 +- .../crates/sel4-async/{timer-manager => time}/crate.nix | 2 +- 17 files changed, 16 insertions(+), 16 deletions(-) rename crates/sel4-async/{timer-manager => time}/Cargo.toml (84%) rename crates/sel4-async/{timer-manager => time}/src/instant.rs (100%) rename crates/sel4-async/{timer-manager => time}/src/lib.rs (100%) rename crates/sel4-async/{timer-manager => time}/src/sub_key.rs (100%) rename crates/sel4-async/{timer-manager => time}/src/timer_queue.rs (100%) rename hacking/cargo-manifest-sources/crates/sel4-async/{timer-manager => time}/crate.nix (84%) diff --git a/Cargo.lock b/Cargo.lock index ddf4bd811..2c4312960 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2446,7 +2446,7 @@ dependencies = [ "sel4-async-network", "sel4-async-request-statuses", "sel4-async-single-threaded-executor", - "sel4-async-timer-manager", + "sel4-async-time", "sel4-async-unsync", "sel4-bounce-buffer-allocator", "sel4-config", @@ -2493,7 +2493,7 @@ dependencies = [ "sel4-async-network", "sel4-async-request-statuses", "sel4-async-single-threaded-executor", - "sel4-async-timer-manager", + "sel4-async-time", "sel4-bounce-buffer-allocator", "sel4-externally-shared", "sel4-immediate-sync-once-cell", @@ -2522,7 +2522,7 @@ dependencies = [ "sel4-async-network", "sel4-async-network-mbedtls", "sel4-async-single-threaded-executor", - "sel4-async-timer-manager", + "sel4-async-time", "sel4-async-unsync", "sel4-panicking-env", ] @@ -3548,7 +3548,7 @@ dependencies = [ ] [[package]] -name = "sel4-async-timer-manager" +name = "sel4-async-time" version = "0.1.0" dependencies = [ "log", diff --git a/Cargo.toml b/Cargo.toml index 6a3159218..c78750ca0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,7 @@ members = [ "crates/sel4-async/network/mbedtls/mozilla-ca-list", "crates/sel4-async/request-statuses", "crates/sel4-async/single-threaded-executor", - "crates/sel4-async/timer-manager", + "crates/sel4-async/time", "crates/sel4-async/unsync", "crates/sel4-backtrace", "crates/sel4-backtrace/addr2line-context-helper", diff --git a/crates/examples/microkit/http-server/pds/server/Cargo.toml b/crates/examples/microkit/http-server/pds/server/Cargo.toml index 2b38afce5..30af0d520 100644 --- a/crates/examples/microkit/http-server/pds/server/Cargo.toml +++ b/crates/examples/microkit/http-server/pds/server/Cargo.toml @@ -15,7 +15,7 @@ sel4-async-block-io = { path = "../../../../../sel4-async/block-io" } sel4-async-block-io-fat = { path = "../../../../../sel4-async/block-io/fat" } sel4-async-network = { path = "../../../../../sel4-async/network" } sel4-async-request-statuses = { path = "../../../../../sel4-async/request-statuses" } -sel4-async-timer-manager = { path = "../../../../../sel4-async/timer-manager" } +sel4-async-time = { path = "../../../../../sel4-async/time" } sel4-bounce-buffer-allocator = { path = "../../../../../sel4-bounce-buffer-allocator" } sel4-immediate-sync-once-cell = { path = "../../../../../sel4-immediate-sync-once-cell" } sel4-logging = { path = "../../../../../sel4-logging" } diff --git a/crates/examples/microkit/http-server/pds/server/core/Cargo.toml b/crates/examples/microkit/http-server/pds/server/core/Cargo.toml index dc61c829b..caad4916e 100644 --- a/crates/examples/microkit/http-server/pds/server/core/Cargo.toml +++ b/crates/examples/microkit/http-server/pds/server/core/Cargo.toml @@ -16,7 +16,7 @@ sel4-async-block-io = { path = "../../../../../../sel4-async/block-io" } sel4-async-block-io-fat = { path = "../../../../../../sel4-async/block-io/fat" } sel4-async-network = { path = "../../../../../../sel4-async/network" } sel4-async-network-mbedtls = { path = "../../../../../../sel4-async/network/mbedtls" } -sel4-async-timer-manager = { path = "../../../../../../sel4-async/timer-manager" } +sel4-async-time = { path = "../../../../../../sel4-async/time" } sel4-async-unsync = { path = "../../../../../../sel4-async/unsync" } sel4-panicking-env = { path = "../../../../../../sel4-panicking/env" } diff --git a/crates/examples/microkit/http-server/pds/server/core/src/lib.rs b/crates/examples/microkit/http-server/pds/server/core/src/lib.rs index fa165df66..927a1d4fc 100644 --- a/crates/examples/microkit/http-server/pds/server/core/src/lib.rs +++ b/crates/examples/microkit/http-server/pds/server/core/src/lib.rs @@ -19,7 +19,7 @@ use sel4_async_network_mbedtls::{ insecure_dummy_rng, mbedtls, seed_insecure_dummy_rng, DbgCallbackBuilder, TcpSocketWrapper, }; use sel4_async_single_threaded_executor::LocalSpawner; -use sel4_async_timer_manager::TimerManager; +use sel4_async_time::TimerManager; mod mime; mod server; diff --git a/crates/examples/microkit/http-server/pds/server/src/handler.rs b/crates/examples/microkit/http-server/pds/server/src/handler.rs index e7f3264fd..79adf3ab5 100644 --- a/crates/examples/microkit/http-server/pds/server/src/handler.rs +++ b/crates/examples/microkit/http-server/pds/server/src/handler.rs @@ -11,7 +11,7 @@ use smoltcp::time::Instant as SmoltcpInstant; use sel4_async_block_io::constant_block_sizes::BlockSize512; use sel4_async_network::{DhcpOverrides, ManagedInterface}; use sel4_async_single_threaded_executor::{LocalPool, LocalSpawner}; -use sel4_async_timer_manager::{Instant, TimerManager}; +use sel4_async_time::{Instant, TimerManager}; use sel4_shared_ring_buffer_block_io::SharedRingBufferBlockIO; use crate::{DeviceImpl, TimerClient}; diff --git a/crates/private/meta/Cargo.toml b/crates/private/meta/Cargo.toml index a955022bd..10b8cf81a 100644 --- a/crates/private/meta/Cargo.toml +++ b/crates/private/meta/Cargo.toml @@ -19,7 +19,7 @@ sel4-async-block-io-fat = { path = "../../sel4-async/block-io/fat" } sel4-async-network = { path = "../../sel4-async/network" } sel4-async-request-statuses = { path = "../../sel4-async/request-statuses" } sel4-async-single-threaded-executor = { path = "../../sel4-async/single-threaded-executor" } -sel4-async-timer-manager = { path = "../../sel4-async/timer-manager" } +sel4-async-time = { path = "../../sel4-async/time" } sel4-async-unsync = { path = "../../sel4-async/unsync" } sel4-bounce-buffer-allocator = { path = "../../sel4-bounce-buffer-allocator" } sel4-config = { path = "../../sel4/config" } diff --git a/crates/private/meta/src/lib.rs b/crates/private/meta/src/lib.rs index d5e037f4d..9244850b0 100644 --- a/crates/private/meta/src/lib.rs +++ b/crates/private/meta/src/lib.rs @@ -80,7 +80,7 @@ definitely! { sel4_async_network sel4_async_request_statuses sel4_async_single_threaded_executor - sel4_async_timer_manager + sel4_async_time sel4_async_unsync sel4_bounce_buffer_allocator sel4_config diff --git a/crates/sel4-async/timer-manager/Cargo.toml b/crates/sel4-async/time/Cargo.toml similarity index 84% rename from crates/sel4-async/timer-manager/Cargo.toml rename to crates/sel4-async/time/Cargo.toml index af861dd9a..f26702dc8 100644 --- a/crates/sel4-async/timer-manager/Cargo.toml +++ b/crates/sel4-async/time/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "sel4-async-timer-manager" +name = "sel4-async-time" version = "0.1.0" authors = ["Nick Spinale "] edition = "2021" diff --git a/crates/sel4-async/timer-manager/src/instant.rs b/crates/sel4-async/time/src/instant.rs similarity index 100% rename from crates/sel4-async/timer-manager/src/instant.rs rename to crates/sel4-async/time/src/instant.rs diff --git a/crates/sel4-async/timer-manager/src/lib.rs b/crates/sel4-async/time/src/lib.rs similarity index 100% rename from crates/sel4-async/timer-manager/src/lib.rs rename to crates/sel4-async/time/src/lib.rs diff --git a/crates/sel4-async/timer-manager/src/sub_key.rs b/crates/sel4-async/time/src/sub_key.rs similarity index 100% rename from crates/sel4-async/timer-manager/src/sub_key.rs rename to crates/sel4-async/time/src/sub_key.rs diff --git a/crates/sel4-async/timer-manager/src/timer_queue.rs b/crates/sel4-async/time/src/timer_queue.rs similarity index 100% rename from crates/sel4-async/timer-manager/src/timer_queue.rs rename to crates/sel4-async/time/src/timer_queue.rs diff --git a/hacking/cargo-manifest-sources/crates/examples/microkit/http-server/pds/server/core/crate.nix b/hacking/cargo-manifest-sources/crates/examples/microkit/http-server/pds/server/core/crate.nix index 1ec425b2c..3e3b827c2 100644 --- a/hacking/cargo-manifest-sources/crates/examples/microkit/http-server/pds/server/core/crate.nix +++ b/hacking/cargo-manifest-sources/crates/examples/microkit/http-server/pds/server/core/crate.nix @@ -23,7 +23,7 @@ mk { sel4-async-unsync sel4-async-network sel4-async-network-mbedtls - sel4-async-timer-manager + sel4-async-time sel4-panicking-env sel4-async-block-io sel4-async-block-io-fat diff --git a/hacking/cargo-manifest-sources/crates/examples/microkit/http-server/pds/server/crate.nix b/hacking/cargo-manifest-sources/crates/examples/microkit/http-server/pds/server/crate.nix index 335d769d7..a01fb148e 100644 --- a/hacking/cargo-manifest-sources/crates/examples/microkit/http-server/pds/server/crate.nix +++ b/hacking/cargo-manifest-sources/crates/examples/microkit/http-server/pds/server/crate.nix @@ -46,7 +46,7 @@ mk { sel4-externally-shared sel4-async-single-threaded-executor sel4-async-network - sel4-async-timer-manager + sel4-async-time sel4-async-request-statuses sel4-async-block-io-fat sel4-newlib diff --git a/hacking/cargo-manifest-sources/crates/private/meta/crate.nix b/hacking/cargo-manifest-sources/crates/private/meta/crate.nix index 1420f59da..ac26536cd 100644 --- a/hacking/cargo-manifest-sources/crates/private/meta/crate.nix +++ b/hacking/cargo-manifest-sources/crates/private/meta/crate.nix @@ -19,7 +19,7 @@ mk { sel4-async-network sel4-async-request-statuses sel4-async-single-threaded-executor - sel4-async-timer-manager + sel4-async-time sel4-async-unsync sel4-bounce-buffer-allocator sel4-externally-shared diff --git a/hacking/cargo-manifest-sources/crates/sel4-async/timer-manager/crate.nix b/hacking/cargo-manifest-sources/crates/sel4-async/time/crate.nix similarity index 84% rename from hacking/cargo-manifest-sources/crates/sel4-async/timer-manager/crate.nix rename to hacking/cargo-manifest-sources/crates/sel4-async/time/crate.nix index a71db7efb..45811a153 100644 --- a/hacking/cargo-manifest-sources/crates/sel4-async/timer-manager/crate.nix +++ b/hacking/cargo-manifest-sources/crates/sel4-async/time/crate.nix @@ -1,7 +1,7 @@ { mk, versions, smoltcpWith }: mk { - package.name = "sel4-async-timer-manager"; + package.name = "sel4-async-time"; dependencies = { inherit (versions) log pin-project; # futures = {