Skip to content

Commit d5cd36e

Browse files
committed
post-rebase fixes
1 parent c4bdf17 commit d5cd36e

File tree

1 file changed

+1
-52
lines changed

1 file changed

+1
-52
lines changed

program-error/src/lib.rs

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ impl ToStr for ProgramError {
243243
Self::AccountBorrowFailed => "Error: AccountBorrowFailed",
244244
Self::MaxSeedLengthExceeded => "Error: MaxSeedLengthExceeded",
245245
Self::InvalidSeeds => "Error: InvalidSeeds",
246-
Self::BorshIoError(_) => "Error: BorshIoError",
246+
Self::BorshIoError => "Error: BorshIoError",
247247
Self::AccountNotRentExempt => "Error: AccountNotRentExempt",
248248
Self::UnsupportedSysvar => "Error: UnsupportedSysvar",
249249
Self::IllegalOwner => "Error: IllegalOwner",
@@ -306,57 +306,6 @@ impl From<ProgramError> for u64 {
306306
}
307307
}
308308

309-
/// A trait for converting a program error to a `&str`.
310-
pub trait ToStr {
311-
fn to_str<E>(&self) -> &'static str
312-
where
313-
E: 'static + ToStr + TryFrom<u32>;
314-
}
315-
316-
impl ToStr for ProgramError {
317-
fn to_str<E>(&self) -> &'static str
318-
where
319-
E: 'static + ToStr + TryFrom<u32>,
320-
{
321-
match self {
322-
Self::Custom(error) => {
323-
if let Ok(custom_error) = E::try_from(*error) {
324-
custom_error.to_str::<E>()
325-
} else {
326-
"Error: Unknown"
327-
}
328-
}
329-
Self::InvalidArgument => "Error: InvalidArgument",
330-
Self::InvalidInstructionData => "Error: InvalidInstructionData",
331-
Self::InvalidAccountData => "Error: InvalidAccountData",
332-
Self::AccountDataTooSmall => "Error: AccountDataTooSmall",
333-
Self::InsufficientFunds => "Error: InsufficientFunds",
334-
Self::IncorrectProgramId => "Error: IncorrectProgramId",
335-
Self::MissingRequiredSignature => "Error: MissingRequiredSignature",
336-
Self::AccountAlreadyInitialized => "Error: AccountAlreadyInitialized",
337-
Self::UninitializedAccount => "Error: UninitializedAccount",
338-
Self::NotEnoughAccountKeys => "Error: NotEnoughAccountKeys",
339-
Self::AccountBorrowFailed => "Error: AccountBorrowFailed",
340-
Self::MaxSeedLengthExceeded => "Error: MaxSeedLengthExceeded",
341-
Self::InvalidSeeds => "Error: InvalidSeeds",
342-
Self::BorshIoError => "Error: BorshIoError",
343-
Self::AccountNotRentExempt => "Error: AccountNotRentExempt",
344-
Self::UnsupportedSysvar => "Error: UnsupportedSysvar",
345-
Self::IllegalOwner => "Error: IllegalOwner",
346-
Self::MaxAccountsDataAllocationsExceeded => "Error: MaxAccountsDataAllocationsExceeded",
347-
Self::InvalidRealloc => "Error: InvalidRealloc",
348-
Self::MaxInstructionTraceLengthExceeded => "Error: MaxInstructionTraceLengthExceeded",
349-
Self::BuiltinProgramsMustConsumeComputeUnits => {
350-
"Error: BuiltinProgramsMustConsumeComputeUnits"
351-
}
352-
Self::InvalidAccountOwner => "Error: InvalidAccountOwner",
353-
Self::ArithmeticOverflow => "Error: ArithmeticOverflow",
354-
Self::Immutable => "Error: Immutable",
355-
Self::IncorrectAuthority => "Error: IncorrectAuthority",
356-
}
357-
}
358-
}
359-
360309
impl From<u64> for ProgramError {
361310
fn from(error: u64) -> Self {
362311
match error {

0 commit comments

Comments
 (0)