tyler
/
proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleanup: move use clause to top

This commit is contained in:
Dietmar Maurer 2021-09-30 08:40:55 +02:00
parent fd1b65cc3c
commit e64f77b716
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
proxmox-rest-server/src/daemon.rs
View File

@ -11,6 +11,7 @@ use std::path::PathBuf;
use anyhow::{bail, format_err, Error}; use anyhow::{bail, format_err, Error};
use futures::future::{self, Either}; use futures::future::{self, Either};
use nix::unistd::{fork, ForkResult};
use proxmox::tools::io::{ReadExt, WriteExt}; use proxmox::tools::io::{ReadExt, WriteExt};
use proxmox::tools::fd::Fd; use proxmox::tools::fd::Fd;
@ -25,8 +26,8 @@ extern "C" {
// Unfortunately FnBox is nightly-only and Box<FnOnce> is unusable, so just use Box<Fn>... // Unfortunately FnBox is nightly-only and Box<FnOnce> is unusable, so just use Box<Fn>...
type BoxedStoreFunc = Box<dyn FnMut() -> Result<String, Error> + UnwindSafe + Send>; type BoxedStoreFunc = Box<dyn FnMut() -> Result<String, Error> + UnwindSafe + Send>;
/// Helper trait to "store" something in the environment to be re-used after re-executing the // Helper trait to "store" something in the environment to be re-used after re-executing the
/// service on a reload. // service on a reload.
trait Reloadable: Sized { trait Reloadable: Sized {
fn restore(var: &str) -> Result<Self, Error>; fn restore(var: &str) -> Result<Self, Error>;
fn get_store_func(&self) -> Result<BoxedStoreFunc, Error>; fn get_store_func(&self) -> Result<BoxedStoreFunc, Error>;
@ -99,7 +100,6 @@ impl Reloader {
let (pold, pnew) = super::socketpair()?; let (pold, pnew) = super::socketpair()?;
// Start ourselves in the background: // Start ourselves in the background:
use nix::unistd::{fork, ForkResult};
match unsafe { fork() } { match unsafe { fork() } {
Ok(ForkResult::Child) => { Ok(ForkResult::Child) => {
// Double fork so systemd can supervise us without nagging... // Double fork so systemd can supervise us without nagging...