From e274fa887370be93af8926bf7c0af5e9af48ecec Mon Sep 17 00:00:00 2001 From: bunnie Date: Mon, 15 Jan 2024 00:52:43 +0800 Subject: [PATCH] relate perlib to the libs/ directory perflib was made before we had libs, so put it into its new, proper home. --- Cargo.toml | 2 +- apps/vault/Cargo.toml | 2 +- {tools => libs}/perflib/Cargo.toml | 0 {tools => libs}/perflib/src/lib.rs | 0 services/pddb/Cargo.toml | 2 +- services/shellchat/Cargo.toml | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename {tools => libs}/perflib/Cargo.toml (100%) rename {tools => libs}/perflib/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 353d4a96a..d23ed6fda 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -95,10 +95,10 @@ members = [ #"services/test-spawn/spawn", "services/usb-test", "services/usb-device-xous", - "tools/perflib", "kernel", "loader", "libs/chat", + "libs/perflib", "libs/userprefs", "libs/tls", "libs/xous-pio", diff --git a/apps/vault/Cargo.toml b/apps/vault/Cargo.toml index d39ddcc09..4e550c6f4 100644 --- a/apps/vault/Cargo.toml +++ b/apps/vault/Cargo.toml @@ -59,7 +59,7 @@ net = { path = "../../services/net" } com_rs = { git = "https://github.com/betrusted-io/com_rs", rev = "891bdd3ca8e41f81510d112483e178aea3e3a921" } # performance profiling -perflib = { path = "../../tools/perflib", optional = true } +perflib = { path = "../../libs/perflib", optional = true } utralib = { version = "0.1.24", optional = true, default-features = false } # testing diff --git a/tools/perflib/Cargo.toml b/libs/perflib/Cargo.toml similarity index 100% rename from tools/perflib/Cargo.toml rename to libs/perflib/Cargo.toml diff --git a/tools/perflib/src/lib.rs b/libs/perflib/src/lib.rs similarity index 100% rename from tools/perflib/src/lib.rs rename to libs/perflib/src/lib.rs diff --git a/services/pddb/Cargo.toml b/services/pddb/Cargo.toml index 2622a6cc0..4349e3a7e 100644 --- a/services/pddb/Cargo.toml +++ b/services/pddb/Cargo.toml @@ -52,7 +52,7 @@ modals = { path = "../modals" } utralib = { version = "0.1.24", optional = true, default-features = false } # performance profiling -perflib = { path = "../../tools/perflib", optional = true } +perflib = { path = "../../libs/perflib", optional = true } [target.'cfg(any(windows,unix))'.dependencies] rand = "0.8.5" diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml index 45baa4007..4be0b9ad5 100644 --- a/services/shellchat/Cargo.toml +++ b/services/shellchat/Cargo.toml @@ -90,7 +90,7 @@ ring = { version = "0.16.20", optional = true } tungstenite = { version = "0.20.0", optional = true } # for performance testing -perflib = { path = "../../tools/perflib", optional = true } +perflib = { path = "../../libs/perflib", optional = true } random-pick = { version = "1.2.15", optional = true } # for the curve25519 tests