Skip to content

Commit

Permalink
remove void crate
Browse files Browse the repository at this point in the history
  • Loading branch information
Mic92 committed Oct 28, 2020
1 parent b690495 commit 1548376
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 14 deletions.
7 changes: 0 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ argparse = "0.2.*"
log = "0.4.*"
libc = "0.2.*"
parking_lot = "0.11.*"
void = "1.0.*"
nix = "0.19.*"
#cntr-fuse = "0.3.*"

Expand Down
3 changes: 1 addition & 2 deletions src/attach/child.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ use std::fs::File;
use std::os::unix::io::IntoRawFd;
use std::os::unix::prelude::*;
use std::process;
use void::Void;

use crate::capabilities;
use crate::cgroup;
Expand All @@ -34,7 +33,7 @@ pub struct ChildOptions<'a> {
pub gid: Gid,
}

pub fn run(options: &ChildOptions) -> Result<Void> {
pub fn run(options: &ChildOptions) -> Result<()> {
let lsm_profile = tryfmt!(
lsm::read_profile(options.process_status.global_pid),
"failed to get lsm profile"
Expand Down
3 changes: 1 addition & 2 deletions src/attach/mod.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use nix::unistd::{self, ForkResult};
use std::fs::{create_dir_all, metadata};
use std::os::unix::prelude::*;
use void::Void;

use crate::container;
use crate::dotcntr;
Expand All @@ -23,7 +22,7 @@ pub struct AttachOptions {
pub effective_user: Option<Passwd>,
}

pub fn attach(opts: &AttachOptions) -> Result<Void> {
pub fn attach(opts: &AttachOptions) -> Result<()> {
let container_pid = tryfmt!(
container::lookup_container_pid(opts.container_name.as_str(), &opts.container_types),
""
Expand Down
3 changes: 1 addition & 2 deletions src/attach/parent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ use nix::unistd::Pid;
use nix::{cmsg_space, unistd};
use std::os::unix::io::RawFd;
use std::process;
use void::Void;

use crate::fs;
use crate::ipc;
use crate::mountns;
use crate::pty;
use crate::types::{Error, Result};

pub fn run(pid: Pid, mount_ready_sock: &ipc::Socket, fs: fs::CntrFs) -> Result<Void> {
pub fn run(pid: Pid, mount_ready_sock: &ipc::Socket, fs: fs::CntrFs) -> Result<()> {
let ns = tryfmt!(
mountns::MountNamespace::receive(mount_ready_sock),
"failed to receive mount namespace from child"
Expand Down

0 comments on commit 1548376

Please sign in to comment.