Skip to content

Commit 7dbc8b3

Browse files
author
Amit Gold
committed
Implement clippy suggestions
1 parent 98d31d1 commit 7dbc8b3

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn config(
2525

2626
match action.as_enum() {
2727
ActionEnum::Add { from: key, to: value } => {
28-
let value = ::toml::Value::String(String::from(value));
28+
let value = ::toml::Value::String(value);
2929
info!("Inserting {} -> {:?}.", key, value);
3030
debug!("Before: {}", pretty_print(&parsed));
3131
if opt.act {

src/deploy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ fn substitute_variables(content: String, variables: &Table) -> String {
183183
value,
184184
);
185185
}
186-
content.to_string()
186+
content
187187
}
188188

189189
fn copy_if_changed(from: &Path, to: &Path) -> Result<(), ::std::io::Error> {

src/parse.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ where
1111
T: DeserializeOwned,
1212
{
1313
let mut buf = String::new();
14-
let mut f = File::open(filename).or_else(|_| { Err("open") })?;
15-
f.read_to_string(&mut buf).or_else(|_| { Err("read") })?;
16-
Ok(toml::from_str::<T>(&buf).or_else(|_| { Err("parse") })?)
14+
let mut f = File::open(filename).map_err(|_| "open")?;
15+
f.read_to_string(&mut buf).map_err(|_| "read")?;
16+
Ok(toml::from_str::<T>(&buf).map_err(|_| "parse")?)
1717
}
1818

1919
pub fn save_file<T>(filename: &Path, data: &T) -> Result<(), String>
2020
where
2121
T: Serialize,
2222
{
23-
let mut f = File::create(filename).or_else(|_| { Err("open") })?;
24-
let buf = toml::to_string(data).or_else(|_| { Err("serialize") })?;
25-
f.write(buf.as_bytes()).or_else(|_| { Err("write") })?;
23+
let mut f = File::create(filename).map_err(|_| "open")?;
24+
let buf = toml::to_string(data).map_err(|_| "serialize")?;
25+
f.write(buf.as_bytes()).map_err(|_| "write")?;
2626
Ok(())
2727
}

0 commit comments

Comments
 (0)