Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix two malformed format strings.

  • Loading branch information...
commit 54065a7b1fa632b1e74e8e944c1cd39b23ea9035 1 parent 41703df
@retronym retronym authored
View
2  src/compiler/scala/tools/nsc/backend/jvm/GenASM.scala
@@ -1437,7 +1437,7 @@ abstract class GenASM extends SubComponent with BytecodeWriters with GenJVMASM {
assert(enclClass.isClass, enclClass)
val sym = enclClass.primaryConstructor
if (sym == NoSymbol) {
- log("Ran out of room looking for an enclosing method for %s: no constructor here.".format(enclClass, clazz))
+ log("Ran out of room looking for an enclosing method for %s: no constructor here.".format(enclClass))
} else {
debuglog("enclosing method for %s is %s (in %s)".format(clazz, sym, enclClass))
res = EnclMethodEntry(javaName(enclClass), javaName(sym), javaType(sym))
View
2  src/compiler/scala/tools/nsc/typechecker/Macros.scala
@@ -481,7 +481,7 @@ trait Macros extends scala.tools.reflect.FastTrack with Traces {
// a heuristic to detect the REPL
if (global.settings.exposeEmptyPackage.value) {
- macroLogVerbose("macro classloader: initializing from a REPL classloader".format(global.classPath.asURLs))
+ macroLogVerbose("macro classloader: initializing from a REPL classloader: %s".format(global.classPath.asURLs))

Just got this merge conflict, which always makes my heart sink, of course. I'm so grateful this was benign.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
import scala.tools.nsc.interpreter._
val virtualDirectory = global.settings.outputDirs.getSingleOutput.get
new AbstractFileClassLoader(virtualDirectory, loader) {}

0 comments on commit 54065a7

Please sign in to comment.
Something went wrong with that request. Please try again.