Wanting to deprecate -make, first I had to writ...

Wanting to deprecate -make, first I had to write a way to deprecate
-make. So there's that, now you can do

  val s = SomeSetting(...) withDeprecationMessage "don't use this"

And it will do the usual deprecation things. And, deprecated -make. And
couldn't resist fixing a bug in -make, it would crash if you gave it its
own default option (i.e. -make:all.) Let's deprecate more!

I also did further cleaning up of our help outputs. Do I smell a
pulitzer in the making? No review.

1 files changed, 11 insertions, 9 deletions

diff --git a/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
index 6f130b9e74..be2f8a370a 100644
--- a/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
@@ -9,17 +9,19 @@ package settings
 trait AbsScalaSettings {
   self: AbsSettings =>
 
-  type BooleanSetting     <: AbsSetting { type T = Boolean }
-  type ChoiceSetting      <: AbsSetting { type T = String }
-  type IntSetting         <: AbsSetting { type T = Int }
-  type MultiStringSetting <: AbsSetting { type T = List[String] }
-  type PathSetting        <: AbsSetting { type T = String }
-  type PhasesSetting      <: AbsSetting { type T = List[String] }
-  type StringSetting      <: AbsSetting { type T = String }
-  type PrefixSetting      <: AbsSetting { type T = List[String] }
+  type Setting <: AbsSetting
+
+  type BooleanSetting     <: Setting { type T = Boolean }
+  type ChoiceSetting      <: Setting { type T = String }
+  type IntSetting         <: Setting { type T = Int }
+  type MultiStringSetting <: Setting { type T = List[String] }
+  type PathSetting        <: Setting { type T = String }
+  type PhasesSetting      <: Setting { type T = List[String] }
+  type StringSetting      <: Setting { type T = String }
+  type PrefixSetting      <: Setting { type T = List[String] }
 
   type OutputDirs
-  type OutputSetting <: AbsSetting
+  type OutputSetting <: Setting
 
   def BooleanSetting(name: String, descr: String): BooleanSetting
   def ChoiceSetting(name: String, helpArg: String, descr: String, choices: List[String], default: String): ChoiceSetting