General cleanups and less warnings during a Scala build

6 files changed, 8 insertions, 7 deletions

diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala
index 8074b448fe..d2312440cc 100644
--- a/src/reflect/scala/reflect/internal/Definitions.scala
+++ b/src/reflect/scala/reflect/internal/Definitions.scala
@@ -840,7 +840,7 @@ trait Definitions extends api.StandardDefinitions {
     def samOf(tp: Type): Symbol = if (!doSam) NoSymbol else {
       // look at erased type because we (only) care about what ends up in bytecode
       // (e.g., an alias type or intersection type is fine as long as the intersection dominator compiles to an interface)
-      val tpSym = erasure.javaErasure(tp).typeSymbol
+      val tpSym: Symbol = erasure.javaErasure(tp).typeSymbol
 
       if (tpSym.exists && tpSym.isClass
           // if tp has a constructor (its class is not a trait), it must be public and must not take any arguments
diff --git a/src/reflect/scala/reflect/internal/Internals.scala b/src/reflect/scala/reflect/internal/Internals.scala
index cfacad24b4..1a48701ca7 100644
--- a/src/reflect/scala/reflect/internal/Internals.scala
+++ b/src/reflect/scala/reflect/internal/Internals.scala
@@ -3,7 +3,6 @@ package reflect
 package internal
 
 import scala.language.implicitConversions
-import scala.language.higherKinds
 
 import scala.reflect.api.Universe
 import scala.reflect.macros.Attachments
diff --git a/src/reflect/scala/reflect/internal/ReificationSupport.scala b/src/reflect/scala/reflect/internal/ReificationSupport.scala
index c58cb71e97..30f2efd7e3 100644
--- a/src/reflect/scala/reflect/internal/ReificationSupport.scala
+++ b/src/reflect/scala/reflect/internal/ReificationSupport.scala
@@ -287,6 +287,8 @@ trait ReificationSupport { self: SymbolTable =>
           val evdefs = gvdefs.zip(lvdefs).map {
             case (gvdef @ ValDef(_, _, tpt: TypeTree, _), ValDef(_, _, _, rhs)) =>
               copyValDef(gvdef)(tpt = tpt.original, rhs = rhs)
+            case (tr1, tr2) =>
+              throw new MatchError((tr1, tr2))
           }
           val edefs = evdefs ::: etdefs
           if (ctorMods.isTrait)
diff --git a/src/reflect/scala/reflect/internal/Types.scala b/src/reflect/scala/reflect/internal/Types.scala
index f385ca08c9..62f16aa8f7 100644
--- a/src/reflect/scala/reflect/internal/Types.scala
+++ b/src/reflect/scala/reflect/internal/Types.scala
@@ -3933,6 +3933,8 @@ trait Types
         et.withTypeVars(isConsistent(_, tp2))
       case (_, et: ExistentialType) =>
         et.withTypeVars(isConsistent(tp1, _))
+      case (_, _) =>
+        throw new MatchError((tp1, tp2))
     }
 
     def check(tp1: Type, tp2: Type) = (
diff --git a/src/reflect/scala/reflect/internal/transform/Transforms.scala b/src/reflect/scala/reflect/internal/transform/Transforms.scala
index 296ccde443..0d2f355aa5 100644
--- a/src/reflect/scala/reflect/internal/transform/Transforms.scala
+++ b/src/reflect/scala/reflect/internal/transform/Transforms.scala
@@ -23,9 +23,9 @@ trait Transforms { self: SymbolTable =>
     }
   }
 
-  private val refChecksLazy = new Lazy(new { val global: Transforms.this.type = self } with RefChecks)
-  private val uncurryLazy = new Lazy(new { val global: Transforms.this.type = self } with UnCurry)
-  private val erasureLazy = new Lazy(new { val global: Transforms.this.type = self } with Erasure)
+  private val refChecksLazy   = new Lazy(new { val global: Transforms.this.type = self } with RefChecks)
+  private val uncurryLazy     = new Lazy(new { val global: Transforms.this.type = self } with UnCurry)
+  private val erasureLazy     = new Lazy(new { val global: Transforms.this.type = self } with Erasure)
   private val postErasureLazy = new Lazy(new { val global: Transforms.this.type = self } with PostErasure)
 
   def refChecks = refChecksLazy.force
diff --git a/src/reflect/scala/reflect/macros/Enclosures.scala b/src/reflect/scala/reflect/macros/Enclosures.scala
index 1eb6832b5b..798fed2a15 100644
--- a/src/reflect/scala/reflect/macros/Enclosures.scala
+++ b/src/reflect/scala/reflect/macros/Enclosures.scala
@@ -2,8 +2,6 @@ package scala
 package reflect
 package macros
 
-import scala.language.existentials // SI-6541
-
 /**
  * <span class="badge badge-red" style="float: right;">EXPERIMENTAL</span>
  *