Skip to content

Commit d0de9e4

Browse files
committed
Resolve Rust warnings
1 parent dbb741d commit d0de9e4

File tree

5 files changed

+72
-54
lines changed

5 files changed

+72
-54
lines changed

native/Cargo.lock

Lines changed: 30 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

native/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ name = "figma_linux_rust_binding"
2020
crate-type = ["dylib"]
2121

2222
[build-dependencies]
23-
neon-build = "0.3.1"
23+
neon-build = "0.3.3"
2424

2525
[dependencies]
26-
neon = "0.3.1"
26+
neon = "0.3.3"
2727
libfonthelper = "0.1.4"

native/src/async_font.rs

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
extern crate libfonthelper;
22

3-
use neon::{prelude::*, task::Task};
43
use libfonthelper::{get_fonts, types::FontMap};
4+
use neon::{prelude::*, task::Task};
55

66
struct Worker {
77
dirs: Vec<String>,
@@ -20,13 +20,13 @@ impl Task for Worker {
2020
}
2121

2222
fn complete(self, mut cx: TaskContext, result: Result<FontMap, String>) -> JsResult<JsObject> {
23-
let JsFonts = JsObject::new(&mut cx);
23+
let js_fonts = JsObject::new(&mut cx);
2424

2525
for (path, font) in result.unwrap() {
26-
let JsFontEnties = JsArray::new(&mut cx, font.len() as u32);
26+
let js_font_entries = JsArray::new(&mut cx, font.len() as u32);
2727

2828
for (index, entry) in font.iter().enumerate() {
29-
let JsFontEntry = JsObject::new(&mut cx);
29+
let js_font_entry = JsObject::new(&mut cx);
3030

3131
let id = cx.string(&entry.id);
3232
let postscript = cx.string(&entry.postscript);
@@ -36,25 +36,24 @@ impl Task for Worker {
3636
let stretch = cx.number(i32::from(entry.stretch));
3737
let italic = cx.boolean(entry.italic);
3838

39-
JsFontEntry.set(&mut cx, "id", id);
40-
JsFontEntry.set(&mut cx, "postscript", postscript);
41-
JsFontEntry.set(&mut cx, "family", family);
42-
JsFontEntry.set(&mut cx, "style", style);
43-
JsFontEntry.set(&mut cx, "weight", weight);
44-
JsFontEntry.set(&mut cx, "stretch", stretch);
45-
JsFontEntry.set(&mut cx, "italic", italic);
39+
js_font_entry.set(&mut cx, "id", id)?;
40+
js_font_entry.set(&mut cx, "postscript", postscript)?;
41+
js_font_entry.set(&mut cx, "family", family)?;
42+
js_font_entry.set(&mut cx, "style", style)?;
43+
js_font_entry.set(&mut cx, "weight", weight)?;
44+
js_font_entry.set(&mut cx, "stretch", stretch)?;
45+
js_font_entry.set(&mut cx, "italic", italic)?;
4646

47-
JsFontEnties.set(&mut cx, index.to_string().as_str(), JsFontEntry);
47+
js_font_entries.set(&mut cx, index.to_string().as_str(), js_font_entry)?;
4848
}
4949

50-
JsFonts.set(&mut cx, path.as_str(), JsFontEnties);
50+
js_fonts.set(&mut cx, path.as_str(), js_font_entries)?;
5151
}
5252

53-
Ok(JsFonts)
53+
Ok(js_fonts)
5454
}
5555
}
5656

57-
5857
pub fn fonts_async(mut cx: FunctionContext) -> JsResult<JsUndefined> {
5958
let dirs: Handle<JsArray> = cx.argument::<JsArray>(0)?;
6059
let callback = cx.argument::<JsFunction>(1)?;
@@ -63,16 +62,11 @@ pub fn fonts_async(mut cx: FunctionContext) -> JsResult<JsUndefined> {
6362
.to_vec(&mut cx)
6463
.unwrap()
6564
.iter()
66-
.map(|js_value| {
67-
js_value
68-
.downcast::<JsString>()
69-
.unwrap()
70-
.value()
71-
})
65+
.map(|js_value| js_value.downcast::<JsString>().unwrap().value())
7266
.collect();
7367

7468
let worker = Worker { dirs: arr };
7569
worker.schedule(callback);
7670

7771
Ok(cx.undefined())
78-
}
72+
}

package-lock.json

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
{
22
"name": "figma-linux-rust-binding",
3-
"version": "0.1.0",
3+
"version": "0.1.1",
44
"description": "Rust module that makes object of meta data of fonts",
5-
"main": "index.mjs",
5+
"main": "native/index.node",
66
"author": "ChugunovRoman <Zebs-BMK@yandex.ru>",
7+
"engines": {
8+
"node": ">=10.11.0"
9+
},
710
"repository": {
811
"type": "git",
912
"url": "https://github.com/ChugunovRoman/figma-linux-rust-binding.git"
@@ -20,13 +23,14 @@
2023
],
2124
"license": "GPL-2.0",
2225
"dependencies": {
23-
"neon-cli": "^0.3.1"
26+
"neon-cli": "^0.3.3"
2427
},
2528
"types": "index.d.ts",
2629
"deprecated": false,
2730
"scripts": {
2831
"install": "neon build --release",
2932
"start": "node --experimental-modules ./index.mjs",
30-
"build": "neon build"
33+
"build": "neon build",
34+
"release": "neon build --release"
3135
}
3236
}

0 commit comments

Comments
 (0)