Revert removeal of escMap import in de0b47e

Author: ashawley

shared/src/main/scala/scala/xml/Utility.scala

@@ -104,7 +104,7 @@ object Utility extends AnyRef with parsing.TokenTests {
     val escMap = pairs map { case (s, c) => c -> ("&%s;" format s) }
     val unescMap = pairs ++ Map("apos" -> '\'')
   }
-  import Escapes.unescMap
+  import Escapes.{ escMap, unescMap }
 
   /**
    * Appends escaped string to `s`.
@@ -115,7 +115,7 @@ object Utility extends AnyRef with parsing.TokenTests {
     text.iterator.foldLeft(s) { (s, c) =>
       escMap.get(c) match {
         case Some(str)                             => s ++= str
-        case _ => if c >= ' ' || "\n\r\t".contains(c) => s += c
+        case _ if c >= ' ' || "\n\r\t".contains(c) => s += c
         case _ => s // noop
       }
     }