Move utilities from 'frontend' to 'util'

They're also used in 'serialization'

compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java

@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.*;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 import java.util.Collections;
 import java.util.List;

compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java

@@ -47,8 +47,8 @@ import org.jetbrains.jet.lang.types.expressions.LabelResolver;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.util.Box;
-import org.jetbrains.jet.util.lazy.ReenteringLazyValueComputationException;
 import org.jetbrains.jet.util.slicedmap.WritableSlice;
+import org.jetbrains.jet.utils.ReenteringLazyValueComputationException;
 
 import javax.inject.Inject;
 import java.util.*;

compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java

@@ -42,8 +42,8 @@ import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetKeywordToken;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.util.RecursionIntolerantLazyValueWithDefault;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValueWithDefault;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 import javax.inject.Inject;
 import java.util.*;

compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java

@@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import javax.inject.Inject;
 import java.util.*;

compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java

@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter;
 import org.jetbrains.jet.lang.types.*;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 import javax.inject.Inject;
 import java.util.ArrayList;

compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DelegatingDataFlowInfo.java

@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeUtils;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import java.util.*;
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java

@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.DeferredType;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 import java.util.Collection;
 import java.util.Collections;

compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.lang.resolve.scopes;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 public class LazyScopeAdapter extends AbstractScopeAdapter {
 

compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java

@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.name.LabelName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import java.util.*;
 

compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java

@@ -21,8 +21,8 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.util.Box;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
-import org.jetbrains.jet.util.lazy.ReenteringLazyValueComputationException;
+import org.jetbrains.jet.utils.ReenteringLazyValueComputationException;
 
 import java.util.List;
 

compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java

@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import java.util.HashMap;
 import java.util.Iterator;

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java

@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.*;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValueWithDefault;
+import org.jetbrains.jet.util.RecursionIntolerantLazyValueWithDefault;
 import org.jetbrains.jet.util.slicedmap.WritableSlice;
 
 import java.util.Collection;

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java

@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
 import org.jetbrains.jet.lang.types.DeferredType;
 import org.jetbrains.jet.lang.types.ErrorUtils;
 import org.jetbrains.jet.lang.types.JetTypeInfo;
-import org.jetbrains.jet.util.lazy.ReenteringLazyValueComputationException;
+import org.jetbrains.jet.utils.ReenteringLazyValueComputationException;
 
 import static org.jetbrains.jet.lang.diagnostics.Errors.TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM;
 

compiler/frontend/src/org/jetbrains/jet/util/RecursionIntolerantLazyValueWithDefault.java

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.util.lazy;
+package org.jetbrains.jet.util;
+
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 public abstract class RecursionIntolerantLazyValueWithDefault<T> extends RecursionIntolerantLazyValue<T> {
     private final T defaultValue;

compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapImpl.java

@@ -21,7 +21,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import java.util.Collection;
 import java.util.HashMap;

core/util.runtime/src/org/jetbrains/jet/utils/CommonSuppliers.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.util;
+package org.jetbrains.jet.utils;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.*;

core/util.runtime/src/org/jetbrains/jet/utils/RecursionIntolerantLazyValue.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.util.lazy;
+package org.jetbrains.jet.utils;
 
 public abstract class RecursionIntolerantLazyValue<T> {
 

core/util.runtime/src/org/jetbrains/jet/utils/ReenteringLazyValueComputationException.java

@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.util.lazy;
+package org.jetbrains.jet.utils;
+
+import org.jetbrains.annotations.NotNull;
 
 public class ReenteringLazyValueComputationException extends RuntimeException {
     public ReenteringLazyValueComputationException() {
     }
 
+    @NotNull
     @Override
     public synchronized Throwable fillInStackTrace() {
         return this;

idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java

@@ -24,14 +24,17 @@ import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
+import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor;
+import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
+import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import java.util.Collection;
 import java.util.Collections;