Fix rebase breakage

Author: odersky

compiler/src/dotty/tools/dotc/ast/Desugar.scala

@@ -302,7 +302,7 @@ object desugar {
 
   /** The expansion of a class definition. See inline comments for what is involved */
   def classDef(cdef: TypeDef)(implicit ctx: Context): Tree = {
-    val impl @ Template(constr0, parents, self, _) = cdef.rhs
+    val impl @ Template(constr0, _, self, _) = cdef.rhs
     val className = normalizeClassName(cdef, impl)
     val parents = impl.parents
     val mods = cdef.mods

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -2562,7 +2562,7 @@ object Parsers {
       var mods1 = addMod(mods, instanceMod)
       val wdef =
         if (in.token == LBRACE) {
-          val templ = templateBodyOpt(makeConstructor(tparams, vparamss), parents, isEnum = false)
+          val templ = templateBodyOpt(makeConstructor(tparams, vparamss), parents, Nil, isEnum = false)
           if (tparams.isEmpty && vparamss.isEmpty) ModuleDef(name, templ)
           else TypeDef(name.toTypeName, templ)
         }