11extern crate libfonthelper;
22
3- use neon:: { prelude:: * , task:: Task } ;
43use libfonthelper:: { get_fonts, types:: FontMap } ;
4+ use neon:: { prelude:: * , task:: Task } ;
55
66struct 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-
5857pub 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+ }
0 commit comments