From 34b29f3edd5c8a222584cbe78d92b494f12b84ef Mon Sep 17 00:00:00 2001 From: William Brown Date: Fri, 28 Dec 2018 15:24:12 +1000 Subject: [PATCH] Cleanup package and file names --- Cargo.toml | 11 +++++++++-- src/clients/whoami.rs | 8 ++++++++ src/{ => lib}/audit.rs | 0 src/{ => lib}/be/idl.rs | 0 src/{ => lib}/be/mem_be/mod.rs | 0 src/{ => lib}/be/mod.rs | 0 src/{ => lib}/be/sqlite_be/mod.rs | 0 src/{ => lib}/config.rs | 0 src/{ => lib}/core.rs | 0 src/{ => lib}/entry.rs | 0 src/{ => lib}/error.rs | 0 src/{ => lib}/event.rs | 0 src/{ => lib}/filter.rs | 0 src/{ => lib}/lib.rs | 0 src/{ => lib}/log.rs | 0 src/{ => lib}/proto_v1.rs | 0 src/{ => lib}/schema.rs | 0 src/{ => lib}/server.rs | 0 src/{ => server}/main.rs | 0 19 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 src/clients/whoami.rs rename src/{ => lib}/audit.rs (100%) rename src/{ => lib}/be/idl.rs (100%) rename src/{ => lib}/be/mem_be/mod.rs (100%) rename src/{ => lib}/be/mod.rs (100%) rename src/{ => lib}/be/sqlite_be/mod.rs (100%) rename src/{ => lib}/config.rs (100%) rename src/{ => lib}/core.rs (100%) rename src/{ => lib}/entry.rs (100%) rename src/{ => lib}/error.rs (100%) rename src/{ => lib}/event.rs (100%) rename src/{ => lib}/filter.rs (100%) rename src/{ => lib}/lib.rs (100%) rename src/{ => lib}/log.rs (100%) rename src/{ => lib}/proto_v1.rs (100%) rename src/{ => lib}/schema.rs (100%) rename src/{ => lib}/server.rs (100%) rename src/{ => server}/main.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 75b7725f4..067428b44 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,10 @@ +cargo-features = ["default-run"] + [package] name = "rsidm" version = "0.1.0" authors = ["William Brown "] +default-run = "rsidm_core" # We need three major binaries. The server itself, the unix client, and a cli @@ -9,11 +12,15 @@ authors = ["William Brown "] [lib] name = "rsidm" -path = "src/lib.rs" +path = "src/lib/lib.rs" [[bin]] name = "rsidm_core" -path = "src/main.rs" +path = "src/server/main.rs" + +[[bin]] +name = "rsidm_whoami" +path = "src/clients/whoami.rs" diff --git a/src/clients/whoami.rs b/src/clients/whoami.rs new file mode 100644 index 000000000..73446d043 --- /dev/null +++ b/src/clients/whoami.rs @@ -0,0 +1,8 @@ + +extern crate rsidm; + +use rsidm::proto_v1; + +fn main() { + println!("Hello whoami"); +} diff --git a/src/audit.rs b/src/lib/audit.rs similarity index 100% rename from src/audit.rs rename to src/lib/audit.rs diff --git a/src/be/idl.rs b/src/lib/be/idl.rs similarity index 100% rename from src/be/idl.rs rename to src/lib/be/idl.rs diff --git a/src/be/mem_be/mod.rs b/src/lib/be/mem_be/mod.rs similarity index 100% rename from src/be/mem_be/mod.rs rename to src/lib/be/mem_be/mod.rs diff --git a/src/be/mod.rs b/src/lib/be/mod.rs similarity index 100% rename from src/be/mod.rs rename to src/lib/be/mod.rs diff --git a/src/be/sqlite_be/mod.rs b/src/lib/be/sqlite_be/mod.rs similarity index 100% rename from src/be/sqlite_be/mod.rs rename to src/lib/be/sqlite_be/mod.rs diff --git a/src/config.rs b/src/lib/config.rs similarity index 100% rename from src/config.rs rename to src/lib/config.rs diff --git a/src/core.rs b/src/lib/core.rs similarity index 100% rename from src/core.rs rename to src/lib/core.rs diff --git a/src/entry.rs b/src/lib/entry.rs similarity index 100% rename from src/entry.rs rename to src/lib/entry.rs diff --git a/src/error.rs b/src/lib/error.rs similarity index 100% rename from src/error.rs rename to src/lib/error.rs diff --git a/src/event.rs b/src/lib/event.rs similarity index 100% rename from src/event.rs rename to src/lib/event.rs diff --git a/src/filter.rs b/src/lib/filter.rs similarity index 100% rename from src/filter.rs rename to src/lib/filter.rs diff --git a/src/lib.rs b/src/lib/lib.rs similarity index 100% rename from src/lib.rs rename to src/lib/lib.rs diff --git a/src/log.rs b/src/lib/log.rs similarity index 100% rename from src/log.rs rename to src/lib/log.rs diff --git a/src/proto_v1.rs b/src/lib/proto_v1.rs similarity index 100% rename from src/proto_v1.rs rename to src/lib/proto_v1.rs diff --git a/src/schema.rs b/src/lib/schema.rs similarity index 100% rename from src/schema.rs rename to src/lib/schema.rs diff --git a/src/server.rs b/src/lib/server.rs similarity index 100% rename from src/server.rs rename to src/lib/server.rs diff --git a/src/main.rs b/src/server/main.rs similarity index 100% rename from src/main.rs rename to src/server/main.rs