updated dependencies

Author: Heliozoa

Cargo.lock

@@ -10,7 +10,7 @@ exclude = ["index.node"]
 crate-type = ["cdylib"]
 
 [dependencies.neon]
-version = "0.9.1"
+version = "0.10.0"
 default-features = false
 features = ["napi-6", "default-panic-hook"]
 

bindings/tmc-langs-node/Cargo.toml

@@ -5,6 +5,7 @@
 use crate::error::Error as LibError;
 use crate::error::Result as LibResult;
 use neon::prelude::*;
+use neon::types::buffer::TypedArray;
 use serde::de::Visitor;
 use serde::de::{
     DeserializeOwned, DeserializeSeed, EnumAccess, MapAccess, SeqAccess, Unexpected, VariantAccess,
@@ -104,10 +105,7 @@ impl<'x, 'd, 'a, 'j, C: Context<'j>> serde::de::Deserializer<'x>
                     len
                 )));
             }
-            let key = prop_names
-                .get(self.cx, 0)?
-                .downcast::<JsString, _>(self.cx)
-                .or_throw(self.cx)?;
+            let key: Handle<JsString> = prop_names.get(self.cx, 0)?;
             let enum_value = val.get(self.cx, key)?;
             let key = key.value(self.cx);
             visitor.visit_enum(JsEnumAccess::new(self.cx, key, Some(enum_value)))
@@ -125,7 +123,7 @@ impl<'x, 'd, 'a, 'j, C: Context<'j>> serde::de::Deserializer<'x>
             .input
             .downcast::<JsBuffer, _>(self.cx)
             .or_throw(self.cx)?;
-        let copy = self.cx.borrow(&buff, |buff| Vec::from(buff.as_slice()));
+        let copy = buff.as_slice(self.cx).to_vec();
         visitor.visit_bytes(&copy)
     }
 
@@ -137,7 +135,7 @@ impl<'x, 'd, 'a, 'j, C: Context<'j>> serde::de::Deserializer<'x>
             .input
             .downcast::<JsBuffer, _>(self.cx)
             .or_throw(self.cx)?;
-        let copy = self.cx.borrow(&buff, |buff| Vec::from(buff.as_slice()));
+        let copy = buff.as_slice(self.cx).to_vec();
         visitor.visit_byte_buf(copy)
     }
 
@@ -246,7 +244,7 @@ impl<'x, 'a, 'j, C: Context<'j>> MapAccess<'x> for JsObjectAccess<'a, 'j, C> {
         if self.idx >= self.len {
             return Err(LibError::ArrayIndexOutOfBounds(self.len, self.idx));
         }
-        let prop_name = self.prop_names.get(self.cx, self.idx)?;
+        let prop_name: Handle<JsString> = self.prop_names.get(self.cx, self.idx)?;
         let value = self.input.get(self.cx, prop_name)?;
 
         self.idx += 1;

bindings/tmc-langs-node/src/de.rs

@@ -5,6 +5,7 @@
 use crate::error::Error;
 use crate::error::Result as LibResult;
 use neon::prelude::*;
+use neon::types::buffer::TypedArray;
 use serde::ser::{self, Serialize};
 use std::marker::PhantomData;
 
@@ -152,9 +153,8 @@ where
     }
 
     fn serialize_bytes(self, v: &[u8]) -> Result<Self::Ok, Self::Error> {
-        let mut buff = JsBuffer::new(self.cx, v.len() as u32)?;
-        self.cx
-            .borrow_mut(&mut buff, |buff| buff.as_mut_slice().clone_from_slice(v));
+        let mut buff = JsBuffer::new(self.cx, v.len())?;
+        buff.as_mut_slice(self.cx).clone_from_slice(v);
         Ok(buff.upcast())
     }
 

bindings/tmc-langs-node/src/ser.rs

@@ -30,7 +30,7 @@ walkdir = "2.3.2"
 
 [dev-dependencies]
 dotenv = "0.15.0"
-mockito = "0.30.0"
+mockito = "0.31.0"
 simple_logger = "2.1.0"
 
 [features]

tmc-client/Cargo.toml

@@ -1,7 +1,7 @@
 //! Create clap app
 
 use anyhow::Context;
-use clap::{AppSettings, Parser};
+use clap::Parser;
 use schemars::JsonSchema;
 use std::{path::PathBuf, str::FromStr};
 use tmc_langs::{
@@ -18,7 +18,8 @@ use tmc_langs::{
     version,
     author,
     about,
-    setting = AppSettings::SubcommandRequiredElseHelp,
+    subcommand_required(true),
+    arg_required_else_help(true)
 )]
 pub struct Opt {
     /// Pretty-prints all output
@@ -225,7 +226,7 @@ pub enum Command {
 
 /// Various commands that communicate with the TMC server
 #[derive(Parser)]
-#[clap(setting = AppSettings::SubcommandRequiredElseHelp)]
+#[clap(subcommand_required(true), arg_required_else_help(true))]
 pub enum Core {
     /// Checks for updates to any exercises that exist locally.
     #[clap(long_about = schema_leaked::<Vec<UpdatedExercise>>())]
@@ -484,7 +485,7 @@ pub enum Core {
 
 /// Configure the CLI
 #[derive(Parser)]
-#[clap(setting = AppSettings::SubcommandRequiredElseHelp)]
+#[clap(subcommand_required(true), arg_required_else_help(true))]
 pub enum Settings {
     /// Retrieves a value from the settings
     Get {

tmc-langs-cli/src/app.rs

@@ -366,7 +366,7 @@ fn run_app(matches: Opt) -> Result<()> {
             for value in &tmc_param {
                 let params: Vec<_> = value.split('=').collect();
                 if params.len() != 2 {
-                    app::Opt::into_app()
+                    app::Opt::command()
                         .error(
                             ErrorKind::ValueValidation,
                             "tmc-param values should contain a single '=' as a delimiter.",

tmc-langs-cli/src/lib.rs

@@ -39,15 +39,14 @@ ts-rs = { git = "https://github.com/Heliozoa/ts-rs/", rev = "83650073943c33ccab7
 url = "2.2.2"
 walkdir = "2.3.2"
 zip = "0.5.13"
-# +zstd.1.4.9 match Ubuntu 21.04's libzstd
-zstd = "=0.8.0"
+zstd = "0.10.0"
 
 [target.'cfg(unix)'.dependencies]
 nix = "0.23.1"
 
 [dev-dependencies]
 chrono = "0.4.19"
-mockito = "0.30.0"
+mockito = "0.31.0"
 simple_logger = "2.1.0"
 tempfile = "3.3.0"
 

tmc-langs/Cargo.toml

@@ -8,4 +8,4 @@ rust-version = "1.58.1"
 
 [dependencies]
 serde_json = "1.0.78"
-mockito = "0.30.0"
+mockito = "0.31.0"