language-servers/slint
1
0
Fork 0
mirror of https://github.com/slint-ui/slint.git synced 2025-08-04 18:58:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Node.js: Avoid unnecessary cloning of Type

Browse source 
There's no need to consume the Type in the value conversion.
This commit is contained in:
Simon Hausmann 2024-02-07 16:51:17 +01:00 • committed by Simon Hausmann
parent 2d6edfbd6c
commit 1055f22ac4
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
api/node/src/interpreter/component_instance.rs
View file

@ -57,7 +57,7 @@ impl JsComponentInstance {
})?;
self.inner
.set_property(&prop_name, super::value::to_value(&env, js_value, ty)?)
.set_property(&prop_name, super::value::to_value(&env, js_value, &ty)?)
.map_err(|e| Error::from_reason(format!("{e}")))?;
Ok(())
@ -105,7 +105,7 @@ impl JsComponentInstance {
.set_global_property(
global_name.as_str(),
&prop_name,
super::value::to_value(&env, js_value, ty)?,
super::value::to_value(&env, js_value, &ty)?,
)
.map_err(|e| Error::from_reason(format!("{e}")))?;
@ -151,7 +151,7 @@ impl JsComponentInstance {
.unwrap();
if let Some(return_type) = &return_type {
super::to_value(&env, result, *(*return_type).clone()).unwrap()
super::to_value(&env, result, return_type).unwrap()
} else {
Value::Void
}
@ -206,7 +206,7 @@ impl JsComponentInstance {
.unwrap();
if let Some(return_type) = &return_type {
super::to_value(&env, result, *(*return_type).clone()).unwrap()
super::to_value(&env, result, return_type).unwrap()
} else {
Value::Void
}
@ -244,7 +244,7 @@ impl JsComponentInstance {
let args = arguments
.into_iter()
.zip(args.into_iter())
.map(|(a, ty)| super::value::to_value(&env, a, ty))
.map(|(a, ty)| super::value::to_value(&env, a, &ty))
.collect::<Result<Vec<_>, _>>()?;
if args.len() != count {
return Err(napi::Error::from_reason(
@ -301,7 +301,7 @@ impl JsComponentInstance {
let args = arguments
.into_iter()
.zip(args.into_iter())
.map(|(a, ty)| super::value::to_value(&env, a, ty))
.map(|(a, ty)| super::value::to_value(&env, a, &ty))
.collect::<Result<Vec<_>, _>>()?;
if args.len() != count {
return Err(napi::Error::from_reason(

6
api/node/src/interpreter/value.rs
View file

@ -84,7 +84,7 @@ pub fn to_js_unknown(env: &Env, value: &Value) -> Result<JsUnknown> {
}
}
pub fn to_value(env: &Env, unknown: JsUnknown, typ: Type) -> Result<Value> {
pub fn to_value(env: &Env, unknown: JsUnknown, typ: &Type) -> Result<Value> {
match typ {
Type::Float32
| Type::Int32
@ -230,7 +230,7 @@ pub fn to_value(env: &Env, unknown: JsUnknown, typ: Type) -> Result<Value> {
js_object.get_property(
env.create_string(&pro_name.replace('-', "_"))?,
)?,
pro_ty.clone(),
pro_ty,
)?,
))
})
@ -243,7 +243,7 @@ pub fn to_value(env: &Env, unknown: JsUnknown, typ: Type) -> Result<Value> {
let mut vec = vec![];
for i in 0..array.len() {
vec.push(to_value(env, array.get(i)?.unwrap(), *a.to_owned())?);
vec.push(to_value(env, array.get(i)?.unwrap(), a)?);
}
Ok(Value::Model(ModelRc::new(SharedVectorModel::from(SharedVector::from_slice(
&vec,

2
api/node/src/types/model.rs
View file

@ -75,7 +75,7 @@ impl Model for JsModel {
if res.get_type().unwrap() == ValueType::Undefined {
None
} else {
to_value(&self.env, res, self.data_type.clone()).ok()
to_value(&self.env, res, &self.data_type).ok()
}
})
}