Is it possible to make this function more readable? - rust

Question

I have this function:
fn init_clients() -> (upload_executor::Executor, download_executor::Executor) {
let client_fs = if USE_CLOUD {
None
} else {
Some(Arc::new(adapter_fs::Client::new(".")))
};
let client_cloud = if USE_CLOUD {
Some(Arc::new(
adapter_s3::Client::new(
"https://s3.region.aws.com",
"region",
"bucket_name",
"KEY_ID",
"KEY_SECRET",
)
.unwrap(),
))
} else {
None
};
let client = match USE_CLOUD {
true => client_cloud
.as_ref()
.map(|o| o.clone() as Arc<dyn AdapterTrait>)
.unwrap(),
false => client_fs
.as_ref()
.map(|o| o.clone() as Arc<dyn AdapterTrait>)
.unwrap(),
};
let upload_executor = upload_executor::Executor::new(client.clone());
let download_executor = download_executor::Executor::new(client);
(upload_executor, download_executor)
}
I would like to know how to make it more readable, like:
let upload_client: TraitA + TraitB = if USE_CLOUD {
upload_client = fs::new()
} else {
upload_client = s3::new()
}
Is it possible?

Answer 1

If you merged the sections together you could create something like this. Also keep in mind that I haven't checked this in an IDE so I am not completely sure if I correctly converted to an anonymous trait.
fn init_s3_client() -> Arc<adapter_s3::Client> {
let client = adapter_s3::Client::new(
"https://s3.region.aws.com",
"region",
"bucket_name",
"KEY_ID",
"KEY_SECRET");
match client {
Ok(x) => Arc::new(x),
Err(err) => panic!("Failed to create s3 client: {:?}", err),
}
}
fn init_clients() -> (upload_executor::Executor, download_executor::Executor) {
let client = match USE_CLOUD {
true => init_s3_client() as Arc<dyn AdapterTrait>,
false => Arc::new(adapter_fs::Client::new(".")) as Arc<dyn AdapterTrait>,
};
let upload_executor = upload_executor::Executor::new(client.clone());
let download_executor = download_executor::Executor::new(client);
(upload_executor, download_executor)
}