@@ -41,8 +41,7 @@ pub fn find_nodes(src: String, configs: Vec<JsValue>) -> Result<JsValue, JsError
4141 let doc = WasmDoc :: new ( src. clone ( ) , lang) ;
4242 let root = AstGrep :: doc ( doc) ;
4343 let sets = combined. find ( & root) ;
44- let ret: HashMap < _ , _ > = combined. scan ( & root, sets, false ) . matches . into_iter ( ) . map ( |( id, matches) | {
45- let rule = combined. get_rule ( id) ;
44+ let ret: HashMap < _ , _ > = combined. scan ( & root, sets, false ) . matches . into_iter ( ) . map ( |( rule, matches) | {
4645 let matches: Vec < _ > = matches. into_iter ( ) . map ( |m| {
4746 WasmMatch :: from_match ( m, rule)
4847 } ) . collect ( ) ;
@@ -71,12 +70,11 @@ pub fn fix_errors(src: String, configs: Vec<JsValue>) -> Result<String, JsError>
7170 let mut start = 0 ;
7271 let src: Vec < _ > = src. chars ( ) . collect ( ) ;
7372 let mut new_content = Vec :: < char > :: new ( ) ;
74- for ( idx , nm) in diffs {
73+ for ( rule , nm) in diffs {
7574 let range = nm. range ( ) ;
7675 if start > range. start {
7776 continue ;
7877 }
79- let rule = combined. get_rule ( idx) ;
8078 let fixer = rule. get_fixer ( ) ?. expect ( "rule returned by diff must have fixer" ) ;
8179 let edit = nm. make_edit ( & rule. matcher , & fixer) ;
8280 new_content. extend ( & src[ start..edit. position ] ) ;
0 commit comments