Remove redundant supertypes

Author: owen-mc

go/ql/lib/semmle/go/frameworks/Revel.qll

@@ -140,7 +140,7 @@ module Revel {
   /**
    * A render of a template.
    */
-  abstract class TemplateRender extends DataFlow::Node, TemplateInstantiation::Range {
+  abstract class TemplateRender extends TemplateInstantiation::Range {
     /** Gets the name of the file that is rendered. */
     abstract File getRenderedFile();
 

go/ql/lib/semmle/go/frameworks/stdlib/NetHttp.qll

@@ -46,7 +46,7 @@ module NetHttp {
     }
   }
 
-  private class MapWrite extends Http::HeaderWrite::Range, DataFlow::Node {
+  private class MapWrite extends Http::HeaderWrite::Range {
     DataFlow::Node index;
     DataFlow::Node rhs;
 

go/ql/lib/semmle/go/frameworks/stdlib/Regexp.qll

@@ -61,7 +61,7 @@ module Regexp {
     }
   }
 
-  private class ExternalRegexpMatchFunction extends RegexpMatchFunction::Range, Function {
+  private class ExternalRegexpMatchFunction extends RegexpMatchFunction::Range {
     int patArg;
     int strArg;
 

go/ql/lib/semmle/go/security/CleartextLoggingCustomizations.qll

@@ -120,7 +120,7 @@ module CleartextLogging {
    *
    * This is a source since `log.Print(obj)` will often show the fields of `obj`.
    */
-  private class StructPasswordFieldSource extends DataFlow::Node, Source {
+  private class StructPasswordFieldSource extends Source {
     string name;
 
     StructPasswordFieldSource() {
@@ -137,7 +137,7 @@ module CleartextLogging {
   }
 
   /** An access to a variable or property that might contain a password. */
-  private class ReadPasswordSource extends DataFlow::Node, Source {
+  private class ReadPasswordSource extends Source {
     string name;
 
     ReadPasswordSource() {

go/ql/lib/semmle/go/security/OpenUrlRedirectCustomizations.qll

@@ -61,15 +61,15 @@ module OpenUrlRedirect {
   /**
    * An HTTP redirect, considered as a sink for `Configuration`.
    */
-  class RedirectSink extends Sink, DataFlow::Node {
+  class RedirectSink extends Sink {
     RedirectSink() { this = any(Http::Redirect redir).getUrl() }
   }
 
   /**
    * A definition of the HTTP "Location" header, considered as a sink for
    * `Configuration`.
    */
-  class LocationHeaderSink extends Sink, DataFlow::Node {
+  class LocationHeaderSink extends Sink {
     LocationHeaderSink() {
       exists(Http::HeaderWrite hw | hw.getHeaderName() = "location" | this = hw.getValue())
     }

go/ql/lib/semmle/go/security/UnsafeUnzipSymlinkCustomizations.qll

@@ -126,7 +126,7 @@ module UnsafeUnzipSymlink {
    * An argument to a call to `os.Symlink` within a loop that extracts a zip or tar archive,
    * taken as a sink for unsafe unzipping of symlinks.
    */
-  class OsSymlink extends DataFlow::Node, SymlinkSink {
+  class OsSymlink extends SymlinkSink {
     OsSymlink() {
       exists(DataFlow::CallNode n | n.asExpr() = getASymlinkCall() |
         this = n.getArgument([0, 1]) and
@@ -139,7 +139,7 @@ module UnsafeUnzipSymlink {
    * An argument to `path/filepath.EvalSymlinks` or `os.Readlink`, taken as a sink for detecting target
    * paths that are likely safe to extract to.
    */
-  class StdlibSymlinkResolvers extends DataFlow::Node, EvalSymlinksSink {
+  class StdlibSymlinkResolvers extends EvalSymlinksSink {
     StdlibSymlinkResolvers() {
       exists(DataFlow::CallNode n |
         n.getTarget().hasQualifiedName("path/filepath", "EvalSymlinks")

go/ql/lib/semmle/go/security/Xss.qll

@@ -139,7 +139,7 @@ module SharedXss {
    * A `Template` from `html/template` will HTML-escape data automatically
    * and therefore acts as a sanitizer for XSS vulnerabilities.
    */
-  class HtmlTemplateSanitizer extends Sanitizer, DataFlow::Node {
+  class HtmlTemplateSanitizer extends Sanitizer {
     HtmlTemplateSanitizer() {
       exists(Method m, DataFlow::CallNode call | m = call.getCall().getTarget() |
         m.hasQualifiedName("html/template", "Template", "ExecuteTemplate") and

go/ql/lib/semmle/go/security/ZipSlipCustomizations.qll

@@ -30,7 +30,7 @@ module ZipSlip {
   /**
    * A tar file header, as a source for zip slip.
    */
-  class TarHeaderSource extends Source, DataFlow::Node {
+  class TarHeaderSource extends Source {
     TarHeaderSource() {
       this =
         any(DataFlow::MethodCallNode mcn |

go/ql/test/library-tests/semmle/go/frameworks/Encoding/jsoniter.ql

@@ -9,7 +9,7 @@ class UntrustedFunction extends Function {
   UntrustedFunction() { this.getName() = ["getUntrustedString", "getUntrustedBytes"] }
 }
 
-class RemoteSource extends DataFlow::Node, RemoteFlowSource::Range {
+class RemoteSource extends RemoteFlowSource::Range {
   RemoteSource() { this = any(UntrustedFunction f).getACall().getResult() }
 }