From ccbaf7971f5c9ffe7a3d5256923c777c99e8917b Mon Sep 17 00:00:00 2001 From: Richard Pringle <richard.pringle@avalabs.org> Date: Thu, 9 May 2024 11:47:41 -0400 Subject: [PATCH] Make Rust crate naming conventions consistent --- Cargo.toml | 2 +- x/programs/rust/{sdk_macros => sdk-macros}/Cargo.toml | 2 +- x/programs/rust/{sdk_macros => sdk-macros}/src/lib.rs | 0 x/programs/rust/{sdk_macros => sdk-macros}/tests/compile.rs | 0 .../rust/{sdk_macros => sdk-macros}/tests/ui/first-param.rs | 0 .../rust/{sdk_macros => sdk-macros}/tests/ui/first-param.stderr | 0 .../{sdk_macros => sdk-macros}/tests/ui/ignore-second-param.rs | 0 .../tests/ui/ignore-second-param.stderr | 0 x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/not-pub.rs | 0 .../rust/{sdk_macros => sdk-macros}/tests/ui/not-pub.stderr | 0 x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/receiver.rs | 0 .../rust/{sdk_macros => sdk-macros}/tests/ui/receiver.stderr | 0 .../tests/ui/user-defined-context-type.rs | 0 .../tests/ui/user-defined-context-type.stderr | 0 x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/wild.rs | 0 x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/wild.stderr | 0 x/programs/rust/wasmlanche-sdk/Cargo.toml | 2 +- 17 files changed, 3 insertions(+), 3 deletions(-) rename x/programs/rust/{sdk_macros => sdk-macros}/Cargo.toml (93%) rename x/programs/rust/{sdk_macros => sdk-macros}/src/lib.rs (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/compile.rs (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/first-param.rs (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/first-param.stderr (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/ignore-second-param.rs (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/ignore-second-param.stderr (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/not-pub.rs (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/not-pub.stderr (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/receiver.rs (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/receiver.stderr (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/user-defined-context-type.rs (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/user-defined-context-type.stderr (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/wild.rs (100%) rename x/programs/rust/{sdk_macros => sdk-macros}/tests/ui/wild.stderr (100%) diff --git a/Cargo.toml b/Cargo.toml index 8e69f6022f..8ae31cd441 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ "x/programs/cmd/simulator", - "x/programs/rust/sdk_macros", + "x/programs/rust/sdk-macros", "x/programs/rust/wasmlanche-sdk", "x/programs/rust/examples/token", "x/programs/rust/examples/counter", diff --git a/x/programs/rust/sdk_macros/Cargo.toml b/x/programs/rust/sdk-macros/Cargo.toml similarity index 93% rename from x/programs/rust/sdk_macros/Cargo.toml rename to x/programs/rust/sdk-macros/Cargo.toml index 7a0a474f49..b570d880a8 100644 --- a/x/programs/rust/sdk_macros/Cargo.toml +++ b/x/programs/rust/sdk-macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "sdk_macros" +name = "sdk-macros" version = "0.1.0" edition = "2021" diff --git a/x/programs/rust/sdk_macros/src/lib.rs b/x/programs/rust/sdk-macros/src/lib.rs similarity index 100% rename from x/programs/rust/sdk_macros/src/lib.rs rename to x/programs/rust/sdk-macros/src/lib.rs diff --git a/x/programs/rust/sdk_macros/tests/compile.rs b/x/programs/rust/sdk-macros/tests/compile.rs similarity index 100% rename from x/programs/rust/sdk_macros/tests/compile.rs rename to x/programs/rust/sdk-macros/tests/compile.rs diff --git a/x/programs/rust/sdk_macros/tests/ui/first-param.rs b/x/programs/rust/sdk-macros/tests/ui/first-param.rs similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/first-param.rs rename to x/programs/rust/sdk-macros/tests/ui/first-param.rs diff --git a/x/programs/rust/sdk_macros/tests/ui/first-param.stderr b/x/programs/rust/sdk-macros/tests/ui/first-param.stderr similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/first-param.stderr rename to x/programs/rust/sdk-macros/tests/ui/first-param.stderr diff --git a/x/programs/rust/sdk_macros/tests/ui/ignore-second-param.rs b/x/programs/rust/sdk-macros/tests/ui/ignore-second-param.rs similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/ignore-second-param.rs rename to x/programs/rust/sdk-macros/tests/ui/ignore-second-param.rs diff --git a/x/programs/rust/sdk_macros/tests/ui/ignore-second-param.stderr b/x/programs/rust/sdk-macros/tests/ui/ignore-second-param.stderr similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/ignore-second-param.stderr rename to x/programs/rust/sdk-macros/tests/ui/ignore-second-param.stderr diff --git a/x/programs/rust/sdk_macros/tests/ui/not-pub.rs b/x/programs/rust/sdk-macros/tests/ui/not-pub.rs similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/not-pub.rs rename to x/programs/rust/sdk-macros/tests/ui/not-pub.rs diff --git a/x/programs/rust/sdk_macros/tests/ui/not-pub.stderr b/x/programs/rust/sdk-macros/tests/ui/not-pub.stderr similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/not-pub.stderr rename to x/programs/rust/sdk-macros/tests/ui/not-pub.stderr diff --git a/x/programs/rust/sdk_macros/tests/ui/receiver.rs b/x/programs/rust/sdk-macros/tests/ui/receiver.rs similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/receiver.rs rename to x/programs/rust/sdk-macros/tests/ui/receiver.rs diff --git a/x/programs/rust/sdk_macros/tests/ui/receiver.stderr b/x/programs/rust/sdk-macros/tests/ui/receiver.stderr similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/receiver.stderr rename to x/programs/rust/sdk-macros/tests/ui/receiver.stderr diff --git a/x/programs/rust/sdk_macros/tests/ui/user-defined-context-type.rs b/x/programs/rust/sdk-macros/tests/ui/user-defined-context-type.rs similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/user-defined-context-type.rs rename to x/programs/rust/sdk-macros/tests/ui/user-defined-context-type.rs diff --git a/x/programs/rust/sdk_macros/tests/ui/user-defined-context-type.stderr b/x/programs/rust/sdk-macros/tests/ui/user-defined-context-type.stderr similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/user-defined-context-type.stderr rename to x/programs/rust/sdk-macros/tests/ui/user-defined-context-type.stderr diff --git a/x/programs/rust/sdk_macros/tests/ui/wild.rs b/x/programs/rust/sdk-macros/tests/ui/wild.rs similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/wild.rs rename to x/programs/rust/sdk-macros/tests/ui/wild.rs diff --git a/x/programs/rust/sdk_macros/tests/ui/wild.stderr b/x/programs/rust/sdk-macros/tests/ui/wild.stderr similarity index 100% rename from x/programs/rust/sdk_macros/tests/ui/wild.stderr rename to x/programs/rust/sdk-macros/tests/ui/wild.stderr diff --git a/x/programs/rust/wasmlanche-sdk/Cargo.toml b/x/programs/rust/wasmlanche-sdk/Cargo.toml index 0904c89d3a..e4bd2e5526 100644 --- a/x/programs/rust/wasmlanche-sdk/Cargo.toml +++ b/x/programs/rust/wasmlanche-sdk/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] borsh = { version = "1.2.0", features = ["derive"] } -sdk_macros = { version = "0.1.0", path = "../sdk_macros" } +sdk-macros = { version = "0.1.0", path = "../sdk-macros" } thiserror = "1.0.46" # optional dependencies