Skip to content

transaction-error: Fix warning for bpf build, feature gating #3742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 1 commit into from
Nov 25, 2024
Merged

transaction-error: Fix warning for bpf build, feature gating #3742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/transaction-error/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ solana-sanitize = { workspace = true }

[features]
frozen-abi = ["dep:solana-frozen-abi", "dep:solana-frozen-abi-macro"]
serde = ["dep:serde", "dep:serde_derive"]
serde = ["dep:serde", "dep:serde_derive", "solana-instruction/serde"]

[package.metadata.docs.rs]
targets = ["x86_64-unknown-linux-gnu"]
Expand Down
10 changes: 4 additions & 6 deletions sdk/transaction-error/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
use serde_derive::{Deserialize, Serialize};
#[cfg(feature = "frozen-abi")]
use solana_frozen_abi_macro::{AbiEnumVisitor, AbiExample};
use {
core::fmt, solana_instruction::error::InstructionError, solana_sanitize::SanitizeError, std::io,
};
use {core::fmt, solana_instruction::error::InstructionError, solana_sanitize::SanitizeError};

pub type TransactionResult<T> = Result<T, TransactionError>;

Expand Down Expand Up @@ -356,7 +354,7 @@ impl From<SanitizeError> for SanitizeMessageError {
#[cfg(not(target_os = "solana"))]
#[derive(Debug)]
pub enum TransportError {
IoError(io::Error),
IoError(std::io::Error),
TransactionError(TransactionError),
Custom(String),
}
Expand Down Expand Up @@ -386,8 +384,8 @@ impl fmt::Display for TransportError {
}

#[cfg(not(target_os = "solana"))]
impl From<io::Error> for TransportError {
fn from(e: io::Error) -> Self {
impl From<std::io::Error> for TransportError {
fn from(e: std::io::Error) -> Self {
TransportError::IoError(e)
}
}
Expand Down