Remove TermName -> String implicit.

These implicits were crutches going back to a much Stringier
time. Of course "with great type safety comes great verbosity"
and no doubt this could be cleaned up significantly further.
At least the underpinnings are consistent now - the only
implicits involving name should be String -> TypeName and
String -> TermName.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala
index 72b7e35408..92bca19213 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala
@@ -35,7 +35,7 @@ trait GenAndroid {
   def addCreatorCode(codegen: BytecodeGenerator, block: BasicBlock) {
     import codegen._
     val fieldSymbol = (
-      clasz.symbol.newValue(newTermName(fieldName), NoPosition, Flags.STATIC | Flags.FINAL)
+      clasz.symbol.newValue(fieldName, NoPosition, Flags.STATIC | Flags.FINAL)
         setInfo AndroidCreatorClass.tpe
     )
     val methodSymbol = definitions.getMember(clasz.symbol.companionModule, fieldName)
@@ -48,15 +48,15 @@ trait GenAndroid {
     import codegen._
     val creatorType = javaType(AndroidCreatorClass)
     jclass.addNewField(PublicStaticFinal,
-                       fieldName,
+                       fieldName.toString,
                        creatorType)
     val moduleName = javaName(clasz.symbol)+"$"
     clinit.emitGETSTATIC(moduleName,
                          nme.MODULE_INSTANCE_FIELD.toString,
                          new JObjectType(moduleName))
-    clinit.emitINVOKEVIRTUAL(moduleName, fieldName,
+    clinit.emitINVOKEVIRTUAL(moduleName, fieldName.toString,
                              new JMethodType(creatorType, Array()))
-    clinit.emitPUTSTATIC(jclass.getName(), fieldName, creatorType)
+    clinit.emitPUTSTATIC(jclass.getName(), fieldName.toString, creatorType)
   }
 
 }