summaryrefslogtreecommitdiff
path: root/cli/ops
diff options
context:
space:
mode:
authorKitson Kelly <me@kitsonkelly.com>2020-11-28 06:47:35 +1100
committerGitHub <noreply@github.com>2020-11-28 06:47:35 +1100
commite2858d0bbb13dae202e7da9ee7bbb81916349d1e (patch)
treec47084e73a9d4c7a852546374069b1aa176c3265 /cli/ops
parent40bf26b37d82c7a85c3d6a54947fc441eb5e6946 (diff)
chore: clippy future cleanups (#8514)
Diffstat (limited to 'cli/ops')
-rw-r--r--cli/ops/fs.rs12
-rw-r--r--cli/ops/process.rs6
2 files changed, 9 insertions, 9 deletions
diff --git a/cli/ops/fs.rs b/cli/ops/fs.rs
index 211404f39..865c5bcca 100644
--- a/cli/ops/fs.rs
+++ b/cli/ops/fs.rs
@@ -358,7 +358,7 @@ fn op_fstat_sync(
Ok(std_file) => std_file.metadata().map_err(AnyError::from),
Err(_) => Err(type_error("cannot stat this type of resource".to_string())),
})?;
- Ok(get_stat_json(metadata).unwrap())
+ Ok(get_stat_json(metadata))
}
async fn op_fstat_async(
@@ -377,7 +377,7 @@ async fn op_fstat_async(
Err(type_error("cannot stat this type of resource".to_string()))
}
})?;
- Ok(get_stat_json(metadata).unwrap())
+ Ok(get_stat_json(metadata))
}
#[derive(Deserialize)]
@@ -818,7 +818,7 @@ fn to_msec(maybe_time: Result<SystemTime, io::Error>) -> Value {
}
#[inline(always)]
-fn get_stat_json(metadata: std::fs::Metadata) -> Result<Value, AnyError> {
+fn get_stat_json(metadata: std::fs::Metadata) -> Value {
// Unix stat member (number types only). 0 if not on unix.
macro_rules! usm {
($member:ident) => {{
@@ -857,7 +857,7 @@ fn get_stat_json(metadata: std::fs::Metadata) -> Result<Value, AnyError> {
"blksize": usm!(blksize),
"blocks": usm!(blocks),
});
- Ok(json_val)
+ json_val
}
#[derive(Deserialize)]
@@ -882,7 +882,7 @@ fn op_stat_sync(
} else {
std::fs::metadata(&path)?
};
- get_stat_json(metadata)
+ Ok(get_stat_json(metadata))
}
async fn op_stat_async(
@@ -906,7 +906,7 @@ async fn op_stat_async(
} else {
std::fs::metadata(&path)?
};
- get_stat_json(metadata)
+ Ok(get_stat_json(metadata))
})
.await
.unwrap()
diff --git a/cli/ops/process.rs b/cli/ops/process.rs
index 026c6833e..60a6d5095 100644
--- a/cli/ops/process.rs
+++ b/cli/ops/process.rs
@@ -88,21 +88,21 @@ fn op_run(
}
// TODO: make this work with other resources, eg. sockets
- if run_args.stdin != "" {
+ if !run_args.stdin.is_empty() {
c.stdin(subprocess_stdio_map(run_args.stdin.as_ref())?);
} else {
let file = clone_file(state, run_args.stdin_rid)?;
c.stdin(file);
}
- if run_args.stdout != "" {
+ if !run_args.stdout.is_empty() {
c.stdout(subprocess_stdio_map(run_args.stdout.as_ref())?);
} else {
let file = clone_file(state, run_args.stdout_rid)?;
c.stdout(file);
}
- if run_args.stderr != "" {
+ if !run_args.stderr.is_empty() {
c.stderr(subprocess_stdio_map(run_args.stderr.as_ref())?);
} else {
let file = clone_file(state, run_args.stderr_rid)?;