extract program-option crate

anza-xyz · Jul 31, 2024 · 05460da · 05460da
1 parent 6e067fc
commit 05460da
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -109,6 +109,7 @@ members = [
     "sdk/package-metadata-macro",
     "sdk/program",
     "sdk/program-memory",
+    "sdk/program-option",
     "send-transaction-service",
     "short-vec",
     "stake-accounts",
@@ -391,6 +392,7 @@ solana-poh = { path = "poh", version = "=2.1.0" }
 solana-poseidon = { path = "poseidon", version = "=2.1.0" }
 solana-program = { path = "sdk/program", version = "=2.1.0", default-features = false }
 solana-program-memory = { path = "sdk/program-memory", version = "=2.1.0" }
+solana-program-option = { path = "sdk/program-option", version = "=2.1.0" }
 solana-program-runtime = { path = "program-runtime", version = "=2.1.0" }
 solana-program-test = { path = "program-test", version = "=2.1.0" }
 solana-pubsub-client = { path = "pubsub-client", version = "=2.1.0" }

diff --git a/sdk/program-option/Cargo.toml b/sdk/program-option/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "solana-program-option"
+description = "A C representation of Rust's Option"
+documentation = "https://docs.rs/solana-program-option"
+version = { workspace = true }
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
diff --git a/sdk/program/src/program_option.rs → sdk/program-option/src/lib.rs b/sdk/program/src/program_option.rs → sdk/program-option/src/lib.rs
diff --git a/sdk/program/Cargo.toml b/sdk/program/Cargo.toml
@@ -37,6 +37,7 @@ solana-frozen-abi = { workspace = true, optional = true }
 solana-frozen-abi-macro = { workspace = true, optional = true }
 solana-msg = { workspace = true }
 solana-program-memory = { workspace = true }
+solana-program-option = { workspace = true }
 solana-sanitize = { workspace = true }
 solana-sdk-macro = { workspace = true }
 solana-secp256k1-recover = { workspace = true }

diff --git a/sdk/program/src/lib.rs b/sdk/program/src/lib.rs
@@ -509,7 +509,6 @@ pub mod native_token;
 pub mod nonce;
 pub mod program;
 pub mod program_error;
-pub mod program_option;
 pub mod program_pack;
 pub mod program_stubs;
 pub mod program_utils;
@@ -530,7 +529,7 @@ pub mod sysvar;
 pub mod vote;
 pub mod wasm;
 
-pub use solana_msg::msg;
+pub use {solana_msg::msg, solana_program_option as program_option};
 #[deprecated(since = "2.1.0", note = "Use `solana-program-memory` crate instead")]
 pub use solana_program_memory as program_memory;
 #[deprecated(since = "2.1.0", note = "Use `solana-sanitize` crate instead")]