From 38aea89809ea4154975d853bffe3cb7715fe84d6 Mon Sep 17 00:00:00 2001 From: Thom Chiovoloni Date: Sun, 12 Apr 2020 11:46:53 -0700 Subject: [PATCH] Remove implementations of std::error::Error::description --- src/error.rs | 42 ------------------------------------------ src/types/from_sql.rs | 13 ------------- 2 files changed, 55 deletions(-) diff --git a/src/error.rs b/src/error.rs index 34d2ddc..35efaf1 100644 --- a/src/error.rs +++ b/src/error.rs @@ -266,48 +266,6 @@ impl fmt::Display for Error { } impl error::Error for Error { - #[allow(deprecated)] - fn description(&self) -> &str { - match *self { - Error::SqliteFailure(ref err, None) => err.description(), - Error::SqliteFailure(_, Some(ref s)) => s, - Error::SqliteSingleThreadedMode => { - "SQLite was compiled or configured for single-threaded use only" - } - Error::FromSqlConversionFailure(_, _, ref err) => err.description(), - Error::IntegralValueOutOfRange(..) => "integral value out of range of requested type", - Error::Utf8Error(ref err) => err.description(), - Error::InvalidParameterName(_) => "invalid parameter name", - Error::NulError(ref err) => err.description(), - Error::InvalidPath(_) => "invalid path", - Error::ExecuteReturnedResults => { - "execute returned results - did you mean to call query?" - } - Error::InvalidParameterCount(..) => "Wrong number of parameters passed to query.", - Error::QueryReturnedNoRows => "query returned no rows", - Error::InvalidColumnIndex(_) => "invalid column index", - Error::InvalidColumnName(_) => "invalid column name", - Error::InvalidColumnType(..) => "invalid column type", - Error::StatementChangedRows(_) => "query inserted zero or more than one row", - - #[cfg(feature = "functions")] - Error::InvalidFunctionParameterType(..) => "invalid function parameter type", - #[cfg(feature = "vtab")] - Error::InvalidFilterParameterType(..) => "invalid filter parameter type", - #[cfg(feature = "functions")] - Error::UserFunctionError(ref err) => err.description(), - Error::ToSqlConversionFailure(ref err) => err.description(), - Error::InvalidQuery => "query is not read-only", - #[cfg(feature = "vtab")] - Error::ModuleError(ref desc) => desc, - #[cfg(feature = "functions")] - Error::UnwindingPanic => "unwinding panic", - #[cfg(feature = "functions")] - Error::GetAuxWrongType => "get_aux called with wrong type", - Error::MultipleStatement => "multiple statements provided", - } - } - fn source(&self) -> Option<&(dyn error::Error + 'static)> { match *self { Error::SqliteFailure(ref err, _) => Some(err), diff --git a/src/types/from_sql.rs b/src/types/from_sql.rs index b013e99..e8eadc5 100644 --- a/src/types/from_sql.rs +++ b/src/types/from_sql.rs @@ -62,19 +62,6 @@ impl fmt::Display for FromSqlError { } impl Error for FromSqlError { - #[allow(deprecated)] - fn description(&self) -> &str { - match *self { - FromSqlError::InvalidType => "invalid type", - FromSqlError::OutOfRange(_) => "value out of range", - #[cfg(feature = "i128_blob")] - FromSqlError::InvalidI128Size(_) => "unexpected blob size for 128bit value", - #[cfg(feature = "uuid")] - FromSqlError::InvalidUuidSize(_) => "unexpected blob size for UUID value", - FromSqlError::Other(ref err) => err.description(), - } - } - fn source(&self) -> Option<&(dyn Error + 'static)> { if let FromSqlError::Other(ref err) = self { Some(&**err)