Swift: ArrayContent aliased to CollectionContent

Robert Marsh · Robert Marsh · commit 6ad78eba05e4 · 2023-09-14T13:08:36.000Z
diff --git a/swift/ql/lib/change-notes/2023-09-13-array-content-unification.md b/swift/ql/lib/change-notes/2023-09-13-array-content-unification.md
@@ -1,5 +1,5 @@
 ---
-category: breaking
+category: deprecated
 ---
 
-* The `ArrayContent` type in the data flow library has been removed and its uses have been replaced with the `CollectionContent` type, to better reflect the hierarchy of the Swift standard library. Uses of `ArrayElement` in model files will be interpreted as referring to `CollectionContent`.
+* The `ArrayContent` type in the data flow library has been deprecated and made an alias for the `CollectionContent` type, to better reflect the hierarchy of the Swift standard library. Uses of `ArrayElement` in model files will be interpreted as referring to `CollectionContent`.
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPublic.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPublic.qll
@@ -229,6 +229,11 @@ module Content {
   class CollectionContent extends Content, TCollectionContent {
     override string toString() { result = "Collection element" }
   }
+
+  /**
+   * DEPRECATED: An element of a collection. This is an alias for the general CollectionContent.
+   */
+  deprecated class ArrayContent = CollectionContent;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,11 @@ module Content {`
`229`	`229`	`class CollectionContent extends Content, TCollectionContent {`
`230`	`230`	`override string toString() { result = "Collection element" }`
`231`	`231`	`}`
	`232`	`+`
	`233`	`+ /**`
	`234`	`+ * DEPRECATED: An element of a collection. This is an alias for the general CollectionContent.`
	`235`	`+ */`
	`236`	`+ deprecated class ArrayContent = CollectionContent;`
`232`	`237`	`}`
`233`	`238`
`234`	`239`	`/**`