finish fixups

Author: MikailBag

Cargo.lock

@@ -5,28 +5,27 @@ authors = ["Mikail Bagishov <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-libc = "0.2.82"
+libc = "0.2.86"
 errno = "0.2.7"
-rand = "0.8.2"
-serde = { version = "1.0.121", features = ["derive"] }
-serde_json = "1.0.61"
+rand = "0.8.3"
+serde = { version = "1.0.123", features = ["derive"] }
+serde_json = "1.0.62"
 backtrace = "0.3.56"
 thiserror = "1.0.23"
 anyhow = "1.0.38"
 once_cell = "1.5.2"
 futures-util = "0.3.12"
-tokio = { version = "1.1.0", features = ["net"] }
-tracing = "0.1.22"
+tokio = { version = "1.2.0", features = ["net"] }
+tracing = "0.1.23"
 itoa = "0.4.7"
 
 [target.'cfg(target_os="linux")'.dependencies]
 tiny-nix-ipc = { git = "https://github.com/myfreeweb/tiny-nix-ipc", features = ["ser_json", "zero_copy"] }
-procfs = "0.7.8"
 nix = {git = "https://github.com/nix-rust/nix"}
-libc = "0.2.68"
-errno = "0.2.5"
-serde_json = "1.0.51"
-tokio = { version = "0.3.2", features = ["net"] }
+libc = "0.2.86"
+errno = "0.2.7"
+serde_json = "1.0.62"
+tokio = { version = "1.2.0", features = ["net"] }
 
 [target.'cfg(target_os="windows")'.dependencies]
 winapi = { version = "0.3.9", features = ["std", "processthreadsapi", "jobapi2", "errhandlingapi",

Cargo.toml

@@ -18,7 +18,7 @@ pub trait Sandbox: std::fmt::Debug + Send + Sync + 'static {
 }
 
 impl<S: crate::Sandbox> Sandbox for S {
-    fn id(&self) -> &str {
+    fn id(&self) -> String {
         self.id()
     }
     fn check_cpu_tle(&self) -> anyhow::Result<bool> {

src/erased.rs

@@ -120,7 +120,7 @@ impl SandboxOptions {
 /// Represents highly-isolated sandbox
 pub trait Sandbox: Debug + Send + Sync + Debug + 'static {
     type Error: StdError + Send + Sync + 'static;
-    fn id(&self) -> &str;
+    fn id(&self) -> String;
 
     /// Returns true if sandbox exceeded CPU time limit
     fn check_cpu_tle(&self) -> Result<bool, Self::Error>;

src/lib.rs

@@ -1,5 +1,4 @@
 use crate::{linux::util::Pid, SharedItem};
-use rand::seq::SliceRandom;
 use serde::{Deserialize, Serialize};
 use std::{ffi::OsString, os::unix::io::RawFd, path::PathBuf, time::Duration};
 use tiny_nix_ipc::Socket;

src/linux/jail_common.rs

@@ -88,8 +88,8 @@ impl Debug for LinuxSandbox {
 impl Sandbox for LinuxSandbox {
     type Error = Error;
 
-    fn id(&self) -> &str {
-        &self.id
+    fn id(&self) -> String {
+        self.id.clone()
     }
 
     fn check_cpu_tle(&self) -> Result<bool, Error> {