diff options
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | cli/bench/main.rs | 4 | ||||
| -rw-r--r-- | cli/bench/throughput.rs | 4 | ||||
| -rw-r--r-- | cli/lsp/language_server.rs | 6 | ||||
| -rw-r--r-- | cli/lsp/tsc.rs | 1 | ||||
| -rw-r--r-- | runtime/ops/runtime.rs | 1 | ||||
| -rw-r--r-- | runtime/ops/timers.rs | 1 |
7 files changed, 11 insertions, 8 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe41c8163..8065a03a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -65,7 +65,7 @@ jobs: - name: Install rust uses: hecrj/setup-rust-action@v1 with: - rust-version: 1.49.0 + rust-version: 1.50.0 - name: Install clippy and rustfmt if: matrix.kind == 'lint' diff --git a/cli/bench/main.rs b/cli/bench/main.rs index 352c93010..d2823a02b 100644 --- a/cli/bench/main.rs +++ b/cli/bench/main.rs @@ -297,9 +297,9 @@ fn run_throughput(deno_exe: &PathBuf) -> Result<HashMap<String, f64>> { let mut m = HashMap::<String, f64>::new(); m.insert("100M_tcp".to_string(), throughput::tcp(deno_exe, 100)?); - m.insert("100M_cat".to_string(), throughput::cat(deno_exe, 100)?); + m.insert("100M_cat".to_string(), throughput::cat(deno_exe, 100)); m.insert("10M_tcp".to_string(), throughput::tcp(deno_exe, 10)?); - m.insert("10M_cat".to_string(), throughput::cat(deno_exe, 10)?); + m.insert("10M_cat".to_string(), throughput::cat(deno_exe, 10)); Ok(m) } diff --git a/cli/bench/throughput.rs b/cli/bench/throughput.rs index 6fd3972d1..83032e7a1 100644 --- a/cli/bench/throughput.rs +++ b/cli/bench/throughput.rs @@ -11,7 +11,7 @@ const MB: usize = 1024 * 1024; const SERVER_ADDR: &str = "0.0.0.0:4544"; const CLIENT_ADDR: &str = "127.0.0.1 4544"; -pub(crate) fn cat(deno_exe: &PathBuf, megs: usize) -> Result<f64> { +pub(crate) fn cat(deno_exe: &PathBuf, megs: usize) -> f64 { let size = megs * MB; let shell_cmd = format!( "{} run --allow-read cli/tests/cat.ts /dev/zero | head -c {}", @@ -25,7 +25,7 @@ pub(crate) fn cat(deno_exe: &PathBuf, megs: usize) -> Result<f64> { let _ = test_util::run_collect(cmd, None, None, None, true); let end = Instant::now(); - Ok((end - start).as_secs_f64()) + (end - start).as_secs_f64() } pub(crate) fn tcp(deno_exe: &PathBuf, megs: usize) -> Result<f64> { diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs index 7ae4de978..5b4ab0f99 100644 --- a/cli/lsp/language_server.rs +++ b/cli/lsp/language_server.rs @@ -1685,7 +1685,7 @@ impl Inner { Some(Err(err)) => Err(LspError::invalid_params(err.to_string())), None => Err(LspError::invalid_params("Missing parameters")), }, - "deno/performance" => self.get_performance(), + "deno/performance" => Ok(Some(self.get_performance())), "deno/virtualTextDocument" => match params.map(serde_json::from_value) { Some(Ok(params)) => Ok(Some( serde_json::to_value(self.virtual_text_document(params).await?) @@ -1902,9 +1902,9 @@ impl Inner { Ok(true) } - fn get_performance(&self) -> LspResult<Option<Value>> { + fn get_performance(&self) -> Value { let averages = self.performance.averages(); - Ok(Some(json!({ "averages": averages }))) + json!({ "averages": averages }) } async fn virtual_text_document( diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs index a66541dd2..9a5b94f85 100644 --- a/cli/lsp/tsc.rs +++ b/cli/lsp/tsc.rs @@ -1175,6 +1175,7 @@ fn respond(state: &mut State, args: Value) -> Result<Value, AnyError> { Ok(json!(true)) } +#[allow(clippy::unnecessary_wraps)] fn script_names(state: &mut State, _args: Value) -> Result<Value, AnyError> { Ok(json!(state.state_snapshot.documents.open_specifiers())) } diff --git a/runtime/ops/runtime.rs b/runtime/ops/runtime.rs index b80067031..4b81c579f 100644 --- a/runtime/ops/runtime.rs +++ b/runtime/ops/runtime.rs @@ -36,6 +36,7 @@ fn op_main_module( Ok(json!(&main)) } +#[allow(clippy::unnecessary_wraps)] fn op_metrics( state: &mut OpState, _args: Value, diff --git a/runtime/ops/timers.rs b/runtime/ops/timers.rs index d53a0c971..a00b04ed0 100644 --- a/runtime/ops/timers.rs +++ b/runtime/ops/timers.rs @@ -85,6 +85,7 @@ pub fn init(rt: &mut deno_core::JsRuntime) { super::reg_json_sync(rt, "op_sleep_sync", op_sleep_sync); } +#[allow(clippy::unnecessary_wraps)] fn op_global_timer_stop( state: &mut OpState, _args: Value, |