chore (edition 2018, Cargo.lock)

.gitignore

@@ -1,4 +1,3 @@
 target
-Cargo.lock
 railcar
 .wercker

Cargo.toml

@@ -5,18 +5,18 @@ authors = ["Vishvananda Ishaya Abrams <[email protected]>"]
 build = "build.rs"
 
 [dependencies]
-caps = "0.2.0"
-clap = "2.24.1"
-error-chain = "0.10.0"
-lazy_static = "^1.1.0"
-libc = "0.2.21"
-log = {version = "0.4.3", features = ["release_max_level_info"] }
+caps = "0.2"
+clap = "2.24"
+error-chain = "0.12"
+lazy_static = "1"
+libc = "0.2"
+log = {version = "0.4", features = ["release_max_level_info"] }
 nix = "0.11.0"
 num-traits = "^0.2.5"
 oci = { path = "oci" }
-prctl = "1.0.0"
+prctl = "1"
 scopeguard = "^0.3.3"
-seccomp-sys = "0.1.2"
+seccomp-sys = "^0.1.2"
 
 [features]
 nightly = []

oci/src/serialize.rs

@@ -29,7 +29,7 @@ impl Error for SerializeError {
         }
     }
 
-    fn cause(&self) -> Option<&Error> {
+    fn cause(&self) -> Option<&dyn Error> {
         match *self {
             SerializeError::Io(ref err) => Some(err),
             SerializeError::Json(ref err) => Some(err),

src/capabilities.rs

@@ -13,12 +13,12 @@ fn to_set(caps: &[LinuxCapabilityType]) -> CapsHashSet {
     capabilities
 }
 
-pub fn reset_effective() -> ::Result<()> {
+pub fn reset_effective() -> crate::Result<()> {
     set(None, CapSet::Effective, ::caps::all())?;
     Ok(())
 }
 
-pub fn drop_privileges(cs: &LinuxCapabilities) -> ::Result<()> {
+pub fn drop_privileges(cs: &LinuxCapabilities) -> crate::Result<()> {
     let all = ::caps::all();
     debug!("dropping bounding capabilities to {:?}", cs.bounding);
     // drop excluded caps from the bounding set

src/cgroups.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 use lazy_static::initialize;
 use nix::unistd::Pid;
 use num_traits::identities::Zero;

src/main.rs

@@ -2,6 +2,7 @@
 #![recursion_limit = "1024"]
 #![cfg_attr(feature = "nightly", feature(start))]
 #![cfg_attr(feature = "nightly", feature(alloc_system))]
+#![cfg_attr(feature = "nightly", feature(ord_max_min))]
 #[cfg(feature = "nightly")]
 extern crate alloc_system;
 
@@ -35,7 +36,7 @@ mod signals;
 mod sync;
 
 use clap::{App, AppSettings, Arg, ArgMatches, SubCommand};
-use errors::*;
+use crate::errors::*;
 use lazy_static::initialize;
 use nix::errno::Errno;
 use nix::fcntl::{open, OFlag};
@@ -51,7 +52,7 @@ use nix::sys::wait::{waitpid, WaitStatus};
 use nix::unistd::{chdir, execvp, getpid, sethostname, setresgid, setresuid};
 use nix::unistd::{close, dup2, fork, pipe2, read, setsid, write, ForkResult};
 use nix::unistd::{Gid, Pid, Uid};
-use nix_ext::{clearenv, putenv, setgroups, setrlimit};
+use crate::nix_ext::{clearenv, putenv, setgroups, setrlimit};
 use oci::{Linux, LinuxIDMapping, LinuxRlimit, Spec};
 use oci::{LinuxDevice, LinuxDeviceType};
 use std::collections::HashMap;
@@ -61,7 +62,7 @@ use std::io::{Read, Write};
 use std::os::unix::fs::symlink;
 use std::os::unix::io::{FromRawFd, RawFd};
 use std::result::Result as StdResult;
-use sync::Cond;
+use crate::sync::Cond;
 
 lazy_static! {
     static ref DEFAULT_DEVICES: Vec<LinuxDevice> = {

src/mounts.rs

@@ -1,5 +1,5 @@
-use cgroups;
-use errors::*;
+use crate::cgroups;
+use crate::errors::*;
 use nix::errno::Errno;
 use nix::fcntl::{open, OFlag};
 use nix::mount::MsFlags;
@@ -9,9 +9,9 @@ use nix::sys::stat::{Mode, SFlag};
 use nix::unistd::{chdir, chown, close, getcwd, pivot_root};
 use nix::unistd::{Gid, Uid};
 use nix::NixPath;
-use nix_ext::fchdir;
+use crate::nix_ext::fchdir;
 use oci::{LinuxDevice, LinuxDeviceType, Mount, Spec};
-use selinux::setfilecon;
+use crate::selinux::setfilecon;
 use std::collections::HashMap;
 use std::fs::OpenOptions;
 use std::fs::{canonicalize, create_dir_all, remove_file};

src/seccomp.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 use oci::{Arch, LinuxSeccomp, LinuxSeccompOperator};
 use seccomp_sys::*;
 
@@ -10,7 +10,7 @@ fn to_cmp(cmp: LinuxSeccompOperator) -> scmp_compare {
     unsafe { ::std::mem::transmute(cmp) }
 }
 
-fn syscall_resolve_name(name: &str) -> ::Result<i32> {
+fn syscall_resolve_name(name: &str) -> crate::Result<i32> {
     let s = ::std::ffi::CString::new(name)?;
     let id = unsafe { seccomp_syscall_resolve_name(s.as_ptr()) };
     if id == __NR_SCMP_ERROR {
@@ -31,7 +31,7 @@ fn init(act: u32) -> Result<*mut scmp_filter_ctx> {
     }
 }
 
-fn arch_add(ctx: *mut scmp_filter_ctx, arch: scmp_arch) -> ::Result<i32> {
+fn arch_add(ctx: *mut scmp_filter_ctx, arch: scmp_arch) -> crate::Result<i32> {
     let id = unsafe { seccomp_arch_add(ctx, arch as u32) };
     if id == __NR_SCMP_ERROR {
         let msg = format!("could not add arch {:?}", arch);
@@ -87,7 +87,7 @@ fn load(ctx: *mut scmp_filter_ctx) -> Result<()> {
     }
 }
 
-pub fn initialize_seccomp(seccomp: &LinuxSeccomp) -> ::Result<()> {
+pub fn initialize_seccomp(seccomp: &LinuxSeccomp) -> crate::Result<()> {
     let ctx = init(seccomp.default_action as u32)?;
     // set control NoNewPrivs to false, as we deal with it separately
     attr_set(ctx, scmp_filter_attr::SCMP_FLTATR_CTL_NNP, false as u32)?;

src/selinux.rs

@@ -1,8 +1,8 @@
-use errors::*;
+use crate::errors::*;
 use nix::fcntl::{open, OFlag};
 use nix::sys::stat::Mode;
 use nix::unistd::{close, write};
-use nix_ext::lsetxattr;
+use crate::nix_ext::lsetxattr;
 use std::ffi::CString;
 
 const EXEC_PATH: &'static str = "/proc/self/attr/exec";

src/signals.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 use libc::c_int;
 use nix::sys::signal::{kill, raise, sigaction};
 use nix::sys::signal::{SaFlags, SigAction, SigHandler, SigSet, Signal};