From aaf618e035bb00df4a3f4ac8b915cab47da25c30 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Fri, 22 Jul 2016 13:36:54 +0300
Subject: [PATCH] Minor, inline HashSetUtil#symmetricDifference

---
 .../incremental/protoDifferenceUtils.kt       |  3 +-
 .../jetbrains/kotlin/utils/HashSetUtil.java   | 37 -------------------
 2 files changed, 1 insertion(+), 39 deletions(-)
 delete mode 100644 compiler/util/src/org/jetbrains/kotlin/utils/HashSetUtil.java

diff --git a/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt b/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt
index db7d0055f57..86e8667ee9b 100644
--- a/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt
+++ b/build-common/src/org/jetbrains/kotlin/incremental/protoDifferenceUtils.kt
@@ -26,7 +26,6 @@ import org.jetbrains.kotlin.serialization.ProtoBuf
 import org.jetbrains.kotlin.serialization.deserialization.Deserialization
 import org.jetbrains.kotlin.serialization.deserialization.NameResolver
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
-import org.jetbrains.kotlin.utils.HashSetUtil
 import java.util.*
 
 data class Difference(
@@ -135,7 +134,7 @@ private abstract class DifferenceCalculator() {
     ): Collection<String> {
         val oldNames = oldList.map { compareObject.oldNameResolver.getString(it) }.toSet()
         val newNames = newList.map { compareObject.newNameResolver.getString(it) }.toSet()
-        return HashSetUtil.symmetricDifference(oldNames, newNames)
+        return oldNames.union(newNames) - oldNames.intersect(newNames)
     }
 
     private fun MessageLite.getHashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int {
diff --git a/compiler/util/src/org/jetbrains/kotlin/utils/HashSetUtil.java b/compiler/util/src/org/jetbrains/kotlin/utils/HashSetUtil.java
deleted file mode 100644
index ff73f32499b..00000000000
--- a/compiler/util/src/org/jetbrains/kotlin/utils/HashSetUtil.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2010-2016 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.utils;
-
-import com.intellij.util.containers.hash.HashSet;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Set;
-
-public class HashSetUtil {
-    @NotNull
-    public static <T> Set<T> symmetricDifference(@NotNull Set<T> set1, @NotNull Set<T> set2) {
-        Set<T> intersection = new HashSet<T>();
-        intersection.addAll(set1);
-        intersection.retainAll(set2);
-        Set<T> result = new HashSet<T>();
-        result.addAll(set1);
-        result.addAll(set2);
-        result.removeAll(intersection);
-
-        return result;
-    }
-}