diff options
Diffstat (limited to 'cli')
-rw-r--r-- | cli/deno_dir.rs | 2 | ||||
-rw-r--r-- | cli/diagnostics.rs | 8 | ||||
-rw-r--r-- | cli/flags.rs | 4 | ||||
-rw-r--r-- | cli/media_type.rs | 20 | ||||
-rw-r--r-- | cli/ops/fs.rs | 12 | ||||
-rw-r--r-- | cli/ops/process.rs | 6 |
6 files changed, 26 insertions, 26 deletions
diff --git a/cli/deno_dir.rs b/cli/deno_dir.rs index 5bc05f549..71c63361a 100644 --- a/cli/deno_dir.rs +++ b/cli/deno_dir.rs @@ -71,7 +71,7 @@ mod dirs { // The same code is used by the dirs crate unsafe fn fallback() -> Option<std::ffi::OsString> { let amt = match libc::sysconf(libc::_SC_GETPW_R_SIZE_MAX) { - n if n < 0 => 512 as usize, + n if n < 0 => 512_usize, n => n as usize, }; let mut buf = Vec::with_capacity(amt); diff --git a/cli/diagnostics.rs b/cli/diagnostics.rs index af2a63ad9..419d89a97 100644 --- a/cli/diagnostics.rs +++ b/cli/diagnostics.rs @@ -165,10 +165,10 @@ impl Serialize for DiagnosticCategory { S: Serializer, { let value = match self { - DiagnosticCategory::Warning => 0 as i32, - DiagnosticCategory::Error => 1 as i32, - DiagnosticCategory::Suggestion => 2 as i32, - DiagnosticCategory::Message => 3 as i32, + DiagnosticCategory::Warning => 0_i32, + DiagnosticCategory::Error => 1_i32, + DiagnosticCategory::Suggestion => 2_i32, + DiagnosticCategory::Message => 3_i32, }; Serialize::serialize(&value, serializer) } diff --git a/cli/flags.rs b/cli/flags.rs index fb489bbb5..5219471f2 100644 --- a/cli/flags.rs +++ b/cli/flags.rs @@ -2574,7 +2574,7 @@ mod tests { subcommand: DenoSubcommand::Run { script: "script.ts".to_string(), }, - seed: Some(250 as u64), + seed: Some(250_u64), v8_flags: Some(svec!["--random-seed=250"]), ..Flags::default() } @@ -2597,7 +2597,7 @@ mod tests { subcommand: DenoSubcommand::Run { script: "script.ts".to_string(), }, - seed: Some(250 as u64), + seed: Some(250_u64), v8_flags: Some(svec!["--expose-gc", "--random-seed=250"]), ..Flags::default() } diff --git a/cli/media_type.rs b/cli/media_type.rs index 8280c1180..6ccb3fca0 100644 --- a/cli/media_type.rs +++ b/cli/media_type.rs @@ -168,16 +168,16 @@ impl Serialize for MediaType { S: Serializer, { let value = match self { - MediaType::JavaScript => 0 as i32, - MediaType::JSX => 1 as i32, - MediaType::TypeScript => 2 as i32, - MediaType::Dts => 3 as i32, - MediaType::TSX => 4 as i32, - MediaType::Json => 5 as i32, - MediaType::Wasm => 6 as i32, - MediaType::TsBuildInfo => 7 as i32, - MediaType::SourceMap => 8 as i32, - MediaType::Unknown => 9 as i32, + MediaType::JavaScript => 0_i32, + MediaType::JSX => 1_i32, + MediaType::TypeScript => 2_i32, + MediaType::Dts => 3_i32, + MediaType::TSX => 4_i32, + MediaType::Json => 5_i32, + MediaType::Wasm => 6_i32, + MediaType::TsBuildInfo => 7_i32, + MediaType::SourceMap => 8_i32, + MediaType::Unknown => 9_i32, }; Serialize::serialize(&value, serializer) } 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)?; |