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/Flags.scala

@@ -462,7 +462,7 @@ object Flags {
 
   /** Flags representing source modifiers */
   private val CommonSourceModifierFlags: FlagSet =
-    commonFlags(Private, Protected, Final, Case, Implicit, Implied, Given, Override, JavaStatic)
+    commonFlags(Private, Protected, Final, Case, ImplicitOrImpliedOrGiven, Override, JavaStatic)
 
   final val TypeSourceModifierFlags: FlagSet =
     CommonSourceModifierFlags.toTypeFlags | Abstract | Sealed | Opaque
@@ -487,7 +487,7 @@ object Flags {
     HigherKinded.toCommonFlags | Param | ParamAccessor.toCommonFlags |
     Scala2ExistentialCommon | MutableOrOpaque | Touched | JavaStatic |
     CovariantOrOuter | ContravariantOrLabel | CaseAccessor.toCommonFlags |
-    Extension.toCommonFlags | NonMember | Implicit | Given | Implied | Permanent | Synthetic |
+    Extension.toCommonFlags | NonMember | ImplicitOrImpliedOrGiven | Permanent | Synthetic |
     SuperAccessorOrScala2x | Inline
 
   /** Flags that are not (re)set when completing the denotation, or, if symbol is
@@ -543,7 +543,7 @@ object Flags {
 
   /** Flags that can apply to a module val */
   final val RetainedModuleValFlags: FlagSet = RetainedModuleValAndClassFlags |
-    Override | Final | Method | Implicit | Implied | Lazy |
+    Override | Final | Method | ImplicitOrImplied | Lazy |
     Accessor | AbsOverride | StableRealizable | Captured | Synchronized | Erased
 
   /** Flags that can apply to a module class */

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)
               }