From c8f84ec352aa23b6425b94ff9c99d1f12d2780e0 Mon Sep 17 00:00:00 2001 From: Drew Galbraith Date: Fri, 7 Feb 2025 18:05:38 -0800 Subject: [PATCH] Moved victoriafalls to sys dir in rust. --- rust/Cargo.toml | 12 ++++++++++-- rust/lib/victoriafalls/Cargo.toml | 14 -------------- rust/sys/teton/Cargo.toml | 2 +- rust/sys/victoriafalls/Cargo.toml | 15 +++++++++++++++ rust/{lib => sys}/victoriafalls/build.rs | 0 rust/sys/victoriafalls/src/bin/victoriafalls.rs | 11 +++++++++++ rust/{lib => sys}/victoriafalls/src/dir.rs | 0 rust/{lib => sys}/victoriafalls/src/file.rs | 0 rust/{lib => sys}/victoriafalls/src/lib.rs | 0 rust/sys/yellowstone/Cargo.toml | 4 ++-- 10 files changed, 39 insertions(+), 19 deletions(-) delete mode 100644 rust/lib/victoriafalls/Cargo.toml create mode 100644 rust/sys/victoriafalls/Cargo.toml rename rust/{lib => sys}/victoriafalls/build.rs (100%) create mode 100644 rust/sys/victoriafalls/src/bin/victoriafalls.rs rename rust/{lib => sys}/victoriafalls/src/dir.rs (100%) rename rust/{lib => sys}/victoriafalls/src/file.rs (100%) rename rust/{lib => sys}/victoriafalls/src/lib.rs (100%) diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 258b494..0b2a592 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -1,7 +1,15 @@ [workspace] members = [ - "lib/mammoth", "lib/victoriafalls", "lib/voyageurs", "lib/yellowstone", "lib/yunq", "lib/yunq-test", "sys/denali", "sys/teton", "sys/yellowstone", "usr/testbed", + "lib/mammoth", + "lib/voyageurs", + "lib/yellowstone", + "lib/yunq", + "lib/yunq-test", + "sys/denali", + "sys/teton", + "sys/victoriafalls", + "sys/yellowstone", + "usr/testbed", ] resolver = "2" - diff --git a/rust/lib/victoriafalls/Cargo.toml b/rust/lib/victoriafalls/Cargo.toml deleted file mode 100644 index 6aeae9e..0000000 --- a/rust/lib/victoriafalls/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "victoriafalls" -version = "0.1.0" -edition = "2021" - -[dependencies] -mammoth = { path = "../mammoth" } -yellowstone-yunq = { path = "../yellowstone" } -yunq = {path = "../yunq"} - -[build-dependencies] -yunqc = {path = "../../../yunq/rust"} - - diff --git a/rust/sys/teton/Cargo.toml b/rust/sys/teton/Cargo.toml index 1bcda15..baa787a 100644 --- a/rust/sys/teton/Cargo.toml +++ b/rust/sys/teton/Cargo.toml @@ -5,6 +5,6 @@ edition = "2021" [dependencies] mammoth = { path = "../../lib/mammoth" } -victoriafalls = { path = "../../lib/victoriafalls" } +victoriafalls = { path = "../victoriafalls" } voyageurs = { path = "../../lib/voyageurs" } yellowstone-yunq = { path = "../../lib/yellowstone" } diff --git a/rust/sys/victoriafalls/Cargo.toml b/rust/sys/victoriafalls/Cargo.toml new file mode 100644 index 0000000..3c2b75f --- /dev/null +++ b/rust/sys/victoriafalls/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "victoriafalls" +version = "0.1.0" +edition = "2021" + +[dependencies] +mammoth = { path = "../../lib/mammoth" } +yellowstone-yunq = { path = "../../lib/yellowstone" } +yunq = { path = "../../lib/yunq" } + +[build-dependencies] +yunqc = { path = "../../../yunq/rust" } + +[[bin]] +name = "victoriafalls" diff --git a/rust/lib/victoriafalls/build.rs b/rust/sys/victoriafalls/build.rs similarity index 100% rename from rust/lib/victoriafalls/build.rs rename to rust/sys/victoriafalls/build.rs diff --git a/rust/sys/victoriafalls/src/bin/victoriafalls.rs b/rust/sys/victoriafalls/src/bin/victoriafalls.rs new file mode 100644 index 0000000..7c9c8e8 --- /dev/null +++ b/rust/sys/victoriafalls/src/bin/victoriafalls.rs @@ -0,0 +1,11 @@ +#![no_std] +#![no_main] + +use mammoth::{define_entry, zion::z_err_t}; + +define_entry!(); + +#[no_mangle] +extern "C" fn main() -> z_err_t { + 0 +} diff --git a/rust/lib/victoriafalls/src/dir.rs b/rust/sys/victoriafalls/src/dir.rs similarity index 100% rename from rust/lib/victoriafalls/src/dir.rs rename to rust/sys/victoriafalls/src/dir.rs diff --git a/rust/lib/victoriafalls/src/file.rs b/rust/sys/victoriafalls/src/file.rs similarity index 100% rename from rust/lib/victoriafalls/src/file.rs rename to rust/sys/victoriafalls/src/file.rs diff --git a/rust/lib/victoriafalls/src/lib.rs b/rust/sys/victoriafalls/src/lib.rs similarity index 100% rename from rust/lib/victoriafalls/src/lib.rs rename to rust/sys/victoriafalls/src/lib.rs diff --git a/rust/sys/yellowstone/Cargo.toml b/rust/sys/yellowstone/Cargo.toml index 5e165e8..f321b62 100644 --- a/rust/sys/yellowstone/Cargo.toml +++ b/rust/sys/yellowstone/Cargo.toml @@ -5,8 +5,8 @@ edition = "2021" [dependencies] mammoth = { path = "../../lib/mammoth" } -denali = { path = "../../sys/denali", default-features = false} -victoriafalls = { path = "../../lib/victoriafalls" } +denali = { path = "../denali", default-features = false } +victoriafalls = { path = "../victoriafalls" } voyageurs = { path = "../../lib/voyageurs" } yellowstone-yunq = { path = "../../lib/yellowstone" } yunq = { path = "../../lib/yunq" }