wip

Author: hvitved

rust/ql/lib/codeql/rust/dataflow/internal/ModelsAsData.qll

@@ -115,18 +115,6 @@ predicate interpretModelForTest(QlBuiltins::ExtensionId madId, string model) {
   )
 }
 
-private predicate sdf(CallExprBase call, Function f) {
-  CallExprBaseImpl::getCallResolvable(call).getResolvedPath() = "<crate::option::Option>::unwrap" and
-  // CallExprBaseImpl::getCallResolvable(call).getResolvedCrateOrigin() = "lang:core" and
-  f = call.getStaticTarget()
-}
-
-private predicate sdf2(CallExprBase call) {
-  CallExprBaseImpl::getCallResolvable(call).getResolvedPath() = "<crate::option::Option>::unwrap"
-  // CallExprBaseImpl::getCallResolvable(call).getResolvedCrateOrigin() = "lang:core" and
-  // f = call.getStaticTarget()
-}
-
 private class SummarizedCallableFromModel extends SummarizedCallable::Range {
   private string crate;
   private string path;

rust/ql/lib/codeql/rust/internal/PathResolution.qll

@@ -1344,14 +1344,6 @@ private module Debug {
     result = resolvePath(path)
   }
 
-  private ItemNode sdfsf(RelevantPath path, ImplItemNode impl, ItemNode frm) {
-    path = getRelevantLocatable() and
-    result = resolvePath(path) and
-    result = impl.resolveSelfTy() and
-    frm = impl.getASuccessorRec("from") and
-    frm instanceof AssocItemNode
-  }
-
   predicate debugUseImportEdge(Use use, string name, ItemNode item) {
     use = getRelevantLocatable() and
     useImportEdge(use, name, item)
@@ -1372,59 +1364,3 @@ private module Debug {
     fileImport(m, f)
   }
 }
-
-private predicate sdfs(ImplItemNode impl) {
-  // resolvePath(impl.getSelfPath()).getLocation().getStartLine() = [35, 36]
-  impl.getLocation().getFile().getBaseName() = "main.rs" //and
-  // impl.getLocation().getStartLine() = [35 .. 38]
-}
-
-private import Type
-private import TypeInference
-
-private predicate sdf3(
-  AstNode n, Type t, ImplItemNode impl, string path, RelevantPath p, ImplOrTraitItemNode i,
-  TraitType tt, Function f, string name
-) {
-  t = inferType(n) and
-  n.getLocation().getStartLine() = 29 and
-  t = TStruct(impl.resolveSelfTy()) and
-  // t = debugInferType(_, _) and
-  impl.toString() = "impl ...::Iterator for ...::Args { ... }" and
-  path = p.toStringDebug() and
-  p = impl.getTraitPath().getQualifier*() and
-  i = resolvePath(p) and
-  impl.isFullyParametric() and
-  tt = TTrait(i) and
-  f = tt.getMethod(name) and
-  f = i.getAnAssocItem() and
-  name = "collect" and
-  f = impl.resolveSelfTy().getASuccessor(name)
-}
-
-private predicate sdf4(
-  ImplItemNode impl, string path, RelevantPath p, ItemNode iter, Use u, string usePath,
-  RelevantPath usePathPrefix, ItemNode useResolved
-) {
-  // t = debugInferType(_, _) and
-  impl.toString() = "impl ...::Iterator for ...::Args { ... }" and
-  path = p.toStringDebug() and
-  p = impl.getTraitPath().getQualifier*() and
-  iter = resolvePath(p) and
-  iter.getName() = "iter" and
-  u = iter.(Module).getItemList().getAnItem() and
-  usePath = u.getUseTree().getPath().toStringDebug() and
-  usePath = "self::traits::Iterator" and
-  usePathPrefix = u.getUseTree().getPath().getQualifier*() and
-  useResolved = resolvePath(usePathPrefix)
-}
-
-private predicate sdf5(ImplItemNode impl, string path, RelevantPath p, ItemNode iter, Module m) {
-  // t = debugInferType(_, _) and
-  impl.toString() = "impl ...::Iterator for ...::Args { ... }" and
-  path = p.toStringDebug() and
-  p = impl.getTraitPath().getQualifier*() and
-  iter = resolvePath(p) and
-  iter.getName() = "iter" and
-  m = iter.(Module).getItemList().getAnItem()
-}

shared/typeinference/codeql/typeinference/internal/TypeInference.qll

@@ -474,28 +474,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
     module Matching<MatchingInputSig Input> {
       private import Input
 
-      private predicate testunadjustedAccessType(
-        Access a, AccessPosition apos, DeclarationPosition dpos, Declaration target, TypePath path,
-        Type t, Type paramType, TypePath paramTypePath
-      ) {
-        target = a.getTarget() and
-        t = a.getInferredType(apos, path) and
-        target.toString() = "fn unwrap" and
-        // accessDeclarationPositionMatch(apos, dpos) and
-        paramType = target.getDeclaredType(dpos, paramTypePath)
-        // )
-      }
-
-      private predicate testadjustedAccessType(
-        Access a, AccessPosition apos, Declaration target, TypePath path0, Type t0, TypePath path,
-        Type t
-      ) {
-        target = a.getTarget() and
-        t0 = a.getInferredType(apos, path0) and
-        adjustAccessType(apos, target, path0, t0, path, t) and
-        target.toString() = "fn unwrap"
-      }
-
       /**
        * Holds if `a` targets `target` and the type for `apos` at `path` in `a`
        * is `t` after adjustment by `target`.