post-rebase fixes

Author: kevinheavey

program-error/src/lib.rs

@@ -243,7 +243,7 @@ impl ToStr for ProgramError {
             Self::AccountBorrowFailed => "Error: AccountBorrowFailed",
             Self::MaxSeedLengthExceeded => "Error: MaxSeedLengthExceeded",
             Self::InvalidSeeds => "Error: InvalidSeeds",
-            Self::BorshIoError(_) => "Error: BorshIoError",
+            Self::BorshIoError => "Error: BorshIoError",
             Self::AccountNotRentExempt => "Error: AccountNotRentExempt",
             Self::UnsupportedSysvar => "Error: UnsupportedSysvar",
             Self::IllegalOwner => "Error: IllegalOwner",
@@ -306,57 +306,6 @@ impl From<ProgramError> for u64 {
     }
 }
 
-/// A trait for converting a program error to a `&str`.
-pub trait ToStr {
-    fn to_str<E>(&self) -> &'static str
-    where
-        E: 'static + ToStr + TryFrom<u32>;
-}
-
-impl ToStr for ProgramError {
-    fn to_str<E>(&self) -> &'static str
-    where
-        E: 'static + ToStr + TryFrom<u32>,
-    {
-        match self {
-            Self::Custom(error) => {
-                if let Ok(custom_error) = E::try_from(*error) {
-                    custom_error.to_str::<E>()
-                } else {
-                    "Error: Unknown"
-                }
-            }
-            Self::InvalidArgument => "Error: InvalidArgument",
-            Self::InvalidInstructionData => "Error: InvalidInstructionData",
-            Self::InvalidAccountData => "Error: InvalidAccountData",
-            Self::AccountDataTooSmall => "Error: AccountDataTooSmall",
-            Self::InsufficientFunds => "Error: InsufficientFunds",
-            Self::IncorrectProgramId => "Error: IncorrectProgramId",
-            Self::MissingRequiredSignature => "Error: MissingRequiredSignature",
-            Self::AccountAlreadyInitialized => "Error: AccountAlreadyInitialized",
-            Self::UninitializedAccount => "Error: UninitializedAccount",
-            Self::NotEnoughAccountKeys => "Error: NotEnoughAccountKeys",
-            Self::AccountBorrowFailed => "Error: AccountBorrowFailed",
-            Self::MaxSeedLengthExceeded => "Error: MaxSeedLengthExceeded",
-            Self::InvalidSeeds => "Error: InvalidSeeds",
-            Self::BorshIoError => "Error: BorshIoError",
-            Self::AccountNotRentExempt => "Error: AccountNotRentExempt",
-            Self::UnsupportedSysvar => "Error: UnsupportedSysvar",
-            Self::IllegalOwner => "Error: IllegalOwner",
-            Self::MaxAccountsDataAllocationsExceeded => "Error: MaxAccountsDataAllocationsExceeded",
-            Self::InvalidRealloc => "Error: InvalidRealloc",
-            Self::MaxInstructionTraceLengthExceeded => "Error: MaxInstructionTraceLengthExceeded",
-            Self::BuiltinProgramsMustConsumeComputeUnits => {
-                "Error: BuiltinProgramsMustConsumeComputeUnits"
-            }
-            Self::InvalidAccountOwner => "Error: InvalidAccountOwner",
-            Self::ArithmeticOverflow => "Error: ArithmeticOverflow",
-            Self::Immutable => "Error: Immutable",
-            Self::IncorrectAuthority => "Error: IncorrectAuthority",
-        }
-    }
-}
-
 impl From<u64> for ProgramError {
     fn from(error: u64) -> Self {
         match error {