Swift: rename SetContent to CollectionContent

Author: Robert Marsh

swift/ql/lib/codeql/swift/dataflow/ExternalFlow.qll

@@ -494,7 +494,7 @@ predicate parseContent(AccessPathToken component, Content content) {
   content instanceof Content::ArrayContent
   or
   component.getName() = "SetElement" and
-  content instanceof Content::SetContent
+  content instanceof Content::CollectionContent
 }
 
 cached

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll

@@ -257,7 +257,7 @@ private module Cached {
     TTupleContent(int index) { exists(any(TupleExpr te).getElement(index)) } or
     TEnumContent(ParamDecl f) { exists(EnumElementDecl d | d.getAParam() = f) } or
     TArrayContent() or
-    TSetContent()
+    TCollectionContent()
 }
 
 /**
@@ -902,7 +902,7 @@ class DataFlowExpr = Expr;
  * Holds if access paths with `c` at their head always should be tracked at high
  * precision. This disables adaptive access path precision for such access paths.
  */
-predicate forceHighPrecision(Content c) { c instanceof Content::ArrayContent or c instanceof Content::SetContent }
+predicate forceHighPrecision(Content c) { c instanceof Content::ArrayContent or c instanceof Content::CollectionContent }
 
 /**
  * Holds if the node `n` is unreachable when the call context is `call`.

swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPublic.qll

@@ -226,7 +226,7 @@ module Content {
   }
 
   /** An element of a set */
-  class SetContent extends Content, TSetContent {
+  class CollectionContent extends Content, TCollectionContent {
     override string toString() { result = "Set element" }
   }
 }

swift/ql/lib/codeql/swift/dataflow/internal/FlowSummaryImplSpecific.qll

@@ -120,7 +120,7 @@ private string getContentSpecific(ContentSet cs) {
     result = "ArrayElement"
   )
   or
-  exists(Content::SetContent c |
+  exists(Content::CollectionContent c |
     cs.isSingleton(c) and
     result = "SetElement"
   )