Merge branch 'cheeseng-feature-fix-2.10-build-190817' into 3.1.x

Author: bvenners

scalatest/src/main/scala/org/scalatest/featurespec/AnyFeatureSpecLike.scala

@@ -15,8 +15,7 @@
  */
 package org.scalatest.featurespec
 
-//import org.scalactic.{FailureMessages => _, UnquotedString => _, Resources => _, _}
-import org.scalactic._
+import org.scalactic.{source, Prettifier}
 import org.scalatest._
 import Suite.autoTagClassAnnotations
 import org.scalatest.exceptions._

scalatest/src/main/scala/org/scalatest/featurespec/AsyncFeatureSpecLike.scala

@@ -16,7 +16,7 @@
 
 package org.scalatest.featurespec
 
-import org.scalactic._
+import org.scalactic.{source, Prettifier}
 import org.scalatest._
 import scala.concurrent.Future
 import Suite.anExceptionThatShouldCauseAnAbort

scalatest/src/main/scala/org/scalatest/flatspec/AnyFlatSpecLike.scala

@@ -15,7 +15,7 @@
  */
 package org.scalatest.flatspec
 
-import org.scalactic._
+import org.scalactic.{source, Prettifier}
 import org.scalatest._
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations

scalatest/src/main/scala/org/scalatest/flatspec/AsyncFlatSpecLike.scala

@@ -15,7 +15,7 @@
  */
 package org.scalatest.flatspec
 
-import org.scalactic._
+import org.scalactic.{source, Prettifier}
 import org.scalatest._
 import scala.concurrent.Future
 import Suite.autoTagClassAnnotations

scalatest/src/main/scala/org/scalatest/freespec/AnyFreeSpecLike.scala

@@ -15,7 +15,7 @@
  */
 package org.scalatest.freespec
 
-import org.scalactic._
+import org.scalactic.{source, Prettifier}
 import org.scalatest._
 import org.scalatest.Suite.autoTagClassAnnotations
 import org.scalatest.verbs.BehaveWord

scalatest/src/main/scala/org/scalatest/freespec/AsyncFreeSpecLike.scala

@@ -15,7 +15,7 @@
  */
 package org.scalatest.freespec
 
-import org.scalactic._
+import org.scalactic.{source, Prettifier}
 import scala.concurrent.Future
 import org.scalatest.Suite.autoTagClassAnnotations
 import org.scalatest.exceptions._

scalatest/src/main/scala/org/scalatest/funsuite/AsyncFunSuiteLike.scala

@@ -15,7 +15,7 @@
  */
 package org.scalatest.funsuite
 
-import org.scalactic._
+import org.scalactic.source
 import org.scalatest._
 import scala.concurrent.Future
 import Suite.autoTagClassAnnotations

scalatest/src/main/scala/org/scalatest/matchers/MatchersHelper.scala

@@ -22,7 +22,7 @@ import java.lang.reflect.Method
 import java.lang.reflect.Modifier
 import scala.util.matching.Regex
 import java.lang.reflect.Field
-import org.scalactic._
+import org.scalactic.{source, Prettifier}
 import org.scalatest.UnquotedString
 
 // TODO: drop generic support for be as an equality comparison, in favor of specific ones.

scalatest/src/main/scala/org/scalatest/propspec/AnyPropSpecLike.scala

@@ -15,7 +15,7 @@
  */
 package org.scalatest.propspec
 
-import org.scalactic._
+import org.scalactic.source
 import org.scalatest._
 import Suite.autoTagClassAnnotations
 

scalatest/src/main/scala/org/scalatest/wordspec/AnyWordSpecLike.scala

@@ -15,7 +15,7 @@
  */
 package org.scalatest.wordspec
 
-import org.scalactic._
+import org.scalactic.{source, Prettifier}
 import org.scalatest._
 import org.scalatest.exceptions._
 import Suite.autoTagClassAnnotations