Fix for failing test, review by extempore.

5 files changed, 6 insertions, 6 deletions

diff --git a/src/compiler/scala/reflect/internal/StdNames.scala b/src/compiler/scala/reflect/internal/StdNames.scala
index 991cc1e1b5..fdbe918d55 100644
--- a/src/compiler/scala/reflect/internal/StdNames.scala
+++ b/src/compiler/scala/reflect/internal/StdNames.scala
@@ -368,7 +368,7 @@ trait StdNames extends /*reflect.generic.StdNames with*/ NameManglers { self: Sy
     /** The name of bitmaps for checkinit values that have transient flag*/
     def bitmapNameForCheckinitTransient(n: Int): TermName = bitmapName(n, "inittrans$")
 
-    /** The expanded name of `name' relative to this class `base` with given `separator`
+    /** The expanded name of `name` relative to this class `base` with given `separator`
      */
     def expandedName(name: TermName, base: Symbol, separator: String = EXPAND_SEPARATOR_STRING): TermName =
       newTermName(base.fullName('$') + separator + name)
diff --git a/src/compiler/scala/reflect/internal/pickling/PickleFormat.scala b/src/compiler/scala/reflect/internal/pickling/PickleFormat.scala
index f188361f37..16747af08a 100644
--- a/src/compiler/scala/reflect/internal/pickling/PickleFormat.scala
+++ b/src/compiler/scala/reflect/internal/pickling/PickleFormat.scala
@@ -111,7 +111,7 @@ object PickleFormat {
  *   AnnotArg       = Tree | Constant
  *   ConstAnnotArg  = Constant | AnnotInfo | AnnotArgArray
  *
- *   len is remaining length after `len'.
+ *   len is remaining length after `len`.
  */
   val MajorVersion = 5
   val MinorVersion = 0
diff --git a/src/compiler/scala/reflect/internal/pickling/UnPickler.scala b/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
index f8ca0fb6de..0082f97835 100644
--- a/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
+++ b/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
@@ -56,7 +56,7 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
     /** A map from entry numbers to symbols, types, or annotations */
     private val entries = new Array[AnyRef](index.length)
 
-    /** A map from symbols to their associated `decls' scopes */
+    /** A map from symbols to their associated `decls` scopes */
     private val symScopes = new HashMap[Symbol, Scope]
 
     //println("unpickled " + classRoot + ":" + classRoot.rawInfo + ", " + moduleRoot + ":" + moduleRoot.rawInfo);//debug
@@ -105,7 +105,7 @@ abstract class UnPickler /*extends reflect.generic.UnPickler*/ {
                               " in "+filename)
     }
 
-    /** The `decls' scope associated with given symbol */
+    /** The `decls` scope associated with given symbol */
     protected def symScope(sym: Symbol) = symScopes.getOrElseUpdate(sym, newScope)
 
     /** Does entry represent an (internal) symbol */
diff --git a/src/compiler/scala/reflect/internal/util/Set.scala b/src/compiler/scala/reflect/internal/util/Set.scala
index 59091a27f1..cfc3e7eada 100644
--- a/src/compiler/scala/reflect/internal/util/Set.scala
+++ b/src/compiler/scala/reflect/internal/util/Set.scala
@@ -18,7 +18,7 @@ abstract class Set[T <: AnyRef] {
 
   def apply(x: T): Boolean = contains(x)
 
-  @deprecated("use `iterator' instead", "2.9.0") def elements = iterator
+  @deprecated("use `iterator` instead", "2.9.0") def elements = iterator
 
   def contains(x: T): Boolean =
     findEntry(x) ne null
diff --git a/test/files/run/bytecodecs.scala b/test/files/run/bytecodecs.scala
index bf8a0f8ed3..786c9dbdb0 100644
--- a/test/files/run/bytecodecs.scala
+++ b/test/files/run/bytecodecs.scala
@@ -1,4 +1,4 @@
-import scala.reflect.generic.ByteCodecs._
+import scala.reflect.internal.ByteCodecs._
 
 object Test {