diff --git a/compile/api/SameAPI.scala b/compile/api/SameAPI.scala index b52492e03..2c57aaa76 100644 --- a/compile/api/SameAPI.scala +++ b/compile/api/SameAPI.scala @@ -171,7 +171,6 @@ class SameAPI(tagsA: TypeVars, tagsB: TypeVars, includePrivate: Boolean, include case (_: Public, _: Public) => true case (qa: Protected, qb: Protected) => sameQualifier(qa, qb) case (qa: Private, qb: Private) => sameQualifier(qa, qb) - case (qa: Pkg, qb: Pkg) => sameQualifier(qa, qb) case _ => debug(false, "Different access categories") } def sameQualifier(a: Qualified, b: Qualified): Boolean = diff --git a/compile/api/ShowAPI.scala b/compile/api/ShowAPI.scala index bbc08e702..38fbdaa00 100644 --- a/compile/api/ShowAPI.scala +++ b/compile/api/ShowAPI.scala @@ -78,7 +78,6 @@ trait ShowBase { case p: Protected => "protected" case p: Private => "private" - case p: Pkg => "package" }) + sq.show(q.qualifier) ) } diff --git a/compile/interface/API.scala b/compile/interface/API.scala index 2190389b9..47936a627 100644 --- a/compile/interface/API.scala +++ b/compile/interface/API.scala @@ -198,9 +198,8 @@ final class API(val global: Global, val callback: xsbti.AnalysisCallback) extend { val within = c.privateWithin val qualifier = if(within == NoSymbol) Constants.unqualified else new xsbti.api.IdQualifier(fullName(within)) - if(c.hasFlag(Flags.PRIVATE)) new xsbti.api.Private(qualifier) - else if(c.hasFlag(Flags.PROTECTED)) new xsbti.api.Protected(qualifier) - else new xsbti.api.Pkg(qualifier) + if(c.hasFlag(Flags.PROTECTED)) new xsbti.api.Protected(qualifier) + else new xsbti.api.Private(qualifier) } } diff --git a/interface/other b/interface/other index 78fe98691..3ef1d4461 100644 --- a/interface/other +++ b/interface/other @@ -11,7 +11,6 @@ Access qualifier: Qualifier Protected Private - Pkg Qualifier Unqualified