Finish CollectionContent rename

Co-authored-by: Geoffrey White <[email protected]>

Author: rdmarsh2

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

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

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

@@ -225,9 +225,9 @@ module Content {
     override string toString() { result = "Array element" }
   }
 
-  /** An element of a set */
+  /** An element of a collection. */
   class CollectionContent extends Content, TCollectionContent {
-    override string toString() { result = "Set element" }
+    override string toString() { result = "Collection element" }
   }
 }
 

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

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

swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Collection.qll

@@ -26,7 +26,7 @@ private class CollectionSummaries extends SummaryModelCsv {
         ";Collection;true;split(separator:maxSplits:omittingEmptySubsequences:);;;Argument[-1];ReturnValue;taint",
         ";Collection;true;removeFirst();;;Argument[-1];ReturnValue;taint",
         ";Collection;true;popFirst();;;Argument[-1];ReturnValue;taint",
-        ";Collection;true;randomElement();;;Argument[-1].SetElement;ReturnValue.OptionalSome;value",
+        ";Collection;true;randomElement();;;Argument[-1].CollectionElement;ReturnValue.OptionalSome;value",
         ";Collection;true;randomElement();;;Argument[-1].ArrayElement;ReturnValue.OptionalSome;value",
         ";RangeReplaceableCollection;true;append(_:);;;Argument[0];Argument[-1];taint",
         ";RangeReplaceableCollection;true;append(contentsOf:);;;Argument[0];Argument[-1];taint",

swift/ql/lib/codeql/swift/frameworks/StandardLibrary/Set.qll

@@ -11,10 +11,10 @@ private class SetSummaries extends SummaryModelCsv {
   override predicate row(string row) {
     row =
       [
-        ";Set;true;insert(_:);;;Argument[-1].SetElement;ReturnValue.TupleElement[1];value",
-        ";Set;true;insert(_:);;;Argument[0];Argument[-1].SetElement;value",
+        ";Set;true;insert(_:);;;Argument[-1].CollectionElement;ReturnValue.TupleElement[1];value",
+        ";Set;true;insert(_:);;;Argument[0];Argument[-1].CollectionElement;value",
         ";Set;true;insert(_:);;;Argument[0];ReturnValue.TupleElement[1];value",
-        ";Set;true;init(_:);;;Argument[0].ArrayElement;ReturnValue.SetElement;value"
+        ";Set;true;init(_:);;;Argument[0].ArrayElement;ReturnValue.CollectionElement;value"
       ]
   }
 }