Skip to content

Commit 87d1514

Browse files
committed
toil: Formatting recommendations
1 parent 515b251 commit 87d1514

File tree

2 files changed

+34
-31
lines changed

2 files changed

+34
-31
lines changed

src/lib.rs

+31-25
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,11 @@ impl<'a> Config<'a> {
5555
let zone = &args[2];
5656
let record = &args[3];
5757

58-
Ok(Config { zone_id, zone, record })
58+
Ok(Config {
59+
zone_id,
60+
zone,
61+
record,
62+
})
5963
}
6064
}
6165

@@ -177,18 +181,19 @@ async fn get_current_record(
177181
},
178182
})
179183
.with_context(cx)
180-
.await {
181-
Ok(records) => {
182-
if records.result.len() == 1 {
183-
Some(records.result[0].id.clone())
184-
} else {
185-
panic!("Unable to lookup address for: {}", record_name)
186-
}
187-
}
188-
Err(e) => {
189-
handle_cf_error(&e).await;
190-
None
184+
.await
185+
{
186+
Ok(records) => {
187+
if records.result.len() == 1 {
188+
Some(records.result[0].id.clone())
189+
} else {
190+
panic!("Unable to lookup address for: {}", record_name)
191191
}
192+
}
193+
Err(e) => {
194+
handle_cf_error(&e).await;
195+
None
196+
}
192197
}
193198
}
194199

@@ -231,13 +236,14 @@ async fn update_record(
231236
},
232237
})
233238
.with_context(cx)
234-
.await {
235-
Ok(_) => Some(()),
236-
Err(e) => {
237-
handle_cf_error(&e).await;
238-
None
239-
}
239+
.await
240+
{
241+
Ok(_) => Some(()),
242+
Err(e) => {
243+
handle_cf_error(&e).await;
244+
None
240245
}
246+
}
241247
}
242248

243249
async fn create_cf_api_client(client: &VaultClient) -> CFClient {
@@ -351,12 +357,13 @@ async fn create_vault_client() -> Result<VaultClient, ClientError> {
351357
let role = "cf-dyn-dns-secret-reader";
352358
match login(&vault_client, mount, role, &jwt)
353359
.with_context(cx.clone())
354-
.await {
355-
Ok(response) => {
356-
vault_client.set_token(&response.client_token);
357-
Ok(vault_client)
358-
}
359-
Err(e) => Err(e),
360+
.await
361+
{
362+
Ok(response) => {
363+
vault_client.set_token(&response.client_token);
364+
Ok(vault_client)
365+
}
366+
Err(e) => Err(e),
360367
}
361368
}
362369

@@ -375,7 +382,6 @@ fn init_tracer() -> Result<sdktrace::Tracer, TraceError> {
375382
pub async fn run(
376383
config: Config<'_>,
377384
) -> Result<(), Box<dyn std::error::Error + Send + Sync + 'static>> {
378-
379385
loop {
380386
let tracer = init_tracer()?;
381387
let span = tracer.start("root");

src/main.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
extern crate env_logger;
22

3-
use std::{env, io::Write, process};
43
use chrono::Local;
4+
use dns_record_update::{Config, LogMessage};
55
use env_logger::Builder;
66
use log::{error, LevelFilter};
7-
use dns_record_update::{Config, LogMessage};
7+
use std::{env, io::Write, process};
88

99
#[tokio::main]
1010
async fn main() {
@@ -20,10 +20,7 @@ async fn main() {
2020
loglevel: record.level().to_string(),
2121
message: record.args().to_string(),
2222
};
23-
writeln!(buf,
24-
"{}",
25-
serde_json::to_string(&log_message).unwrap()
26-
)
23+
writeln!(buf, "{}", serde_json::to_string(&log_message).unwrap())
2724
})
2825
.filter(None, LevelFilter::Warn)
2926
.init();

0 commit comments

Comments
 (0)