tree-wide: drop redundant clones

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2021-12-30 13:20:03 +01:00
parent 0a7f902e2a
commit aa174e8e8a
12 changed files with 24 additions and 26 deletions

View File

@ -150,7 +150,7 @@ pub fn openid_login(
};
let user_id = Userid::try_from(format!("{}@{}", unique_name, realm))?;
tested_username = Some(unique_name.to_string());
tested_username = Some(unique_name);
if !user_info.is_active_user_id(&user_id) {
if config.autocreate.unwrap_or(false) {
@ -246,8 +246,7 @@ fn openid_auth_url(
let open_id = openid_authenticator(&config, &redirect_url)?;
let url = open_id.authorize_url(PROXMOX_BACKUP_RUN_DIR_M!(), &realm)?
.to_string();
let url = open_id.authorize_url(PROXMOX_BACKUP_RUN_DIR_M!(), &realm)?;
Ok(url.into())
}

View File

@ -969,7 +969,7 @@ pub fn prune_datastore(
auth_id.to_string(),
to_stdout,
move |worker| crate::server::prune_datastore(
worker.clone(),
worker,
auth_id,
prune_options,
&store,

View File

@ -1179,7 +1179,6 @@ fn restore_chunk_archive<'a>(
let mut decoder = ChunkArchiveDecoder::new(reader);
let datastore2 = datastore.clone();
let start_time = std::time::SystemTime::now();
let bytes = Arc::new(std::sync::atomic::AtomicU64::new(0));
let bytes2 = bytes.clone();
@ -1190,7 +1189,7 @@ fn restore_chunk_archive<'a>(
"tape restore chunk writer",
4,
move |(chunk, digest): (DataBlob, [u8; 32])| {
let chunk_exists = datastore2.cond_touch_chunk(&digest, false)?;
let chunk_exists = datastore.cond_touch_chunk(&digest, false)?;
if !chunk_exists {
if verbose {
task_log!(worker2, "Insert chunk: {}", hex::encode(&digest));
@ -1202,7 +1201,7 @@ fn restore_chunk_archive<'a>(
chunk.decode(None, Some(&digest))?; // verify digest
}
datastore2.insert_chunk(&chunk, &digest)?;
datastore.insert_chunk(&chunk, &digest)?;
} else if verbose {
task_log!(worker2, "Found existing chunk: {}", hex::encode(&digest));
}

View File

@ -421,7 +421,7 @@ async fn run() -> Result<(), Error> {
if !avoid_init {
let backup_user = pbs_config::backup_user()?;
let file_opts = CreateOptions::new().owner(backup_user.uid).group(backup_user.gid);
proxmox_rest_server::init_worker_tasks(pbs_buildcfg::PROXMOX_BACKUP_LOG_DIR_M!().into(), file_opts.clone())?;
proxmox_rest_server::init_worker_tasks(pbs_buildcfg::PROXMOX_BACKUP_LOG_DIR_M!().into(), file_opts)?;
let mut commando_sock = proxmox_rest_server::CommandSocket::new(proxmox_rest_server::our_ctrl_sock(), backup_user.gid);
proxmox_rest_server::register_task_control_commands(&mut commando_sock)?;
@ -456,7 +456,7 @@ fn get_remote(param: &HashMap<String, String>) -> Option<String> {
.or_else(|| {
if let Some(id) = param.get("id") {
if let Ok(job) = get_sync_job(id) {
return Some(job.remote.clone());
return Some(job.remote);
}
}
None
@ -483,7 +483,7 @@ fn get_remote_store(param: &HashMap<String, String>) -> Option<(String, String)>
let store = param
.get("remote-store")
.map(|r| r.to_owned())
.or_else(|| job.map(|job| job.remote_store.clone()));
.or_else(|| job.map(|job| job.remote_store));
if let Some(store) = store {
return Some((remote, store))

View File

@ -109,8 +109,8 @@ fn test_media_set_simple() -> Result<(), Error> {
let tape1_uuid = inventory.generate_used_tape("tape1", sl1.clone(), 0);
let tape2_uuid = inventory.generate_used_tape("tape2", sl2.clone(), 0);
let tape3_uuid = inventory.generate_used_tape("tape3", sl3.clone(), 0);
let tape2_uuid = inventory.generate_used_tape("tape2", sl2, 0);
let tape3_uuid = inventory.generate_used_tape("tape3", sl3, 0);
// generate incomplete media set in pool p2
let sl4 = MediaSetLabel::with_data("p2", Uuid::generate(), 1, ctime + 40, None);
@ -134,9 +134,9 @@ fn test_media_set_simple() -> Result<(), Error> {
let media_list = media_set.media_list();
assert_eq!(media_list.len(), 3);
assert_eq!(media_list[0], Some(tape1_uuid.clone()));
assert_eq!(media_list[1], Some(tape2_uuid.clone()));
assert_eq!(media_list[2], Some(tape3_uuid.clone()));
assert_eq!(media_list[0], Some(tape1_uuid));
assert_eq!(media_list[1], Some(tape2_uuid));
assert_eq!(media_list[2], Some(tape3_uuid));
// test media set start time
assert_eq!(inventory.media_set_start_time(&sl1.uuid), Some(ctime + 10));
@ -150,7 +150,7 @@ fn test_media_set_simple() -> Result<(), Error> {
assert_eq!(media_list.len(), 2);
assert_eq!(media_list[0], None);
assert_eq!(media_list[1], Some(tape4_uuid.clone()));
assert_eq!(media_list[1], Some(tape4_uuid));
// start time for incomplete set must be None
assert_eq!(inventory.media_set_start_time(&sl4.uuid), None);