diff options
author | Lars Wirzenius <liw@liw.fi> | 2021-03-01 07:10:49 +0000 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2021-03-01 07:10:49 +0000 |
commit | bfa369b3d66f43ad39c8f3ad6e1c1ccd8b34ffcf (patch) | |
tree | 4b0f7f8b8a3171def6436c752da8cdc79b8e3b0f | |
parent | c0f84e55cd46c3ec1ef1ed1ceea0b6c39ef028c5 (diff) | |
parent | f907d1ce0fe66f72188ccfe11d090752c5775d25 (diff) | |
download | vmadm-bfa369b3d66f43ad39c8f3ad6e1c1ccd8b34ffcf.tar.gz |
Merge branch 'chore' into 'main'
fix: tidy up code based on suggestions from clippy
See merge request larswirzenius/vmadm!2
-rw-r--r-- | src/cloudinit.rs | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/cloudinit.rs b/src/cloudinit.rs index f1b56ce..2c521fd 100644 --- a/src/cloudinit.rs +++ b/src/cloudinit.rs @@ -129,17 +129,8 @@ impl Metadata { } fn cleanup_document(doc: &str) -> String { - let marker = "---\n"; - let doc = if doc.starts_with(marker) { - &doc[marker.len()..] - } else { - doc - }; - if doc.ends_with("\n") { - &doc[..doc.len() - 1] - } else { - doc - }; + let doc = doc.strip_prefix("---\n").or(Some(doc)).unwrap(); + let doc = doc.strip_suffix("\n").or(Some(doc)).unwrap(); doc.to_string() } @@ -160,7 +151,7 @@ impl Userdata { ssh_keys: Hostkeys::from(spec), runcmd: vec![ format!("python3 -c {}", quote(SCRIPT)), - format!("systemctl reload ssh"), + "systemctl reload ssh".to_string(), ], }) } |