Fix build breakage in rustc 9cb18a92a 2018-03-02 - extra argument to …

…infcx.fresh_substs_for_item. Bump version to 0.1.7

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rerast"
-version = "0.1.6"
+version = "0.1.7"
 license = "Apache-2.0"
 description = "An AST (abstract syntax tree) based search replace tool for code written in Rust"
 repository = "https://github.com/google/rerast"

src/change_to_rule.rs

@@ -316,12 +316,11 @@ fn after_analysis<'a, 'gcx>(
                 // which bit of the HIR tree has changed and select candidate placeholders.
                 find_rules_state.changed_span = new_changed_span;
                 find_rules_state.changed_side_state = Some(ChangedSideState {
-                    candidate_placeholders:
-                        PlaceholderCandidateFinder::find_placeholder_candidates(
-                            tcx,
-                            expr,
-                            |child_expr| RelativeSpan::new(child_expr.span, &filemap),
-                        ),
+                    candidate_placeholders: PlaceholderCandidateFinder::find_placeholder_candidates(
+                        tcx,
+                        expr,
+                        |child_expr| RelativeSpan::new(child_expr.span, &filemap),
+                    ),
                     required_paths: ReferencedPathsFinder::paths_in_expr(tcx, expr),
                 })
             }

src/rule_matcher.rs

@@ -132,7 +132,11 @@ impl<'r, 'a, 'gcx> RuleMatcher<'r, 'a, 'gcx> {
 
         let maybe_match_placeholders = self.tcx.infer_ctxt().enter(|infcx| {
             let tcx = infcx.tcx;
-            let substs = infcx.fresh_substs_for_item(tcx.def_span(rule_fn_id), rule_fn_id);
+            let substs = infcx.fresh_substs_for_item(
+                ty::UniverseIndex::ROOT,
+                tcx.def_span(rule_fn_id),
+                rule_fn_id,
+            );
             let placeholder_types_by_id = rule_body
                 .arguments
                 .iter()
@@ -1484,7 +1488,8 @@ impl<'r, 'a, 'gcx, T: StartMatch> ReplacementVisitor<'r, 'a, 'gcx, T> {
 }
 
 impl<'r, 'a, 'gcx, T: StartMatch> intravisit::Visitor<'gcx>
-    for ReplacementVisitor<'r, 'a, 'gcx, T> {
+    for ReplacementVisitor<'r, 'a, 'gcx, T>
+{
     fn nested_visit_map<'this>(&'this mut self) -> intravisit::NestedVisitorMap<'this, 'gcx> {
         intravisit::NestedVisitorMap::All(&self.tcx.hir)
     }