Skip to content
This repository was archived by the owner on Mar 11, 2025. It is now read-only.

Commit 85ab052

Browse files
author
Joe C
authored
Fix downstream dependencies for spl-program-error (#4555)
* fixed downstream * drop deps from token metadata interface
1 parent 768e94d commit 85ab052

File tree

5 files changed

+8
-13
lines changed

5 files changed

+8
-13
lines changed

Cargo.lock

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libraries/program-error/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ license = "Apache-2.0"
88
edition = "2021"
99

1010
[dependencies]
11-
num-derive = "0.3.3"
12-
num-traits = "0.2.15"
11+
num-derive = "0.3"
12+
num-traits = "0.2"
1313
solana-program = "1.14.12"
1414
spl-program-error-derive = { version = "0.1.0", path = "./derive" }
15-
thiserror = "1.0.32"
15+
thiserror = "1.0"
1616

1717
[dev-dependencies]
18-
lazy_static = "1.4.0"
19-
serial_test = "2.0.0"
18+
lazy_static = "1.4"
19+
serial_test = "2.0"
2020
solana-sdk = "1.14.12"
2121

2222
[lib]

libraries/program-error/derive/src/macro_impl.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ pub fn spl_program_error(input: ItemEnum) -> proc_macro2::TokenStream {
104104
let print_program_error = print_program_error(ident, variants);
105105
quote! {
106106
#[derive(Clone, Debug, Eq, thiserror::Error, num_derive::FromPrimitive, PartialEq)]
107+
#[num_traits = "num_traits"]
107108
#input
108109

109110
#into_program_error

libraries/program-error/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ extern crate self as spl_program_error;
88

99
// Make these available downstream for the macro to work without
1010
// additional imports
11-
pub use num_derive::FromPrimitive;
11+
pub use num_derive;
1212
pub use num_traits;
1313
pub use solana_program;
1414
pub use spl_program_error_derive::{
1515
spl_program_error, DecodeError, IntoProgramError, PrintProgramError,
1616
};
17-
pub use thiserror::Error;
17+
pub use thiserror;

token-metadata/interface/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ edition = "2021"
99

1010
[dependencies]
1111
borsh = "0.9"
12-
num-derive = "0.3.3"
13-
num-traits = "0.2"
1412
solana-program = "1.14.12"
1513
spl-program-error = { version = "0.1.0" , path = "../../libraries/program-error" }
1614
spl-type-length-value = { version = "0.1.0" , path = "../../libraries/type-length-value" }
17-
thiserror = "1.0"
1815

1916
[lib]
2017
crate-type = ["cdylib", "lib"]

0 commit comments

Comments
 (0)