File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ bounded-static-derive-more = "0.1"
1717chrono = { version = " 0.4" , features = [" serde" ] }
1818cli-helpers = " 0.1"
1919csv = " 1"
20- ecmade = " 0.2 "
20+ ecmade = " 0.3 "
2121http = " 1"
2222indexmap = { version = " 2" , features = [" serde" ] }
2323log = " 0.4"
@@ -26,16 +26,16 @@ num-traits = "0.2"
2626plist = " 1"
2727regex = " 1"
2828reqwest = { version = " 0.13" , features = [" cookies" , " json" ] }
29- scraper = " 0.24 "
30- scraper-trail = { git = " https://github.com/travisbrown/scraper-trail.git " }
29+ scraper = " 0.25 "
30+ scraper-trail = " 0.1 "
3131serde = { version = " 1" , features = [" derive" ] }
3232serde-query = " 0.2"
33- serde-field-attributes = " 0.1 "
33+ serde-field-attributes = " 0.2 "
3434serde_json = { version = " 1" , features = [" preserve_order" ] }
35- swc_atoms = " 7 "
36- swc_common = " 15 "
37- swc_ecma_ast = " 16 "
38- swc_ecma_parser = " 25 "
35+ swc_atoms = " 9 "
36+ swc_common = " 18 "
37+ swc_ecma_ast = " 19 "
38+ swc_ecma_parser = " 32 "
3939thiserror = " 2"
4040tokio = { version = " 1" , features = [" macros" , " rt-multi-thread" ] }
4141url = " 2"
Original file line number Diff line number Diff line change @@ -24,7 +24,12 @@ pub enum Error {
2424pub fn expr_to_json ( expr : & Expr ) -> Result < Value , Error > {
2525 match expr {
2626 Expr :: Lit ( lit) => match lit {
27- Lit :: Str ( str) => Ok ( Value :: String ( str. value . as_str ( ) . to_string ( ) ) ) ,
27+ Lit :: Str ( str) => Ok ( Value :: String (
28+ str. value
29+ . as_str ( )
30+ . ok_or_else ( || Error :: InvalidLiteral ( lit. clone ( ) ) ) ?
31+ . to_string ( ) ,
32+ ) ) ,
2833 Lit :: Num ( num) => Ok ( Value :: Number (
2934 number_to_json_number ( num) . ok_or_else ( || Error :: InvalidNumber ( num. clone ( ) ) ) ?,
3035 ) ) ,
@@ -78,7 +83,7 @@ pub fn expr_to_json(expr: &Expr) -> Result<Value, Error> {
7883fn prop_name_to_str ( prop_name : & PropName ) -> Option < & str > {
7984 prop_name
8085 . as_str ( )
81- . map ( |str| str. value . as_str ( ) )
86+ . and_then ( |str| str. value . as_str ( ) )
8287 . or_else ( || prop_name. as_ident ( ) . map ( |ident| ident. sym . as_str ( ) ) )
8388}
8489
You can’t perform that action at this time.
0 commit comments