take2

Author: hvitved

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

@@ -208,7 +208,6 @@ abstract class ItemNode extends Locatable {
     crateDefEdge(this, name, result, kind)
     or
     crateDependencyEdge(this, name, result) and
-    not declaresDirectly(this, TTypeNamespace(), name) and
     kind.isInternal()
     or
     externCrateEdge(this, name, result) and
@@ -1242,8 +1241,8 @@ private predicate crateDependencyEdge(SourceFileItemNode file, string name, Crat
   or
   // All files _should_ belong to a crate, but for those where we cannot identify the crate,
   // we give access to all crates as a fallback.
-  not file = any(Crate c).getASourceFile() and
-  name = dep.getName()
+  name = dep.getName() and
+  not declaresDirectly(file, TTypeNamespace(), name)
 }
 
 private predicate useTreeDeclares(UseTree tree, string name) {