Use implicit flag unions where possible

Author: odersky

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

@@ -161,7 +161,7 @@ object desugar {
         vparamss = (setterParam :: Nil) :: Nil,
         tpt      = TypeTree(defn.UnitType),
         rhs      = setterRhs
-      ).withMods((mods | Accessor) &~ (CaseAccessor | Implicit | Given | Lazy))
+      ).withMods((mods | Accessor) &~ (CaseAccessor | ImplicitOrGiven | Lazy))
       Thicket(vdef, setter)
     }
     else vdef

compiler/src/dotty/tools/dotc/core/Types.scala

@@ -789,7 +789,7 @@ object Types {
     }
 
     /** The set of implicit term members of this type
-     *  @param kind   A subset of {Implicit, Implied} that sepcifies what kind of implicit should
+     *  @param kind   A subset of {Implicit, Implied} that specifies what kind of implicit should
      *                be returned
      */
     final def implicitMembers(kind: FlagSet)(implicit ctx: Context): List[TermRef] = track("implicitMembers") {

compiler/src/dotty/tools/dotc/typer/Implicits.scala

@@ -230,7 +230,7 @@ object Implicits {
     assert(initctx.typer != null)
     lazy val refs: List[ImplicitRef] = {
       val buf = new mutable.ListBuffer[TermRef]
-      for (companion <- companionRefs) buf ++= companion.implicitMembers(ImplicitOrImplied)
+      for (companion <- companionRefs) buf ++= companion.implicitMembers(ImplicitOrImpliedOrGiven)
       buf.toList
     }
 

compiler/src/dotty/tools/dotc/typer/Namer.scala

@@ -988,7 +988,7 @@ class Namer { typer: Typer =>
                 val maybeStable = if (mbr.symbol.isStableMember) StableRealizable else EmptyFlags
                 ctx.newSymbol(
                   cls, alias,
-                  Exported | Method | Final | maybeStable | mbr.symbol.flags & ImplicitOrImplied,
+                  Exported | Method | Final | maybeStable | mbr.symbol.flags & ImplicitOrImpliedOrGiven,
                   mbr.info.ensureMethodic,
                   coord = span)
               }