migrate to mbt toolchain 0.7.1

Author: myfreess

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
-target/
+_build
+target
 .mooncakes/
 .moonagent/

jsondiff.mbt

@@ -70,23 +70,23 @@ fn JsonDiff::object_diff(
   let mut score = 0.0
 
   // Check for deleted keys
-  for key, value1 in obj1.iterator2() {
+  for key, value1 in obj1.iter2() {
     if !obj2.contains(key) {
       deleted[key] = value1
       score -= 30.0
     }
   }
 
   // Check for added keys
-  for key, value2 in obj2.iterator2() {
+  for key, value2 in obj2.iter2() {
     if !obj1.contains(key) {
       added[key] = value2
       score -= 30.0
     }
   }
 
   // Check for modified keys
-  for key, value1 in obj1.iterator2() {
+  for key, value1 in obj1.iter2() {
     if obj2.get(key) is Some(value2) {
       score += 20.0
       let { score: subscore, diff: change } = JsonDiff::diff_with_score(
@@ -133,7 +133,7 @@ fn JsonDiff::find_matching_object(
   let mut match_index = 0
 
   // rely on stable iter order
-  for key, candidate in fuzzy_originals.iterator2() {
+  for key, candidate in fuzzy_originals.iter2() {
     let index_distance = match_index
       .reinterpret_as_uint()
       .sub(index.reinterpret_as_uint()) // wrapped sub
@@ -169,7 +169,7 @@ fn JsonDiff::scalarize(
   fuzzy_originals : Map[String, Json]?,
 ) -> Array[String] {
   let output_array = Array::new()
-  for index, item in array.iterator2() {
+  for index, item in array.iter2() {
     let mut value : String? = match item {
       Json::Object(_) => None
       _ => {

jsonedit.mbt

@@ -22,13 +22,13 @@ impl ToJson for JsonEdit with to_json(self) {
   match self {
     Object(object, added~, deleted~) => {
       let result = {}
-      for key, value in deleted.iterator2() {
+      for key, value in deleted.iter2() {
         result[key + "__deleted"] = value
       }
-      for key, value in added.iterator2() {
+      for key, value in added.iter2() {
         result[key + "__added"] = value
       }
-      for key, value in object.iterator2() {
+      for key, value in object.iter2() {
         result[key] = value.to_json()
       }
       return Json::object(result)

sequence_matcher.mbt

@@ -96,7 +96,7 @@ fn[T : Eq + Hash] SequenceMatcher::chain_second_seq(
 ) -> Unit {
   let second_sequence = self.second_sequence
   let mut second_sequence_elements = @hashmap.HashMap::new()
-  for i, item in second_sequence.iterator2() {
+  for i, item in second_sequence.iter2() {
     let counter = second_sequence_elements.get_or_init(item, () => Array::new())
     counter.push(i)
   }
@@ -107,7 +107,7 @@ fn[T : Eq + Hash] SequenceMatcher::chain_second_seq(
     let test_len = (len.to_double() / 100.0).floor().to_int() + 1
     let after_filter = @hashmap.HashMap::new()
     second_sequence_elements
-    .iterator()
+    .iter()
     .each(fn(entry) {
       let (element, indexes) = entry
       if indexes.length() > test_len {

stringify.mbt

@@ -19,7 +19,7 @@ fn json_substringify(
   match json {
     Object(object) => {
       output.push_line(tag, "\{String::make(indent, ' ')}\{prefix}{")
-      for subkey, subvalue in object.iterator2() {
+      for subkey, subvalue in object.iter2() {
         json_substringify(Some(subkey), subvalue, output, tag, subindent)
       }
       output.push_line(tag, "\{String::make(indent, ' ')}}")
@@ -73,13 +73,13 @@ fn substringify(
     }
     Object(diff, added~, deleted~) => {
       output.push_line(tag, "\{String::make(indent, ' ')}\{prefix}{")
-      for key, value in deleted.iterator2() {
+      for key, value in deleted.iter2() {
         json_substringify(Some(key), value, output, "-", subindent)
       }
-      for key, value in added.iterator2() {
+      for key, value in added.iter2() {
         json_substringify(Some(key), value, output, "+", subindent)
       }
-      for key, value in diff.iterator2() {
+      for key, value in diff.iter2() {
         substringify(Some(key), value, output, " ", subindent)
       }
       output.push_line(tag, "\{String::make(indent, ' ')}}")