From 41c1a1799925bce2f48730ce3880f86f40e8577a Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 3 May 2022 09:43:04 +0200 Subject: [PATCH] router change made one level of rpcenv mut superfluous Created via `cargo fix`. see commit 47acc8dc8f68ed2c5db69b1678b479e05b0a3194 from proxmox-rs Signed-off-by: Thomas Lamprecht --- src/api2/access/acl.rs | 2 +- src/api2/access/domain.rs | 2 +- src/api2/access/user.rs | 8 ++++---- src/api2/admin/sync.rs | 2 +- src/api2/admin/traffic_control.rs | 2 +- src/api2/admin/verify.rs | 2 +- src/api2/config/access/openid.rs | 4 ++-- src/api2/config/access/tfa.rs | 2 +- src/api2/config/acme.rs | 4 ++-- src/api2/config/changer.rs | 4 ++-- src/api2/config/datastore.rs | 4 ++-- src/api2/config/drive.rs | 4 ++-- src/api2/config/media_pool.rs | 2 +- src/api2/config/remote.rs | 4 ++-- src/api2/config/sync.rs | 7 ++----- src/api2/config/tape_backup_job.rs | 4 ++-- src/api2/config/tape_encryption_keys.rs | 2 +- src/api2/config/traffic_control.rs | 4 ++-- src/api2/config/verify.rs | 4 ++-- src/api2/node/config.rs | 2 +- src/api2/node/network.rs | 2 +- src/api2/node/syslog.rs | 2 +- src/api2/node/tasks.rs | 4 ++-- src/api2/tape/backup.rs | 2 +- 24 files changed, 38 insertions(+), 41 deletions(-) diff --git a/src/api2/access/acl.rs b/src/api2/access/acl.rs index 6d4d4eb4..ee02846d 100644 --- a/src/api2/access/acl.rs +++ b/src/api2/access/acl.rs @@ -109,7 +109,7 @@ fn extract_acl_node_data( pub fn read_acl( path: Option, exact: bool, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id = rpcenv.get_auth_id().unwrap().parse()?; diff --git a/src/api2/access/domain.rs b/src/api2/access/domain.rs index a0c5ec88..e8274bd3 100644 --- a/src/api2/access/domain.rs +++ b/src/api2/access/domain.rs @@ -22,7 +22,7 @@ use pbs_api_types::BasicRealmInfo; } )] /// Authentication domain/realm index. -fn list_domains(mut rpcenv: &mut dyn RpcEnvironment) -> Result, Error> { +fn list_domains(rpcenv: &mut dyn RpcEnvironment) -> Result, Error> { let mut list = Vec::new(); list.push(serde_json::from_value(json!({ diff --git a/src/api2/access/user.rs b/src/api2/access/user.rs index 8a86d68f..4ea05248 100644 --- a/src/api2/access/user.rs +++ b/src/api2/access/user.rs @@ -56,7 +56,7 @@ fn new_user_with_tokens(user: User) -> UserWithTokens { pub fn list_users( include_tokens: bool, _info: &ApiMethod, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = pbs_config::user::config()?; @@ -179,7 +179,7 @@ pub fn create_user( }, )] /// Read user configuration data. -pub fn read_user(userid: Userid, mut rpcenv: &mut dyn RpcEnvironment) -> Result { +pub fn read_user(userid: Userid, rpcenv: &mut dyn RpcEnvironment) -> Result { let (config, digest) = pbs_config::user::config()?; let user = config.lookup("user", userid.as_str())?; rpcenv["digest"] = hex::encode(&digest).into(); @@ -417,7 +417,7 @@ pub fn read_token( userid: Userid, token_name: Tokenname, _info: &ApiMethod, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let (config, digest) = pbs_config::user::config()?; @@ -705,7 +705,7 @@ pub struct TokenApiEntry { pub fn list_tokens( userid: Userid, _info: &ApiMethod, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = pbs_config::user::config()?; diff --git a/src/api2/admin/sync.rs b/src/api2/admin/sync.rs index 93f6bd89..a0e14dd2 100644 --- a/src/api2/admin/sync.rs +++ b/src/api2/admin/sync.rs @@ -45,7 +45,7 @@ use crate::{ pub fn list_sync_jobs( store: Option, _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; diff --git a/src/api2/admin/traffic_control.rs b/src/api2/admin/traffic_control.rs index 872c79ff..671145cf 100644 --- a/src/api2/admin/traffic_control.rs +++ b/src/api2/admin/traffic_control.rs @@ -44,7 +44,7 @@ pub struct TrafficControlCurrentRate { )] /// Show current traffic for all traffic control rules. pub fn show_current_traffic( - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = pbs_config::traffic_control::config()?; diff --git a/src/api2/admin/verify.rs b/src/api2/admin/verify.rs index a0fbfafb..ebdf2d19 100644 --- a/src/api2/admin/verify.rs +++ b/src/api2/admin/verify.rs @@ -45,7 +45,7 @@ use crate::server::{ pub fn list_verification_jobs( store: Option, _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; diff --git a/src/api2/config/access/openid.rs b/src/api2/config/access/openid.rs index eb6cb8cb..78cf8620 100644 --- a/src/api2/config/access/openid.rs +++ b/src/api2/config/access/openid.rs @@ -30,7 +30,7 @@ use pbs_config::domains; /// List configured OpenId realms pub fn list_openid_realms( _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = domains::config()?; @@ -132,7 +132,7 @@ pub fn delete_openid_realm( /// Read the OpenID realm configuration pub fn read_openid_realm( realm: String, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let (domains, digest) = domains::config()?; diff --git a/src/api2/config/access/tfa.rs b/src/api2/config/access/tfa.rs index cecf0c9f..6390524b 100644 --- a/src/api2/config/access/tfa.rs +++ b/src/api2/config/access/tfa.rs @@ -38,7 +38,7 @@ const WEBAUTHN_ROUTER: Router = Router::new() )] /// Get the TFA configuration. pub fn get_webauthn_config( - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = match tfa::webauthn_config()? { Some(c) => c, diff --git a/src/api2/config/acme.rs b/src/api2/config/acme.rs index 79540f02..81455b47 100644 --- a/src/api2/config/acme.rs +++ b/src/api2/config/acme.rs @@ -519,7 +519,7 @@ fn modify_cfg_for_api(id: &str, ty: &str, data: &Value) -> PluginConfig { }, )] /// List ACME challenge plugins. -pub fn list_plugins(mut rpcenv: &mut dyn RpcEnvironment) -> Result, Error> { +pub fn list_plugins(rpcenv: &mut dyn RpcEnvironment) -> Result, Error> { let (plugins, digest) = plugin::config()?; rpcenv["digest"] = hex::encode(&digest).into(); Ok(plugins @@ -541,7 +541,7 @@ pub fn list_plugins(mut rpcenv: &mut dyn RpcEnvironment) -> Result Result { +pub fn get_plugin(id: String, rpcenv: &mut dyn RpcEnvironment) -> Result { let (plugins, digest) = plugin::config()?; rpcenv["digest"] = hex::encode(&digest).into(); diff --git a/src/api2/config/changer.rs b/src/api2/config/changer.rs index e0006857..15daaaf6 100644 --- a/src/api2/config/changer.rs +++ b/src/api2/config/changer.rs @@ -80,7 +80,7 @@ pub fn create_changer(config: ScsiTapeChanger) -> Result<(), Error> { pub fn get_config( name: String, _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let (config, digest) = pbs_config::drive::config()?; @@ -110,7 +110,7 @@ pub fn get_config( /// List changers pub fn list_changers( _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs index 09dda89f..28342c2c 100644 --- a/src/api2/config/datastore.rs +++ b/src/api2/config/datastore.rs @@ -44,7 +44,7 @@ use crate::server::jobstate; /// List all datastores pub fn list_datastores( _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = pbs_config::datastore::config()?; @@ -144,7 +144,7 @@ pub fn create_datastore( /// Read a datastore configuration. pub fn read_datastore( name: String, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let (config, digest) = pbs_config::datastore::config()?; diff --git a/src/api2/config/drive.rs b/src/api2/config/drive.rs index f24b7953..cfbf5b01 100644 --- a/src/api2/config/drive.rs +++ b/src/api2/config/drive.rs @@ -80,7 +80,7 @@ pub fn create_drive(config: LtoTapeDrive) -> Result<(), Error> { pub fn get_config( name: String, _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let (config, digest) = pbs_config::drive::config()?; @@ -110,7 +110,7 @@ pub fn get_config( /// List drives pub fn list_drives( _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; diff --git a/src/api2/config/media_pool.rs b/src/api2/config/media_pool.rs index 93886f51..daa0fd6d 100644 --- a/src/api2/config/media_pool.rs +++ b/src/api2/config/media_pool.rs @@ -56,7 +56,7 @@ pub fn create_pool(config: MediaPoolConfig) -> Result<(), Error> { }, )] /// List media pools -pub fn list_pools(mut rpcenv: &mut dyn RpcEnvironment) -> Result, Error> { +pub fn list_pools(rpcenv: &mut dyn RpcEnvironment) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; diff --git a/src/api2/config/remote.rs b/src/api2/config/remote.rs index a3ee6649..edf37b39 100644 --- a/src/api2/config/remote.rs +++ b/src/api2/config/remote.rs @@ -37,7 +37,7 @@ use pbs_config::CachedUserInfo; pub fn list_remotes( _param: Value, _info: &ApiMethod, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; @@ -120,7 +120,7 @@ pub fn create_remote(name: String, config: RemoteConfig, password: String) -> Re pub fn read_remote( name: String, _info: &ApiMethod, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let (config, digest) = pbs_config::remote::config()?; let data: RemoteWithoutPassword = config.lookup("remote", &name)?; diff --git a/src/api2/config/sync.rs b/src/api2/config/sync.rs index 946af567..cb87314c 100644 --- a/src/api2/config/sync.rs +++ b/src/api2/config/sync.rs @@ -81,7 +81,7 @@ pub fn check_sync_job_modify_access( /// List all sync jobs pub fn list_sync_jobs( _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; @@ -158,10 +158,7 @@ pub fn create_sync_job( }, )] /// Read a sync job configuration. -pub fn read_sync_job( - id: String, - mut rpcenv: &mut dyn RpcEnvironment, -) -> Result { +pub fn read_sync_job(id: String, rpcenv: &mut dyn RpcEnvironment) -> Result { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; diff --git a/src/api2/config/tape_backup_job.rs b/src/api2/config/tape_backup_job.rs index e32841c0..624bfb05 100644 --- a/src/api2/config/tape_backup_job.rs +++ b/src/api2/config/tape_backup_job.rs @@ -30,7 +30,7 @@ use pbs_config::CachedUserInfo; /// List all tape backup jobs pub fn list_tape_backup_jobs( _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; @@ -104,7 +104,7 @@ pub fn create_tape_backup_job( /// Read a tape backup job configuration. pub fn read_tape_backup_job( id: String, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let (config, digest) = pbs_config::tape_job::config()?; diff --git a/src/api2/config/tape_encryption_keys.rs b/src/api2/config/tape_encryption_keys.rs index 1e130da6..9dc4d26b 100644 --- a/src/api2/config/tape_encryption_keys.rs +++ b/src/api2/config/tape_encryption_keys.rs @@ -35,7 +35,7 @@ use pbs_config::tape_encryption_keys::{ pub fn list_keys( _param: Value, _info: &ApiMethod, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (key_map, digest) = load_key_configs()?; diff --git a/src/api2/config/traffic_control.rs b/src/api2/config/traffic_control.rs index 80164b01..fe6eebcc 100644 --- a/src/api2/config/traffic_control.rs +++ b/src/api2/config/traffic_control.rs @@ -28,7 +28,7 @@ use pbs_api_types::{ pub fn list_traffic_controls( _param: Value, _info: &ApiMethod, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let (config, digest) = pbs_config::traffic_control::config()?; @@ -91,7 +91,7 @@ pub fn create_traffic_control(config: TrafficControlRule) -> Result<(), Error> { pub fn read_traffic_control( name: String, _info: &ApiMethod, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let (config, digest) = pbs_config::traffic_control::config()?; let data: TrafficControlRule = config.lookup("rule", &name)?; diff --git a/src/api2/config/verify.rs b/src/api2/config/verify.rs index 3086ff25..46005d32 100644 --- a/src/api2/config/verify.rs +++ b/src/api2/config/verify.rs @@ -31,7 +31,7 @@ use pbs_config::CachedUserInfo; /// List all verification jobs pub fn list_verification_jobs( _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; @@ -120,7 +120,7 @@ pub fn create_verification_job( /// Read a verification job configuration. pub fn read_verification_job( id: String, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; diff --git a/src/api2/node/config.rs b/src/api2/node/config.rs index 64a2d1be..5fa25107 100644 --- a/src/api2/node/config.rs +++ b/src/api2/node/config.rs @@ -28,7 +28,7 @@ pub const ROUTER: Router = Router::new() }, )] /// Get the node configuration -pub fn get_node_config(mut rpcenv: &mut dyn RpcEnvironment) -> Result { +pub fn get_node_config(rpcenv: &mut dyn RpcEnvironment) -> Result { let (config, digest) = crate::config::node::config()?; rpcenv["digest"] = hex::encode(&digest).into(); Ok(config) diff --git a/src/api2/node/network.rs b/src/api2/node/network.rs index fd75d4de..5ecddf02 100644 --- a/src/api2/node/network.rs +++ b/src/api2/node/network.rs @@ -109,7 +109,7 @@ fn set_bond_slaves(iface: &mut Interface, slaves: Vec) -> Result<(), Err pub fn list_network_devices( _param: Value, _info: &ApiMethod, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let (config, digest) = network::config()?; let digest = hex::encode(&digest); diff --git a/src/api2/node/syslog.rs b/src/api2/node/syslog.rs index e0109e82..15d3c2d1 100644 --- a/src/api2/node/syslog.rs +++ b/src/api2/node/syslog.rs @@ -140,7 +140,7 @@ fn dump_journal( fn get_syslog( param: Value, _info: &ApiMethod, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result { let service = param["service"] .as_str() diff --git a/src/api2/node/tasks.rs b/src/api2/node/tasks.rs index a0c30cca..05fd4fe7 100644 --- a/src/api2/node/tasks.rs +++ b/src/api2/node/tasks.rs @@ -293,7 +293,7 @@ fn extract_upid(param: &Value) -> Result { }, )] /// Read task log. -async fn read_task_log(param: Value, mut rpcenv: &mut dyn RpcEnvironment) -> Result { +async fn read_task_log(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result { let upid = extract_upid(¶m)?; let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; @@ -463,7 +463,7 @@ pub fn list_tasks( typefilter: Option, statusfilter: Option>, param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; diff --git a/src/api2/tape/backup.rs b/src/api2/tape/backup.rs index 9a0c208a..e83ac1bc 100644 --- a/src/api2/tape/backup.rs +++ b/src/api2/tape/backup.rs @@ -79,7 +79,7 @@ fn check_backup_permission( /// List all tape backup jobs pub fn list_tape_backup_jobs( _param: Value, - mut rpcenv: &mut dyn RpcEnvironment, + rpcenv: &mut dyn RpcEnvironment, ) -> Result, Error> { let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; let user_info = CachedUserInfo::new()?; -- 2.39.2