proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-10-04 09:34:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

clippy/fmt: tree wide drop of clone for types implementing copy

Browse Source 
fixes the clippy warning on types T implementing Copy:
```
warning: using `clone` on type `T` which implements the `Copy` trait
```

followed by formatting fixups via `cargo fmt`.

Signed-off-by: Christian Ebner <c.ebner@proxmox.com>
This commit is contained in:
Christian Ebner 2025-03-20 14:38:27 +01:00 committed by Wolfgang Bumiller
parent 7c45cf8c7a
commit 3362a6e049
11 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pbs-config/src/config_version_cache.rs
View File

@ -101,7 +101,7 @@ impl ConfigVersionCache {
let file_path = Path::new(FILE_PATH);
let dir_path = file_path.parent().unwrap();
create_path(dir_path, Some(dir_opts.clone()), Some(dir_opts))?;
create_path(dir_path, Some(dir_opts), Some(dir_opts))?;
let file_opts = CreateOptions::new()
.perm(Mode::from_bits_truncate(0o660))

8
pbs-datastore/src/chunk_store.rs
View File

@ -109,7 +109,7 @@ impl ChunkStore {
let default_options = CreateOptions::new();
match create_path(&base, Some(default_options), Some(options.clone())) {
match create_path(&base, Some(default_options), Some(options)) {
Err(err) => bail!("unable to create chunk store '{name}' at {base:?} - {err}"),
Ok(res) => {
if !res {
@ -118,13 +118,13 @@ impl ChunkStore {
}
}
if let Err(err) = create_dir(&chunk_dir, options.clone()) {
if let Err(err) = create_dir(&chunk_dir, options) {
bail!("unable to create chunk store '{name}' subdir {chunk_dir:?} - {err}");
}
// create lock file with correct owner/group
let lockfile_path = Self::lockfile_path(&base);
proxmox_sys::fs::replace_file(lockfile_path, b"", options.clone(), false)?;
proxmox_sys::fs::replace_file(lockfile_path, b"", options, false)?;
// create 64*1024 subdirs
let mut last_percentage = 0;
@ -132,7 +132,7 @@ impl ChunkStore {
for i in 0..64 * 1024 {
let mut l1path = chunk_dir.clone();
l1path.push(format!("{:04x}", i));
if let Err(err) = create_dir(&l1path, options.clone()) {
if let Err(err) = create_dir(&l1path, options) {
bail!(
"unable to create chunk store '{}' subdir {:?} - {}",
name,

2
pbs-datastore/src/task_tracking.rs
View File

@ -47,7 +47,7 @@ fn open_lock_file(name: &str) -> Result<(std::fs::File, CreateOptions), Error> {
let timeout = std::time::Duration::new(10, 0);
Ok((
open_file_locked(lock_path, timeout, true, options.clone())?,
open_file_locked(lock_path, timeout, true, options)?,
options,
))
}

20
src/api2/admin/datastore.rs
View File

@ -2416,20 +2416,12 @@ fn setup_mounted_device(datastore: &DataStoreConfig, tmp_mount_path: &str) -> Re
.owner(backup_user.uid)
.group(backup_user.gid);
proxmox_sys::fs::create_path(
&mount_point,
Some(default_options.clone()),
Some(options.clone()),
)
.map_err(|e| format_err!("creating mountpoint '{mount_point}' failed: {e}"))?;
proxmox_sys::fs::create_path(&mount_point, Some(default_options), Some(options))
.map_err(|e| format_err!("creating mountpoint '{mount_point}' failed: {e}"))?;
// can't be created before it is mounted, so we have to do it here
proxmox_sys::fs::create_path(
&full_store_path,
Some(default_options.clone()),
Some(options.clone()),
)
.map_err(|e| format_err!("creating datastore path '{full_store_path}' failed: {e}"))?;
proxmox_sys::fs::create_path(&full_store_path, Some(default_options), Some(options))
.map_err(|e| format_err!("creating datastore path '{full_store_path}' failed: {e}"))?;
info!(
"bind mount '{}'({}) to '{}'",
@ -2468,8 +2460,8 @@ pub fn do_mount_device(datastore: DataStoreConfig) -> Result<(), Error> {
let default_options = proxmox_sys::fs::CreateOptions::new();
proxmox_sys::fs::create_path(
&tmp_mount_path,
Some(default_options.clone()),
Some(default_options.clone()),
Some(default_options),
Some(default_options),
)?;
info!("temporarily mounting '{uuid}' to '{}'", tmp_mount_path);

10
src/bin/proxmox-backup-api.rs
View File

@ -88,21 +88,21 @@ async fn run() -> Result<(), Error> {
.default_api2_handler(&proxmox_backup::api2::ROUTER)
.enable_access_log(
pbs_buildcfg::API_ACCESS_LOG_FN,
Some(dir_opts.clone()),
Some(file_opts.clone()),
Some(dir_opts),
Some(file_opts),
&mut command_sock,
)?
.enable_auth_log(
pbs_buildcfg::API_AUTH_LOG_FN,
Some(dir_opts.clone()),
Some(file_opts.clone()),
Some(dir_opts),
Some(file_opts),
&mut command_sock,
)?;
let rest_server = RestServer::new(config);
proxmox_rest_server::init_worker_tasks(
pbs_buildcfg::PROXMOX_BACKUP_LOG_DIR_M!().into(),
file_opts.clone(),
file_opts,
)?;
// http server future:

14
src/bin/proxmox-backup-proxy.rs
View File

@ -223,14 +223,14 @@ async fn run() -> Result<(), Error> {
config = config
.enable_access_log(
pbs_buildcfg::API_ACCESS_LOG_FN,
Some(dir_opts.clone()),
Some(file_opts.clone()),
Some(dir_opts),
Some(file_opts),
&mut command_sock,
)?
.enable_auth_log(
pbs_buildcfg::API_AUTH_LOG_FN,
Some(dir_opts.clone()),
Some(file_opts.clone()),
Some(dir_opts),
Some(file_opts),
&mut command_sock,
)?;
@ -238,7 +238,7 @@ async fn run() -> Result<(), Error> {
let redirector = Redirector::new();
proxmox_rest_server::init_worker_tasks(
pbs_buildcfg::PROXMOX_BACKUP_LOG_DIR_M!().into(),
file_opts.clone(),
file_opts,
)?;
//openssl req -x509 -newkey rsa:4096 -keyout /etc/proxmox-backup/proxy.key -out /etc/proxmox-backup/proxy.pem -nodes
@ -752,7 +752,7 @@ async fn schedule_task_log_rotate() {
true,
Some(max_files),
max_days,
Some(options.clone()),
Some(options),
)?;
if has_rotated {
@ -768,7 +768,7 @@ async fn schedule_task_log_rotate() {
pbs_buildcfg::API_ACCESS_LOG_FN,
true,
Some(max_files),
Some(options.clone()),
Some(options),
)?;
if logrotate.rotate(max_size)? {

2
src/bin/proxmox-daily-update.rs
View File

@ -95,7 +95,7 @@ async fn run(rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> {
.group(backup_user.gid);
proxmox_rest_server::init_worker_tasks(
pbs_buildcfg::PROXMOX_BACKUP_LOG_DIR_M!().into(),
file_opts.clone(),
file_opts,
)?;
let mut command_sock = proxmox_daemon::command_socket::CommandSocket::new(backup_user.gid);

4
src/bin/proxmox_backup_debug/inspect.rs
View File

@ -409,8 +409,8 @@ fn inspect_device(device: String, param: Value) -> Result<(), Error> {
let default_options = proxmox_sys::fs::CreateOptions::new();
proxmox_sys::fs::create_path(
&tmp_mount_path,
Some(default_options.clone()),
Some(default_options.clone()),
Some(default_options),
Some(default_options),
)?;
let mut mount_cmd = std::process::Command::new("mount");
mount_cmd.arg(device.clone());

7
src/config/tfa.rs
View File

@ -199,14 +199,15 @@ impl proxmox_tfa::api::OpenUserChallengeData for UserAccess {
fn open(&self, userid: &str) -> Result<Box<dyn UserChallengeAccess>, Error> {
crate::server::create_run_dir()?;
let options = CreateOptions::new().perm(Mode::from_bits_truncate(0o0600));
proxmox_sys::fs::create_path(CHALLENGE_DATA_PATH, Some(options.clone()), Some(options))
.map_err(|err| {
proxmox_sys::fs::create_path(CHALLENGE_DATA_PATH, Some(options), Some(options)).map_err(
|err| {
format_err!(
"failed to crate challenge data dir {:?}: {}",
CHALLENGE_DATA_PATH,
err
)
})?;
},
)?;
let path = challenge_data_path_str(userid);

2
src/server/jobstate.rs
View File

@ -87,7 +87,7 @@ pub fn create_jobstate_dir() -> Result<(), Error> {
.owner(backup_user.uid)
.group(backup_user.gid);
create_path(JOB_STATE_BASEDIR, Some(opts.clone()), Some(opts))
create_path(JOB_STATE_BASEDIR, Some(opts), Some(opts))
.map_err(|err: Error| format_err!("unable to create job state dir - {err}"))?;
Ok(())

2
src/tools/shared_rate_limiter.rs
View File

@ -80,7 +80,7 @@ impl SharedRateLimiter {
.owner(user.uid)
.group(user.gid);
create_path(&path, Some(dir_opts.clone()), Some(dir_opts))?;
create_path(&path, Some(dir_opts), Some(dir_opts))?;
path.push(name);