Merge remote branch 'origin/master'

stdlib/src/jet/typeinfo/TypeInfo.java

@@ -1,7 +1,6 @@
 package jet.typeinfo;
 
 import jet.JetObject;
-import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;
@@ -44,7 +43,7 @@ public abstract class TypeInfo<T> implements JetObject {
 
     public static <T> TypeInfoProjection inProjection(TypeInfo<T> typeInfo) {
         return new TypeInfoProjection.TypeInfoProjectionImpl(typeInfo) {
-            @NotNull
+//            @NotNull
             @Override
             public TypeInfoVariance getVariance() {
                 return TypeInfoVariance.IN_VARIANCE;
@@ -54,7 +53,7 @@ public abstract class TypeInfo<T> implements JetObject {
 
     public static <T> TypeInfoProjection outProjection(TypeInfo<T> typeInfo) {
         return new TypeInfoProjection.TypeInfoProjectionImpl(typeInfo) {
-            @NotNull
+//            @NotNull
             @Override
             public TypeInfoVariance getVariance() {
                 return TypeInfoVariance.OUT_VARIANCE;
@@ -171,13 +170,13 @@ public abstract class TypeInfo<T> implements JetObject {
             super(klazz, nullable, projections);
         }
 
-        @NotNull
+//        @NotNull
         @Override
         public TypeInfoVariance getVariance() {
             return TypeInfoVariance.INVARIANT;
         }
 
-        @NotNull
+//        @NotNull
         @Override
         public TypeInfo getType() {
             return this;

stdlib/src/jet/typeinfo/TypeInfoProjection.java

@@ -1,26 +1,21 @@
 package jet.typeinfo;
 
-import org.jetbrains.annotations.NotNull;
-
 /**
  * @author alex.tkachman
  */
 public interface TypeInfoProjection {
-    @NotNull
     TypeInfoVariance getVariance();
 
-    @NotNull
     TypeInfo getType();
 
     abstract class TypeInfoProjectionImpl implements TypeInfoProjection {
-        @NotNull private final TypeInfo type;
+        private final TypeInfo type;
 
-        TypeInfoProjectionImpl(@NotNull TypeInfo typeInfo) {
+        TypeInfoProjectionImpl(TypeInfo typeInfo) {
             this.type = typeInfo;
         }
 
         @Override
-        @NotNull
         public final TypeInfo getType() {
             return type;
         }

stdlib/stdlib.iml

@@ -7,7 +7,6 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="annotations" level="project" />
   </component>
 </module>