Merge #91

91: Make --data-dir optional in jjs-setup r=MikailBag a=MikailBag



Co-authored-by: Mikail Bagishov <bagishov.mikail@yandex.ru>

Author: bors[bot]

src/minion/src/lib.rs

@@ -135,10 +135,15 @@ impl InputSpecification {
         Self(InputSpecificationData::Pipe)
     }
 
+    /// # Safety
+    /// - Handle must not be used since passing to this function
+    /// - Handle must be valid
     pub unsafe fn handle(h: u64) -> Self {
         Self(InputSpecificationData::Handle(h))
     }
 
+    /// # Safety
+    /// See requirements of `handle`
     pub unsafe fn handle_of<T: std::os::unix::io::IntoRawFd>(obj: T) -> Self {
         Self::handle(obj.into_raw_fd() as u64)
     }
@@ -175,10 +180,15 @@ impl OutputSpecification {
         Self(OutputSpecificationData::Buffer(None))
     }
 
+    /// # Safety
+    /// - Handle must not be used since passing to this function
+    /// - Handle must be valid
     pub unsafe fn handle(h: u64) -> Self {
         Self(OutputSpecificationData::Handle(h))
     }
 
+    /// # Safety
+    /// See requirements of `handle`
     pub unsafe fn handle_of<T: std::os::unix::io::IntoRawFd>(obj: T) -> Self {
         Self::handle(obj.into_raw_fd() as u64)
     }

src/minion/src/linux/dominion.rs

@@ -86,8 +86,8 @@ impl LinuxDominion {
         let startup_info = jobserver::start_jobserver(jail_options)?;
 
         Ok(LinuxDominion {
-            id: jail_id.clone(),
-            options: options.clone(),
+            id: jail_id,
+            options,
             jobserver_sock: startup_info.socket,
             util_cgroup_path: startup_info.wrapper_cgroup_path,
         })

src/minion/src/linux/jobserver.rs

@@ -528,7 +528,7 @@ pub(crate) unsafe fn start_jobserver(
         write!(logger, "thread C (jobserver main)").unwrap();
         mem::drop(sock);
         let js_arg = JobServerOptions {
-            jail_options: jail_options.clone(),
+            jail_options,
             sock: js_sock,
         };
         let jobserver_ret_code = jobserver_main::jobserver_entry(js_arg);

src/minion/src/linux/jobserver/setup.rs

@@ -33,7 +33,7 @@ unsafe fn configure_dir(dir_path: &Path, uid: Uid) {
         err_exit("chmod");
     }
 
-    if libc::chown(path.clone().as_ptr(), uid, uid) == -1 {
+    if libc::chown(path.as_ptr(), uid, uid) == -1 {
         err_exit("chown");
     }
 }
@@ -67,7 +67,7 @@ fn expose_dir(
         if let DesiredAccess::Readonly = access {
             let rem_ret = libc::mount(
                 ptr::null(),
-                bind_target.clone().as_ptr(),
+                bind_target.as_ptr(),
                 ptr::null(),
                 libc::MS_BIND | libc::MS_REMOUNT | libc::MS_RDONLY,
                 ptr::null(),
@@ -199,13 +199,7 @@ unsafe fn setup_procfs(jail_options: &JailOptions) {
     }
     let proc = CString::new("proc").unwrap();
     let targ = CString::new(procfs_path.as_os_str().as_bytes()).unwrap();
-    let mret = libc::mount(
-        proc.clone().as_ptr(),
-        targ.clone().as_ptr(),
-        proc.clone().as_ptr(),
-        0,
-        ptr::null(),
-    );
+    let mret = libc::mount(proc.as_ptr(), targ.as_ptr(), proc.as_ptr(), 0, ptr::null());
     if -1 == mret {
         err_exit("mount")
     }