Swift: Remove the old sinks.

Author: geoffw0

swift/ql/lib/codeql/swift/security/CleartextLoggingExtensions.qll

@@ -26,11 +26,7 @@ class CleartextLoggingAdditionalFlowStep extends Unit {
  * A sink defined in a CSV model.
  */
 private class DefaultCleartextLoggingSink extends CleartextLoggingSink {
-  DefaultCleartextLoggingSink() {
-    sinkNode(this, "log-injection")
-    or
-    sinkNode(this, "logging") // deprecated label
-  }
+  DefaultCleartextLoggingSink() { sinkNode(this, "log-injection") }
 }
 
 /**

swift/ql/lib/codeql/swift/security/SqlInjectionExtensions.qll

@@ -151,9 +151,5 @@ private class GrdbDefaultSqlInjectionSink extends SqlInjectionSink {
  * A sink defined in a CSV model.
  */
 private class DefaultSqlInjectionSink extends SqlInjectionSink {
-  DefaultSqlInjectionSink() {
-    sinkNode(this, "sql-injection")
-    or
-    sinkNode(this, "sql") // deprecated label
-  }
+  DefaultSqlInjectionSink() { sinkNode(this, "sql-injection") }
 }

swift/ql/lib/codeql/swift/security/UncontrolledFormatStringExtensions.qll

@@ -40,7 +40,5 @@ private class DefaultUncontrolledFormatStringSink extends UncontrolledFormatStri
     or
     // a sink defined in a CSV model.
     sinkNode(this, "format-string")
-    or
-    sinkNode(this, "uncontrolled-format-string") // deprecated label
   }
 }

swift/ql/lib/codeql/swift/security/UnsafeJsEvalExtensions.qll

@@ -144,9 +144,5 @@ private class DefaultUnsafeJsEvalAdditionalFlowStep extends UnsafeJsEvalAddition
  * A sink defined in a CSV model.
  */
 private class DefaultUnsafeJsEvalSink extends UnsafeJsEvalSink {
-  DefaultUnsafeJsEvalSink() {
-    sinkNode(this, "code-injection")
-    or
-    sinkNode(this, "js-eval") // deprecated label
-  }
+  DefaultUnsafeJsEvalSink() { sinkNode(this, "code-injection") }
 }