diff options
author | Paul Phillips <paulp@improving.org> | 2010-12-05 02:56:08 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-12-05 02:56:08 +0000 |
commit | 77eb8fefec3e62ead95c7d409ec5a28f30289ec3 (patch) | |
tree | 5e035714a7e6363d1ae7f712d5b1f73c1d27d79e /src/compiler/scala/tools/nsc/plugins | |
parent | 626e38940b72f5e8445ecbece4d41996b5e2842e (diff) | |
download | scala-77eb8fefec3e62ead95c7d409ec5a28f30289ec3.tar.gz scala-77eb8fefec3e62ead95c7d409ec5a28f30289ec3.tar.bz2 scala-77eb8fefec3e62ead95c7d409ec5a28f30289ec3.zip |
Mopping up after the deprecation of exit and er...
Mopping up after the deprecation of exit and error. It is decidedly
non-trivial (at least for the IDE-impaired) to be completely sure of
which error function was being called when there were about twenty with
the same signature in trunk and they are being variously inherited,
imported, shadowed, etc. So although I was careful, the possibility
exists that something is now calling a different "error" function than
before. Caveat programmer.
(And let's all make it our policy not to name anything "error" or "exit"
from here on out....) No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/plugins')
-rw-r--r-- | src/compiler/scala/tools/nsc/plugins/Plugins.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/plugins/Plugins.scala b/src/compiler/scala/tools/nsc/plugins/Plugins.scala index 5823a09995..c798fa89e1 100644 --- a/src/compiler/scala/tools/nsc/plugins/Plugins.scala +++ b/src/compiler/scala/tools/nsc/plugins/Plugins.scala @@ -75,7 +75,7 @@ trait Plugins /** Verify requirements are present. */ for (req <- settings.require.value ; if !(plugs exists (_.name == req))) - error("Missing required plugin: " + req) + globalError("Missing required plugin: " + req) /** Process plugin options. */ def namec(plug: Plugin) = plug.name + ":" @@ -86,12 +86,12 @@ trait Plugins for (p <- plugs) { val opts = doOpts(p) if (!opts.isEmpty) - p.processOptions(opts, error) + p.processOptions(opts, globalError) } /** Verify no non-existent plugin given with -P */ for (opt <- settings.pluginOptions.value ; if plugs forall (p => optList(List(opt), p).isEmpty)) - error("bad option: -P:" + opt) + globalError("bad option: -P:" + opt) plugs } |