Skip to content

Commit b7106dd

Browse files
authored
Flatten directory structure (#3)
#### Problem The solana-frozen-abi-macro crate is nested, but it's the only nested crate in the whole repo. Also, every crate has a clean mapping between its directory name and crate name, just requiring a prefix of `solana-`, except for `macro`. #### Summary of changes Un-nest `frozen-abi/macro` to `frozen-abi-macro` and rename `macro` directory to `sdk-macro`. This will make the crate patch script very easy to write and maintain, which you will see in the next PR
1 parent c185f88 commit b7106dd

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ members = [
3434
"fee-structure",
3535
"file-download",
3636
"frozen-abi",
37-
"frozen-abi/macro",
37+
"frozen-abi-macro",
3838
"genesis-config",
3939
"hard-forks",
4040
"hash",
@@ -47,7 +47,6 @@ members = [
4747
"loader-v3-interface",
4848
"loader-v4-interface",
4949
"logger",
50-
"macro",
5150
"message",
5251
"msg",
5352
"native-token",
@@ -77,6 +76,7 @@ members = [
7776
"sanitize",
7877
"sdk",
7978
"sdk-ids",
79+
"sdk-macro",
8080
"secp256k1-program",
8181
"secp256k1-recover",
8282
"secp256r1-program",
@@ -224,7 +224,7 @@ solana-feature-set = { path = "feature-set", version = "=2.2.0" }
224224
solana-fee-calculator = { path = "fee-calculator", version = "=2.2.0" }
225225
solana-fee-structure = { path = "fee-structure", version = "=2.2.0" }
226226
solana-frozen-abi = { path = "frozen-abi", version = "=2.2.0" }
227-
solana-frozen-abi-macro = { path = "frozen-abi/macro", version = "=2.2.0" }
227+
solana-frozen-abi-macro = { path = "frozen-abi-macro", version = "=2.2.0" }
228228
solana-file-download = { path = "file-download", version = "=2.2.0" }
229229
solana-genesis-config = { path = "genesis-config", version = "=2.2.0" }
230230
solana-hard-forks = { path = "hard-forks", version = "=2.2.0", default-features = false }
@@ -279,7 +279,7 @@ solana-slot-history = { path = "slot-history", version = "=2.2.0" }
279279
solana-time-utils = { path = "time-utils", version = "=2.2.0" }
280280
solana-sdk = { path = "sdk", version = "=2.2.0" }
281281
solana-sdk-ids = { path = "sdk-ids", version = "=2.2.0" }
282-
solana-sdk-macro = { path = "macro", version = "=2.2.0" }
282+
solana-sdk-macro = { path = "sdk-macro", version = "=2.2.0" }
283283
solana-secp256k1-program = { path = "secp256k1-program", version = "=2.2.0" }
284284
solana-secp256k1-recover = { path = "secp256k1-recover", version = "=2.2.0" }
285285
solana-short-vec = { path = "short-vec", version = "=2.2.0" }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)