mirror of
https://github.com/denoland/deno.git
synced 2024-11-28 16:20:57 -05:00
chore: Update to Rust 1.50.0 (#9479)
This commit is contained in:
parent
146fb360c6
commit
54e53cc9ea
7 changed files with 11 additions and 8 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
@ -65,7 +65,7 @@ jobs:
|
||||||
- name: Install rust
|
- name: Install rust
|
||||||
uses: hecrj/setup-rust-action@v1
|
uses: hecrj/setup-rust-action@v1
|
||||||
with:
|
with:
|
||||||
rust-version: 1.49.0
|
rust-version: 1.50.0
|
||||||
|
|
||||||
- name: Install clippy and rustfmt
|
- name: Install clippy and rustfmt
|
||||||
if: matrix.kind == 'lint'
|
if: matrix.kind == 'lint'
|
||||||
|
|
|
@ -297,9 +297,9 @@ fn run_throughput(deno_exe: &PathBuf) -> Result<HashMap<String, f64>> {
|
||||||
let mut m = HashMap::<String, f64>::new();
|
let mut m = HashMap::<String, f64>::new();
|
||||||
|
|
||||||
m.insert("100M_tcp".to_string(), throughput::tcp(deno_exe, 100)?);
|
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_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)
|
Ok(m)
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,7 +11,7 @@ const MB: usize = 1024 * 1024;
|
||||||
const SERVER_ADDR: &str = "0.0.0.0:4544";
|
const SERVER_ADDR: &str = "0.0.0.0:4544";
|
||||||
const CLIENT_ADDR: &str = "127.0.0.1 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 size = megs * MB;
|
||||||
let shell_cmd = format!(
|
let shell_cmd = format!(
|
||||||
"{} run --allow-read cli/tests/cat.ts /dev/zero | head -c {}",
|
"{} 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 _ = test_util::run_collect(cmd, None, None, None, true);
|
||||||
let end = Instant::now();
|
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> {
|
pub(crate) fn tcp(deno_exe: &PathBuf, megs: usize) -> Result<f64> {
|
||||||
|
|
|
@ -1685,7 +1685,7 @@ impl Inner {
|
||||||
Some(Err(err)) => Err(LspError::invalid_params(err.to_string())),
|
Some(Err(err)) => Err(LspError::invalid_params(err.to_string())),
|
||||||
None => Err(LspError::invalid_params("Missing parameters")),
|
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) {
|
"deno/virtualTextDocument" => match params.map(serde_json::from_value) {
|
||||||
Some(Ok(params)) => Ok(Some(
|
Some(Ok(params)) => Ok(Some(
|
||||||
serde_json::to_value(self.virtual_text_document(params).await?)
|
serde_json::to_value(self.virtual_text_document(params).await?)
|
||||||
|
@ -1902,9 +1902,9 @@ impl Inner {
|
||||||
Ok(true)
|
Ok(true)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_performance(&self) -> LspResult<Option<Value>> {
|
fn get_performance(&self) -> Value {
|
||||||
let averages = self.performance.averages();
|
let averages = self.performance.averages();
|
||||||
Ok(Some(json!({ "averages": averages })))
|
json!({ "averages": averages })
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn virtual_text_document(
|
async fn virtual_text_document(
|
||||||
|
|
|
@ -1175,6 +1175,7 @@ fn respond(state: &mut State, args: Value) -> Result<Value, AnyError> {
|
||||||
Ok(json!(true))
|
Ok(json!(true))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::unnecessary_wraps)]
|
||||||
fn script_names(state: &mut State, _args: Value) -> Result<Value, AnyError> {
|
fn script_names(state: &mut State, _args: Value) -> Result<Value, AnyError> {
|
||||||
Ok(json!(state.state_snapshot.documents.open_specifiers()))
|
Ok(json!(state.state_snapshot.documents.open_specifiers()))
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,6 +36,7 @@ fn op_main_module(
|
||||||
Ok(json!(&main))
|
Ok(json!(&main))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::unnecessary_wraps)]
|
||||||
fn op_metrics(
|
fn op_metrics(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
_args: Value,
|
_args: Value,
|
||||||
|
|
|
@ -85,6 +85,7 @@ pub fn init(rt: &mut deno_core::JsRuntime) {
|
||||||
super::reg_json_sync(rt, "op_sleep_sync", op_sleep_sync);
|
super::reg_json_sync(rt, "op_sleep_sync", op_sleep_sync);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(clippy::unnecessary_wraps)]
|
||||||
fn op_global_timer_stop(
|
fn op_global_timer_stop(
|
||||||
state: &mut OpState,
|
state: &mut OpState,
|
||||||
_args: Value,
|
_args: Value,
|
||||||
|
|
Loading…
Reference in a new issue