Skip to content

Commit 005a08d

Browse files
committed
Remove self types check suppression usage from scaladoc.
Also remove private setting not used anymore.
1 parent c88f733 commit 005a08d

File tree

3 files changed

+0
-7
lines changed

3 files changed

+0
-7
lines changed

src/compiler/scala/tools/nsc/settings/ScalaSettings.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ trait ScalaSettings extends AbsScalaSettings
171171
val etaExpandKeepsStar = BooleanSetting ("-Yeta-expand-keeps-star", "Eta-expand varargs methods to T* rather than Seq[T]. This is a temporary option to ease transition.").
172172
withDeprecationMessage("This flag is scheduled for removal in 2.12. If you have a case where you need this flag then please report a bug.")
173173
val Yinvalidate = StringSetting ("-Yinvalidate", "classpath-entry", "Invalidate classpath entry before run", "")
174-
val noSelfCheck = BooleanSetting ("-Yno-self-type-checks", "Suppress check for self-type conformance among inherited members.")
175174
val YvirtClasses = false // too embryonic to even expose as a -Y //BooleanSetting ("-Yvirtual-classes", "Support virtual classes")
176175
val YdisableUnreachablePrevention = BooleanSetting("-Ydisable-unreachable-prevention", "Disable the prevention of unreachable blocks in code generation.")
177176

src/compiler/scala/tools/nsc/typechecker/Typers.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1749,7 +1749,6 @@ trait Typers extends Adaptations with Tags {
17491749
if (!(selfType <:< parent.tpe.typeOfThis) &&
17501750
!phase.erasedTypes &&
17511751
!context.owner.isSynthetic && // don't check synthetic concrete classes for virtuals (part of DEVIRTUALIZE)
1752-
!settings.noSelfCheck && // setting to suppress this very check
17531752
!selfType.isErroneous &&
17541753
!parent.tpe.isErroneous)
17551754
{

src/scaladoc/scala/tools/nsc/doc/Settings.scala

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,6 @@ class Settings(error: String => Unit, val printMsg: String => Unit = println(_))
204204
"Group similar functions together (based on the @group annotation)"
205205
)
206206

207-
// Somewhere slightly before r18708 scaladoc stopped building unless the
208-
// self-type check was suppressed. I hijacked the slotted-for-removal-anyway
209-
// suppress-vt-warnings option and renamed it for this purpose.
210-
noSelfCheck.value = true
211-
212207
// For improved help output.
213208
def scaladocSpecific = Set[Settings#Setting](
214209
docformat, doctitle, docfooter, docversion, docUncompilable, docsourceurl, docgenerator, docRootContent, useStupidTypes,

0 commit comments

Comments
 (0)