Add explicit return types to public members #5203
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
smarter
reviewed
Oct 4, 2018
| @@ -84,7 +76,7 @@ class DottyBackendInterface(outputDirectory: AbstractFile, val superCallsMap: Ma | |||
| type LabelDef = tpd.DefDef | |||
| type Closure = tpd.Closure | |||
|
|
|||
| val NoSymbol = Symbols.NoSymbol | |||
| val NoSymbol: Symbols.NoSymbol.type = Symbols.NoSymbol | |||
There was a problem hiding this comment.
I would do val NoSymbol: Symbol to match the way it's done just below
allanrenucci
reviewed
Oct 5, 2018
| @@ -31,10 +32,10 @@ import dotty.tools.io._ | |||
| class GenBCode extends Phase { | |||
| def phaseName: String = GenBCode.name | |||
| private val entryPoints = new mutable.HashSet[Symbol]() | |||
| def registerEntryPoint(sym: Symbol) = entryPoints += sym | |||
| def registerEntryPoint(sym: Symbol): mutable.HashSet[Symbol] = entryPoints += sym | |||
| @@ -71,7 +72,7 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter | |||
|
|
|||
| var tree: Tree = _ | |||
|
|
|||
| val sourceFile = ctx.compilationUnit.source | |||
| val sourceFile: SourceFile = ctx.compilationUnit.source | |||
There was a problem hiding this comment.
Can sourceFile and tree above be private[this]?
| @@ -609,7 +609,7 @@ object desugar { | |||
| else cpy.ValDef(self)(tpt = selfType).withMods(self.mods | SelfName) | |||
| } | |||
|
|
|||
| val cdef1 = addEnumFlags { | |||
| val cdef1: DefTree = addEnumFlags { | |||
| } | ||
|
|
||
| /** Attachment containing the number of enum cases and the smallest kind that was seen so far. */ | ||
| val EnumCaseCount = new Property.Key[(Int, CaseKind.Value)] | ||
| val EnumCaseCount: Property.Key[(Int, DesugarEnums.CaseKind.Value)] = new Property.Key[(Int, CaseKind.Value)] |
There was a problem hiding this comment.
Rewrite RHS to new Property.Key?
| if (enumClass.exists) TypeTree(enumClass.typeRef) else TypeTree() | ||
|
|
||
| /** Add implied flags to an enum class or an enum case */ | ||
| def addEnumFlags(cdef: TypeDef)(implicit ctx: Context) = | ||
| def addEnumFlags(cdef: TypeDef)(implicit ctx: Context): cdef.ThisTree[Untyped] = |
| @@ -81,75 +81,75 @@ object Contexts { | |||
| val base: ContextBase | |||
|
|
|||
| /** All outer contexts, ending in `base.initialCtx` and then `NoContext` */ | |||
| def outersIterator = new Iterator[Context] { | |||
| def outersIterator: AnyRef with Iterator[Context] { var current: Context; } = new Iterator[Context] { | |||
| if (exprOwner == this.owner) this | ||
| else if (untpd.isSuperConstrCall(stat) && this.owner.isClass) superCallContext | ||
| else ctx.fresh.setOwner(exprOwner) | ||
|
|
||
| /** A new context that summarizes an import statement */ | ||
| def importContext(imp: Import[_], sym: Symbol) = { | ||
| def importContext(imp: Import[_], sym: Symbol): FreshContext = { |
There was a problem hiding this comment.
I am not sure it is meant to be a FreshContext. I would try Context and see if it still compile
There was a problem hiding this comment.
Nope, has to be fresh:
[error] /home/olivier/workspace/dotty/compiler/src/dotty/tools/repl/ReplCompiler.scala:58:24: type mismatch;
[error] found : dotty.tools.dotc.core.Contexts.Context
[error] required: dotty.tools.dotc.core.Contexts.FreshContext
[error] importContext(imp)(ctx))
[error] ^
[error] one error found| @@ -523,7 +523,7 @@ object Contexts { | |||
| def setSetting[T](setting: Setting[T], value: T): this.type = | |||
| setSettings(setting.updateIn(settingsState, value)) | |||
|
|
|||
| def setDebug = setSetting(base.settings.Ydebug, true) | |||
| def setDebug: FreshContext = setSetting(base.settings.Ydebug, true) | |||
|
|
||
| /** A map from ErrorType to associated message computation. We use this map | ||
| * instead of storing message computations directly in ErrorTypes in order | ||
| * to avoid space leaks - the message computation usually captures a context. | ||
| */ | ||
| private[core] val errorTypeMsg = mutable.Map[ErrorType, () => Message]() | ||
| private[core] val errorTypeMsg: mutable.Map[Types.ErrorType, () => Message] = mutable.Map[ErrorType, () => Message]() |
There was a problem hiding this comment.
Remove type annotation on RHS
| } | ||
|
|
||
| @sharable object EmptyGADTMap extends GADTMap(SimpleIdentityMap.Empty) { | ||
| override def setBounds(sym: Symbol, b: TypeBounds) = unsupported("EmptyGADTMap.setBounds") | ||
| override def setBounds(sym: Symbol, b: TypeBounds): Nothing = unsupported("EmptyGADTMap.setBounds") |
allanrenucci
reviewed
Oct 5, 2018
| @@ -190,40 +191,40 @@ class Definitions { | |||
| lazy val RootPackage: TermSymbol = ctx.newSymbol( | |||
| NoSymbol, nme.ROOTPKG, PackageCreationFlags, TypeRef(NoPrefix, RootClass)) | |||
|
|
|||
| lazy val EmptyPackageVal = ctx.newPackageSymbol( | |||
| lazy val EmptyPackageVal: Symbol { type ThisName = Names.TermName } = ctx.newPackageSymbol( | |||
|
|
||
| /** A package in which we can place all methods that are interpreted specially by the compiler */ | ||
| lazy val OpsPackageVal = ctx.newCompletePackageSymbol(RootClass, nme.OPS_PACKAGE).entered | ||
| lazy val OpsPackageClass = OpsPackageVal.moduleClass.asClass | ||
| lazy val OpsPackageVal: Symbol { type ThisName = Names.TermName } = ctx.newCompletePackageSymbol(RootClass, nme.OPS_PACKAGE).entered |
| lazy val Object_waitL: TermSymbol = enterMethod(ObjectClass, nme.wait_, MethodType(LongType :: Nil, UnitType), Final) | ||
| lazy val Object_waitLI: TermSymbol = enterMethod(ObjectClass, nme.wait_, MethodType(LongType :: IntType :: Nil, UnitType), Final) | ||
|
|
||
| def ObjectMethods: List[Symbols.TermSymbol] = List(Object_eq, Object_ne, Object_synchronized, Object_clone, |
There was a problem hiding this comment.
Remove prefix Symbols.?
|
|
||
| // The set of all wrap{X, Ref}Array methods, where X is a value type | ||
| val WrapArrayMethods = new PerRun[collection.Set[Symbol]]({ implicit ctx => | ||
| val WrapArrayMethods: PerRun[collection.Set[Symbol]] = new PerRun[collection.Set[Symbol]]({ implicit ctx => |
There was a problem hiding this comment.
Remove type annotation from RHS?
| def staticsMethodRef(name: PreName) = ScalaStaticsModule.requiredMethodRef(name) | ||
| def staticsMethod(name: PreName) = ScalaStaticsModule.requiredMethod(name) | ||
| def NullType: TypeRef = NullClass.typeRef | ||
| lazy val RuntimeNullModuleRef: Types.TermRef = ctx.requiredModuleRef("scala.runtime.Null") |
There was a problem hiding this comment.
import TermRef for all the definitions below?
| newConstructor(cls, EmptyFlags, Nil, Nil) | ||
|
|
||
| /** Create a synthetic lazy implicit value */ | ||
| def newLazyImplicit(info: Type) = | ||
| def newLazyImplicit(info: Type): Symbol { type ThisName = Names.TermName } = |
| @@ -308,9 +308,9 @@ trait Symbols { this: Context => | |||
| /** Create a new skolem symbol. This is not the same as SkolemType, even though the | |||
| * motivation (create a singleton referencing to a type) is similar. | |||
| */ | |||
| def newSkolem(tp: Type) = newSymbol(defn.RootClass, nme.SKOLEM, SyntheticArtifact | NonMember | Permanent, tp) | |||
| def newSkolem(tp: Type): Symbol { type ThisName = Names.TermName } = newSymbol(defn.RootClass, nme.SKOLEM, SyntheticArtifact | NonMember | Permanent, tp) | |||
|
|
||
| def newErrorSymbol(owner: Symbol, name: Name, msg: => Message) = { | ||
| def newErrorSymbol(owner: Symbol, name: Name, msg: => Message): Symbol { type ThisName = Names.Name } = { |
| @@ -404,7 +404,7 @@ object Symbols { | |||
| implicit def eqSymbol: Eq[Symbol, Symbol] = Eq | |||
|
|
|||
| /** Tree attachment containing the identifiers in a tree as a sorted array */ | |||
| val Ids = new Property.Key[Array[String]] | |||
| val Ids: Property.Key[Array[String]] = new Property.Key[Array[String]] | |||
There was a problem hiding this comment.
RHS: new Property.Key?
| } | ||
|
|
||
| final class CachedErasedValueType(tycon: TypeRef, erasedUnderlying: Type) | ||
| extends ErasedValueType(tycon, erasedUnderlying) | ||
|
|
||
| object ErasedValueType { | ||
| def apply(tycon: TypeRef, erasedUnderlying: Type)(implicit ctx: Context) = { | ||
| def apply(tycon: TypeRef, erasedUnderlying: Type)(implicit ctx: Context): CachedErasedValueType = { |
allanrenucci
reviewed
Oct 5, 2018
| @@ -76,11 +72,11 @@ class TyperState(previous: TyperState /* | Null */) { | |||
| new TyperState(this).setReporter(new StoreReporter(reporter)).setCommittable(isCommittable) | |||
|
|
|||
| /** The uninstantiated variables */ | |||
| def uninstVars = constraint.uninstVars | |||
| def uninstVars: Seq[Types.TypeVar] = constraint.uninstVars | |||
| def kindString = "Term" | ||
| def copyBoundType(bt: BT) = bt.paramRefs(paramNum) | ||
| def kindString: String = "Term" | ||
| def copyBoundType(bt: BT): bt.ParamRefType = bt.paramRefs(paramNum) |
| def kindString = "Type" | ||
| def copyBoundType(bt: BT) = bt.paramRefs(paramNum) | ||
| def kindString: String = "Type" | ||
| def copyBoundType(bt: BT): bt.ParamRefType = bt.paramRefs(paramNum) |
|
|
||
| val watchList = List[String]( | ||
| val watchList: List[Names.TypeName] = List[String]( |
| @@ -68,7 +68,7 @@ class ClassfileParser( | |||
| protected var pool: ConstantPool = _ // the classfile's constant pool | |||
|
|
|||
| protected var currentClassName: SimpleName = _ // JVM name of the current class | |||
| protected var classTParams = Map[Name,Symbol]() | |||
| protected var classTParams: Map[Name, Symbol] = Map[Name, Symbol]() | |||
There was a problem hiding this comment.
Remove RHS type annotation
| val matchMarker = marker("Match") | ||
| val orMarker: xsbti.api.Annotation = marker("Or") | ||
| val byNameMarker: xsbti.api.Annotation = marker("ByName") | ||
| val matchMarker: xsbti.api.Annotation = marker("Match") |
| @@ -71,7 +71,7 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisPhase = | |||
| } | |||
| } | |||
|
|
|||
| override def prepareForUnit(tree: Tree)(implicit ctx: Context) = { | |||
| override def prepareForUnit(tree: Tree)(implicit ctx: Context): FreshContext = { | |||
| @@ -90,14 +90,14 @@ class Erasure extends Phase with DenotTransformer { | |||
| ref.derivedSingleDenotation(ref.symbol, transformInfo(ref.symbol, ref.symbol.info)) | |||
| } | |||
|
|
|||
| val eraser = new Erasure.Typer(this) | |||
| val eraser: Erasure.Typer = new Erasure.Typer(this) | |||
| val functionName = "JFunction".toTermName | ||
| val functionPackage = "scala.compat.java8.".toTermName | ||
| val functionName: TermName = "JFunction".toTermName | ||
| val functionPackage: TermName = "scala.compat.java8.".toTermName |
| @@ -55,7 +55,7 @@ class HoistSuperArgs extends MiniPhase with IdentityDenotTransformer { thisPhase | |||
| * Hoisted superarg methods are collected in `superArgDefs` | |||
| */ | |||
| class Hoister(cls: Symbol)(implicit ctx: Context) { | |||
| val superArgDefs = new mutable.ListBuffer[DefDef] | |||
| val superArgDefs: mutable.ListBuffer[DefDef] = new mutable.ListBuffer[DefDef] | |||
There was a problem hiding this comment.
remove RHS type annotation
allanrenucci
reviewed
Oct 5, 2018
| @@ -29,7 +29,7 @@ object LambdaLift { | |||
| private type SymSet = TreeSet[Symbol] | |||
|
|
|||
| /** A map storing free variables of functions and classes */ | |||
| val free = new LinkedHashMap[Symbol, SymSet] | |||
| val free: mutable.LinkedHashMap[Symbol, SymSet] = new LinkedHashMap[Symbol, SymSet] | |||
There was a problem hiding this comment.
Remove RHS type annotation
| @@ -56,7 +56,7 @@ object LambdaLift { | |||
| private val outerParam = new HashMap[Symbol, Symbol] | |||
|
|
|||
| /** Buffers for lifted out classes and methods, indexed by owner */ | |||
| val liftedDefs = new HashMap[Symbol, mutable.ListBuffer[Tree]] | |||
| val liftedDefs: mutable.HashMap[Symbol, mutable.ListBuffer[Tree]] = new HashMap[Symbol, mutable.ListBuffer[Tree]] | |||
There was a problem hiding this comment.
Remove RHS type annotation
| @@ -27,22 +28,22 @@ class LazyVals extends MiniPhase with IdentityDenotTransformer { | |||
| /** this map contains mutable state of transformation: OffsetDefs to be appended to companion object definitions, | |||
| * and number of bits currently used */ | |||
| class OffsetInfo(var defs: List[Tree], var ord:Int) | |||
| val appendOffsetDefs = mutable.Map.empty[Symbol, OffsetInfo] | |||
| val appendOffsetDefs: mutable.Map[Symbol, OffsetInfo] = mutable.Map.empty[Symbol, OffsetInfo] | |||
|
|
||
| val containerFlagsMask = Flags.Method | Flags.Lazy | Flags.Accessor | Flags.Module | ||
| val containerFlagsMask: Flags.FlagSet = Flags.Method | Flags.Lazy | Flags.Accessor | Flags.Module |
| def forwarder(target: Symbol) = (targs: List[Type]) => (vrefss: List[List[Tree]]) => | ||
| superRef(target).appliedToTypes(targs).appliedToArgss(vrefss) | ||
| def forwarder(target: Symbol): List[Type] => List[List[Tree]] => Tree = | ||
| (targs: List[Type]) => (vrefss: List[List[Tree]]) => |
|
|
||
| /** Does this abstract file denote an existing file? */ | ||
| def create() = { unsupported() } | ||
| def create(): Nothing = { unsupported() } |
|
|
||
| /** Delete the underlying file or directory (recursively). */ | ||
| def delete() = { unsupported() } | ||
| def delete(): Nothing = { unsupported() } |
| @@ -92,5 +92,5 @@ class VirtualFile(val name: String, override val path: String) extends AbstractF | |||
| /** Returns an abstract file with the given name. It does not | |||
| * check that it exists. | |||
| */ | |||
| def lookupNameUnchecked(name: String, directory: Boolean) = unsupported() | |||
| def lookupNameUnchecked(name: String, directory: Boolean): Nothing = unsupported() | |||
| case x: VirtualFile => x.path == path | ||
| case _ => false | ||
| } | ||
|
|
||
| private[this] var content = Array.emptyByteArray | ||
|
|
||
| def absolute = this | ||
| def absolute: VirtualFile = this |
| @@ -21,22 +21,22 @@ extends AbstractFile { | |||
| case Some(parent) => parent.path+'/'+ name | |||
| } | |||
|
|
|||
| def absolute = this | |||
| def absolute: VirtualDirectory = this | |||
allanrenucci
reviewed
Oct 5, 2018
| def output = unsupported() | ||
| def container = unsupported() | ||
| def absolute = unsupported() | ||
| override def underlyingSource: Some[ZipArchive] = Some(this) |
| def absolute = unsupported() | ||
| override def underlyingSource: Some[ZipArchive] = Some(this) | ||
| def isDirectory: Boolean = true | ||
| def lookupName(name: String, directory: Boolean): Nothing = unsupported() |
| override def underlyingSource: Some[ZipArchive] = Some(this) | ||
| def isDirectory: Boolean = true | ||
| def lookupName(name: String, directory: Boolean): Nothing = unsupported() | ||
| def lookupNameUnchecked(name: String, directory: Boolean): Nothing = unsupported() |
| def isDirectory: Boolean = true | ||
| def lookupName(name: String, directory: Boolean): Nothing = unsupported() | ||
| def lookupNameUnchecked(name: String, directory: Boolean): Nothing = unsupported() | ||
| def create(): Nothing = unsupported() |
| def lookupName(name: String, directory: Boolean): Nothing = unsupported() | ||
| def lookupNameUnchecked(name: String, directory: Boolean): Nothing = unsupported() | ||
| def create(): Nothing = unsupported() | ||
| def delete(): Nothing = unsupported() |
|
|
||
| /** ''Note: This library is considered experimental and should not be used unless you know what you are doing.'' */ | ||
| sealed abstract class Entry(path: String) extends VirtualFile(baseName(path), path) { | ||
| // have to keep this name for compat with sbt's compiler-interface | ||
| def getArchive: ZipFile = null | ||
| override def underlyingSource = Some(self) | ||
| override def toString = self.path + "(" + path + ")" | ||
| override def underlyingSource: Some[ZipArchive] = Some(self) |
| } | ||
|
|
||
| /** ''Note: This library is considered experimental and should not be used unless you know what you are doing.'' */ | ||
| class DirEntry(path: String) extends Entry(path) { | ||
| val entries = mutable.HashMap[String, Entry]() | ||
| val entries: mutable.HashMap[String, Entry] = mutable.HashMap[String, Entry]() |
There was a problem hiding this comment.
remove RHS type annotation
| @@ -147,7 +147,7 @@ final class FileZipArchive(jpath: JPath) extends ZipArchive(jpath) { | |||
| override def sizeOption: Option[Int] = Some(zipEntry.getSize.toInt) | |||
| } | |||
|
|
|||
| @volatile lazy val (root, allDirs) = { | |||
| @volatile lazy val ((root: DirEntry), (allDirs: mutable.HashMap[String, DirEntry])) = { | |||
There was a problem hiding this comment.
lazy val (root , allDirs): (DirEntry, Map[String, DirEntry]))
| override def canEqual(other: Any) = other.isInstanceOf[FileZipArchive] | ||
| override def hashCode() = jpath.hashCode | ||
| override def equals(that: Any) = that match { | ||
| override def sizeOption: Some[Int] = Some(Files.size(jpath).toInt) |
| def lastModified = Files.getLastModifiedTime(jpath).toMillis | ||
| def name: String = jpath.getFileName.toString | ||
| def path: String = jpath.toString | ||
| def input: java.io.InputStream = Files.newInputStream(jpath) |
There was a problem hiding this comment.
remove prefix java.io.
allanrenucci
approved these changes
Oct 5, 2018
OlivierBlanvillain
force-pushed
the
scalafix
branch
from
6480c9e to
55c2a1c
Compare
Using dotty-compiler/scalafix RemoveUnused
Using a published local version of RscCompat
This reverts commit 8861d18.
OlivierBlanvillain
force-pushed
the
scalafix
branch
from
55c2a1c to
9751e7c
Compare
|
|
allanrenucci
added a commit
to dotty-staging/dotty
that referenced
this pull request
Oct 5, 2018
allanrenucci
added a commit
to dotty-staging/dotty
that referenced
this pull request
Oct 6, 2018
allanrenucci
added a commit
to dotty-staging/dotty
that referenced
this pull request
Oct 7, 2018
nicolasstucki
added a commit
that referenced
this pull request
Oct 8, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.