From a47a94218f85af69b152b7f2a7c7172769eb23b0 Mon Sep 17 00:00:00 2001
From: Liu Jiang <gerry@linux.alibaba.com>
Date: Fri, 22 Nov 2019 16:37:14 +0800
Subject: [PATCH] agent: rename SerializeError as Error

Rename SerializeError as Error and export it as the Error codes for
the OCI crate.

Signed-off-by: Liu Jiang <gerry@linux.alibaba.com>
---
 src/agent/oci/src/lib.rs       |  2 +-
 src/agent/oci/src/serialize.rs | 36 +++++++++++++++++-----------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/agent/oci/src/lib.rs b/src/agent/oci/src/lib.rs
index e62bd7f72b..e61f85bdea 100644
--- a/src/agent/oci/src/lib.rs
+++ b/src/agent/oci/src/lib.rs
@@ -12,7 +12,7 @@ use libc::mode_t;
 use std::collections::HashMap;
 
 mod serialize;
-pub use serialize::{to_string, to_writer, Result, SerializeError};
+pub use serialize::{to_string, to_writer, Error, Result};
 
 #[allow(dead_code)]
 fn is_false(b: bool) -> bool {
diff --git a/src/agent/oci/src/serialize.rs b/src/agent/oci/src/serialize.rs
index 012743b9fe..95466c47d5 100644
--- a/src/agent/oci/src/serialize.rs
+++ b/src/agent/oci/src/serialize.rs
@@ -6,53 +6,53 @@
 use serde::{Deserialize, Serialize};
 use serde_json;
 
-use std::error::Error;
+use std::error;
 use std::fmt::{Display, Formatter, Result as FmtResult};
 use std::fs::File;
 use std::io;
 
-pub type Result<T> = std::result::Result<T, SerializeError>;
+pub type Result<T> = std::result::Result<T, Error>;
 
 #[derive(Debug)]
-pub enum SerializeError {
+pub enum Error {
     Io(io::Error),
     Json(serde_json::Error),
 }
 
-impl Display for SerializeError {
+impl Display for Error {
     fn fmt(&self, f: &mut Formatter) -> FmtResult {
         match *self {
-            SerializeError::Io(ref e) => e.fmt(f),
-            SerializeError::Json(ref e) => e.fmt(f),
+            Error::Io(ref e) => e.fmt(f),
+            Error::Json(ref e) => e.fmt(f),
         }
     }
 }
 
-impl Error for SerializeError {
+impl error::Error for Error {
     fn description(&self) -> &str {
         match *self {
-            SerializeError::Io(ref e) => e.description(),
-            SerializeError::Json(ref e) => e.description(),
+            Error::Io(ref e) => e.description(),
+            Error::Json(ref e) => e.description(),
         }
     }
 
-    fn cause(&self) -> Option<&dyn Error> {
+    fn cause(&self) -> Option<&dyn error::Error> {
         match *self {
-            SerializeError::Io(ref e) => Some(e),
-            SerializeError::Json(ref e) => Some(e),
+            Error::Io(ref e) => Some(e),
+            Error::Json(ref e) => Some(e),
         }
     }
 }
 
-impl From<io::Error> for SerializeError {
-    fn from(e: io::Error) -> SerializeError {
-        SerializeError::Io(e)
+impl From<io::Error> for Error {
+    fn from(e: io::Error) -> Error {
+        Error::Io(e)
     }
 }
 
-impl From<serde_json::Error> for SerializeError {
-    fn from(e: serde_json::Error) -> SerializeError {
-        SerializeError::Json(e)
+impl From<serde_json::Error> for Error {
+    fn from(e: serde_json::Error) -> Error {
+        Error::Json(e)
     }
 }