diff options
author | Bartek IwaĆczuk <biwanczuk@gmail.com> | 2023-03-09 15:18:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-09 19:18:00 +0000 |
commit | bb07e230d1270da2a7c35c5dc277ea6129a2214a (patch) | |
tree | f36c5d77dbb09568fccc3886709a1a12eba29d96 /cli | |
parent | 8f207c0f3f3a43d77e0c88cfdc840b4b742b9708 (diff) |
chore: update Rust to 1.68.0 (#18102)
Diffstat (limited to 'cli')
-rw-r--r-- | cli/args/mod.rs | 9 | ||||
-rw-r--r-- | cli/napi/js_native_api.rs | 6 | ||||
-rw-r--r-- | cli/node/mod.rs | 1 | ||||
-rw-r--r-- | cli/tools/test.rs | 1 |
4 files changed, 5 insertions, 12 deletions
diff --git a/cli/args/mod.rs b/cli/args/mod.rs index 5f151d969..71cc4e218 100644 --- a/cli/args/mod.rs +++ b/cli/args/mod.rs @@ -261,19 +261,14 @@ impl TestOptions { } } -#[derive(Clone, Debug)] +#[derive(Clone, Default, Debug)] pub enum LintReporterKind { + #[default] Pretty, Json, Compact, } -impl Default for LintReporterKind { - fn default() -> Self { - LintReporterKind::Pretty - } -} - #[derive(Clone, Debug, Default)] pub struct LintOptions { pub rules: LintRulesConfig, diff --git a/cli/napi/js_native_api.rs b/cli/napi/js_native_api.rs index e79307714..ce598cc98 100644 --- a/cli/napi/js_native_api.rs +++ b/cli/napi/js_native_api.rs @@ -2408,14 +2408,14 @@ fn napi_set_element( fn napi_set_instance_data( env: *mut Env, data: *mut c_void, - finalize_cb: napi_finalize, + finalize_cb: Option<napi_finalize>, finalize_hint: *mut c_void, ) -> Result { let env = &mut *(env as *mut Env); let shared = env.shared_mut(); shared.instance_data = data; - shared.data_finalize = if !(finalize_cb as *const c_void).is_null() { - Some(finalize_cb) + shared.data_finalize = if finalize_cb.is_some() { + finalize_cb } else { None }; diff --git a/cli/node/mod.rs b/cli/node/mod.rs index e45694fd6..8a2f988e1 100644 --- a/cli/node/mod.rs +++ b/cli/node/mod.rs @@ -388,7 +388,6 @@ fn resolve_bin_entry_value<'a>( .as_object() .map(|o| { o.keys() - .into_iter() .map(|k| format!(" * npm:{pkg_nv}/{k}")) .collect::<Vec<_>>() }) diff --git a/cli/tools/test.rs b/cli/tools/test.rs index 9ca806fb0..1feb83ca3 100644 --- a/cli/tools/test.rs +++ b/cli/tools/test.rs @@ -672,7 +672,6 @@ fn abbreviate_test_error(js_error: &JsError) -> JsError { false } }) - .into_iter() .collect::<Vec<_>>(); frames.reverse(); js_error.frames = frames; |