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

clippy: remove needless bool literals

Browse Source 
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2021-01-18 14:12:27 +01:00
parent 365915da9a
commit 397356096a
10 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -662,7 +662,7 @@ pub fn verify(
_ => bail!("parameters do not specify a backup group or snapshot"), _ => bail!("parameters do not specify a backup group or snapshot"),
} }
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
worker_type, worker_type,
@ -935,7 +935,7 @@ fn start_garbage_collection(
let job = Job::new("garbage_collection", &store) let job = Job::new("garbage_collection", &store)
.map_err(|_| format_err!("garbage collection already running"))?; .map_err(|_| format_err!("garbage collection already running"))?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let upid_str = crate::server::do_garbage_collection_job(job, datastore, &auth_id, None, to_stdout) let upid_str = crate::server::do_garbage_collection_job(job, datastore, &auth_id, None, to_stdout)
.map_err(|err| format_err!("unable to start garbage collection job on datastore {} - {}", store, err))?; .map_err(|err| format_err!("unable to start garbage collection job on datastore {} - {}", store, err))?;

4
src/api2/node/apt.rs
View File

@ -90,8 +90,8 @@ fn do_apt_update(worker: &WorkerTask, quiet: bool) -> Result<(), Error> {
type: bool, type: bool,
description: r#"Send notification mail about new package updates availanle to the description: r#"Send notification mail about new package updates availanle to the
email address configured for 'root@pam')."#, email address configured for 'root@pam')."#,
optional: true,
default: false, default: false,
optional: true,
}, },
quiet: { quiet: {
description: "Only produces output suitable for logging, omitting progress indicators.", description: "Only produces output suitable for logging, omitting progress indicators.",
@ -116,7 +116,7 @@ pub fn apt_update_database(
) -> Result<String, Error> { ) -> Result<String, Error> {
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
// FIXME: change to non-option in signature and drop below once we have proxmox-api-macro 0.2.3 // FIXME: change to non-option in signature and drop below once we have proxmox-api-macro 0.2.3
let quiet = quiet.unwrap_or(API_METHOD_APT_UPDATE_DATABASE_PARAM_DEFAULT_QUIET); let quiet = quiet.unwrap_or(API_METHOD_APT_UPDATE_DATABASE_PARAM_DEFAULT_QUIET);
let notify = notify.unwrap_or(API_METHOD_APT_UPDATE_DATABASE_PARAM_DEFAULT_NOTIFY); let notify = notify.unwrap_or(API_METHOD_APT_UPDATE_DATABASE_PARAM_DEFAULT_NOTIFY);

2
src/api2/node/disks.rs
View File

@ -138,7 +138,7 @@ pub fn initialize_disk(
rpcenv: &mut dyn RpcEnvironment, rpcenv: &mut dyn RpcEnvironment,
) -> Result<Value, Error> { ) -> Result<Value, Error> {
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;

2
src/api2/node/disks/directory.rs
View File

@ -132,7 +132,7 @@ pub fn create_datastore_disk(
rpcenv: &mut dyn RpcEnvironment, rpcenv: &mut dyn RpcEnvironment,
) -> Result<String, Error> { ) -> Result<String, Error> {
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;

2
src/api2/node/disks/zfs.rs
View File

@ -254,7 +254,7 @@ pub fn create_zpool(
rpcenv: &mut dyn RpcEnvironment, rpcenv: &mut dyn RpcEnvironment,
) -> Result<String, Error> { ) -> Result<String, Error> {
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;

2
src/api2/tape/backup.rs
View File

@ -87,7 +87,7 @@ pub fn backup(
// early check before starting worker // early check before starting worker
check_drive_exists(&drive_config, &pool_config.drive)?; check_drive_exists(&drive_config, &pool_config.drive)?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let eject_media = eject_media.unwrap_or(false); let eject_media = eject_media.unwrap_or(false);
let export_media_set = export_media_set.unwrap_or(false); let export_media_set = export_media_set.unwrap_or(false);

14
src/api2/tape/drive.rs
View File

@ -227,7 +227,7 @@ pub fn erase_media(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
"erase-media", "erase-media",
@ -268,7 +268,7 @@ pub fn rewind(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
"rewind-media", "rewind-media",
@ -354,7 +354,7 @@ pub fn label_media(
let (config, _digest) = config::drive::config()?; let (config, _digest) = config::drive::config()?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
"label-media", "label-media",
@ -590,7 +590,7 @@ pub fn clean_drive(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
"clean-drive", "clean-drive",
@ -717,7 +717,7 @@ pub fn update_inventory(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
"inventory-update", "inventory-update",
@ -819,7 +819,7 @@ pub fn barcode_label_media(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
"barcode-label-media", "barcode-label-media",
@ -997,7 +997,7 @@ pub fn catalog_media(
let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
"catalog-media", "catalog-media",

2
src/api2/tape/restore.rs
View File

@ -115,7 +115,7 @@ pub fn restore(
// early check before starting worker // early check before starting worker
check_drive_exists(&drive_config, &pool_config.drive)?; check_drive_exists(&drive_config, &pool_config.drive)?;
let to_stdout = if rpcenv.env_type() == RpcEnvironmentType::CLI { true } else { false }; let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI;
let upid_str = WorkerTask::new_thread( let upid_str = WorkerTask::new_thread(
"tape-restore", "tape-restore",

2
src/backup/verify.rs
View File

@ -342,7 +342,7 @@ pub fn verify_backup_dir_with_lock(
}; };
if let Some(filter) = filter { if let Some(filter) = filter {
if filter(&manifest) == false { if !filter(&manifest) {
task_log!( task_log!(
worker, worker,
"SKIPPED: verify {}:{} (recently verified)", "SKIPPED: verify {}:{} (recently verified)",

4
src/tape/pool_writer.rs
View File

@ -303,7 +303,7 @@ impl PoolWriter {
status.bytes_written += bytes_written; status.bytes_written += bytes_written;
let request_sync = if status.bytes_written >= COMMIT_BLOCK_SIZE { true } else { false }; let request_sync = status.bytes_written >= COMMIT_BLOCK_SIZE;
if !done || request_sync { if !done || request_sync {
status.commit()?; status.commit()?;
@ -361,7 +361,7 @@ impl PoolWriter {
(bytes_written as f64)/(1024.0*1024.0*elapsed), (bytes_written as f64)/(1024.0*1024.0*elapsed),
)); ));
let request_sync = if status.bytes_written >= COMMIT_BLOCK_SIZE { true } else { false }; let request_sync = status.bytes_written >= COMMIT_BLOCK_SIZE;
// register chunks in media_catalog // register chunks in media_catalog
status.catalog.start_chunk_archive(content_uuid, current_file_number)?; status.catalog.start_chunk_archive(content_uuid, current_file_number)?;