diff --git a/src/agent/rustjail/src/container.rs b/src/agent/rustjail/src/container.rs index 9b25199e71..af0b67f231 100644 --- a/src/agent/rustjail/src/container.rs +++ b/src/agent/rustjail/src/container.rs @@ -14,7 +14,7 @@ use std::os::unix::io::RawFd; use std::path::{Path, PathBuf}; use std::time::SystemTime; // use crate::sync::Cond; -use anyhow::{anyhow, Context, Result}; +use anyhow::{anyhow, bail, Context, Result}; use libc::pid_t; use oci::{LinuxDevice, LinuxIDMapping}; use std::clone::Clone; diff --git a/src/agent/rustjail/src/errors.rs b/src/agent/rustjail/src/errors.rs deleted file mode 100644 index 8478a50b6d..0000000000 --- a/src/agent/rustjail/src/errors.rs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2019 Ant Financial -// -// SPDX-License-Identifier: Apache-2.0 -// - -// define errors here - -error_chain! { - types { - Error, ErrorKind, ResultExt, Result; - } - // foreign error conv to chain error - foreign_links { - Io(std::io::Error); - Nix(nix::Error); - Ffi(std::ffi::NulError); - Caps(caps::errors::Error); - Serde(serde_json::Error); - FromUTF8(std::string::FromUtf8Error); - Parse(std::num::ParseIntError); - Scanfmt(scan_fmt::parse::ScanError); - Ip(std::net::AddrParseError); - Regex(regex::Error); - EnvVar(std::env::VarError); - UTF8(std::str::Utf8Error); - } - // define new errors - errors { - ErrorCode(t: String) { - description("Error Code") - display("Error Code: '{}'", t) - } - } -} diff --git a/src/agent/rustjail/src/lib.rs b/src/agent/rustjail/src/lib.rs index b3866d988d..c77da3a309 100644 --- a/src/agent/rustjail/src/lib.rs +++ b/src/agent/rustjail/src/lib.rs @@ -13,7 +13,6 @@ #![allow(non_upper_case_globals)] // #![allow(unused_comparisons)] #[macro_use] -extern crate error_chain; extern crate serde; extern crate serde_json; #[macro_use] @@ -45,7 +44,6 @@ macro_rules! sl { pub mod capabilities; pub mod cgroups; pub mod container; -pub mod errors; pub mod mount; pub mod process; pub mod specconv; diff --git a/src/agent/rustjail/src/mount.rs b/src/agent/rustjail/src/mount.rs index ae0e7c5be6..460ba2c56b 100644 --- a/src/agent/rustjail/src/mount.rs +++ b/src/agent/rustjail/src/mount.rs @@ -3,7 +3,7 @@ // SPDX-License-Identifier: Apache-2.0 // -use anyhow::{anyhow, Context, Error, Result}; +use anyhow::{anyhow, bail, Context, Error, Result}; use libc::uid_t; use nix::errno::Errno; use nix::fcntl::{self, OFlag};