fixup changes

client/cli/src/error.rs

@@ -47,9 +47,6 @@ pub enum Error {
 	/// Invalid listen multiaddress
 	#[error("Invalid listen multiaddress")]
 	InvalidListenMultiaddress,
-	/// Application specific error chain sequence forwarder.
-	#[error(transparent)]
-	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
 	/// URI error.
 	#[error("Invalid URI; expecting either a secret URI or a public URI.")]
 	InvalidUri(crypto::PublicError),
@@ -79,10 +76,9 @@ pub enum Error {
 	/// Bytes are not decodable when interpreted as hexadecimal string.
 	#[error("Invalid hex base data")]
 	HexDataConversion(#[from] hex::FromHexError),
-	/// Shortcut type to specify types on the fly, discouraged.
-	#[deprecated = "Use `Forwarded` with an error type instead."]
-	#[error("Other: {0}")]
-	Other(String),
+	/// Application specific error chain sequence forwarder.
+	#[error(transparent)]
+	Application(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
 }
 
 impl std::convert::From<&str> for Error {
@@ -93,7 +89,7 @@ impl std::convert::From<&str> for Error {
 
 impl std::convert::From<String> for Error {
 	fn from(s: String) -> Error {
-		Error::Input(s.to_string())
+		Error::Input(s)
 	}
 }
 

client/service/src/client/wasm_override.rs

@@ -120,10 +120,9 @@ where
 	/// Returns a hashmap of the runtime version and wasm runtime code.
 	fn scrape_overrides(dir: &Path, executor: &E) -> Result<HashMap<u32, WasmBlob>> {
 
-		let handle_err = {
-			let dir = dir.to_owned();
+		let handle_err = |e: std::io::Error | -> sp_blockchain::Error {
 			move |e: std::io::Error | -> sp_blockchain::Error {
-				sp_blockchain::Error::WasmOverrideIo(dir, e)
+				sp_blockchain::Error::WasmOverrideIo(dir.to_owned(), e)
 			}
 		};
 

primitives/blockchain/src/error.rs

@@ -17,7 +17,7 @@
 
 //! Substrate client possible errors.
 
-use std::{self, result};
+use std::{self, result, path::PathBuf};
 use sp_state_machine;
 use sp_runtime::transaction_validity::TransactionValidityError;
 use sp_consensus;
@@ -65,6 +65,7 @@ pub enum Error {
 	ApplyExtrinsicFailed(#[from] ApplyExtrinsicFailed),
 
 	/// Execution error.
+	// `inner` cannot be made member, since it lacks `std::error::Error` trait bounds.
 	#[error("Execution failed: {0:?}")]
 	Execution(Box<dyn sp_state_machine::Error>),
 
@@ -166,14 +167,16 @@ pub enum Error {
 	WasmOverrideIo(PathBuf, #[source] std::io::Error),
 
 	#[error("Overwriting WASM requires a directory where local \
-	WASM is stored. {0} is not a directory", .0.display())]
+	WASM is stored. {} is not a directory", .0.display())]
 	WasmOverrideNotADirectory(PathBuf),
 
 	#[error("Duplicate WASM Runtimes found: \n{}\n", .0.join("\n") )]
 	DuplicateWasmRuntime(Vec<String>),
 
-	/// A convenience variant for String
-	#[deprecated(note = "Introduce more typed error variants as needed")]
+	#[error(transparent)]
+	Foreign(#[from] Box<dyn std::error::Error + Send + Sync + 'static>),
+
+	/// Should be avoided if possible, use `Foreign` instead.
 	#[error("{0}")]
 	Msg(String),
 }
@@ -190,6 +193,18 @@ impl From<Box<dyn sp_state_machine::Error>> for Error {
 	}
 }
 
+impl From<String> for Error {
+	fn from(msg: String) -> Self {
+		Self::Msg(msg)
+	}
+}
+impl From<&str> for Error {
+	fn from(msg: &str) -> Self {
+		Self::Msg(msg.to_owned())
+	}
+}
+
+
 impl Error {
 	/// Chain a blockchain error.
 	pub fn from_blockchain(e: Box<Error>) -> Self {