Merge branch 'main' into redsun82/rust-regenerate-models

Author: redsun82

java/ql/integration-tests/java/query-suite/java-code-quality-extended.qls.expected

@@ -1,5 +1,4 @@
 ql/java/ql/src/Advisory/Declarations/MissingOverrideAnnotation.ql
-ql/java/ql/src/Advisory/Deprecated Code/AvoidDeprecatedCallableAccess.ql
 ql/java/ql/src/Advisory/Documentation/ImpossibleJavadocThrows.ql
 ql/java/ql/src/Advisory/Documentation/SpuriousJavadocParam.ql
 ql/java/ql/src/Compatibility/JDK9/JdkInternalAccess.ql

java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected

@@ -1,5 +1,4 @@
 ql/java/ql/src/Advisory/Declarations/MissingOverrideAnnotation.ql
-ql/java/ql/src/Advisory/Deprecated Code/AvoidDeprecatedCallableAccess.ql
 ql/java/ql/src/Advisory/Documentation/ImpossibleJavadocThrows.ql
 ql/java/ql/src/Advisory/Documentation/SpuriousJavadocParam.ql
 ql/java/ql/src/Compatibility/JDK9/JdkInternalAccess.ql

java/ql/src/Advisory/Deprecated Code/AvoidDeprecatedCallableAccess.ql

@@ -6,8 +6,7 @@
  * @problem.severity recommendation
  * @precision high
  * @id java/deprecated-call
- * @tags quality
- *       maintainability
+ * @tags maintainability
  *       readability
  *       non-attributable
  *       external/cwe/cwe-477

javascript/ql/lib/semmle/javascript/frameworks/Fastify.qll

@@ -1,12 +1,12 @@
 /**
- * Provides classes for working with [Fastify](https://www.fastify.io/) applications.
+ * Provides classes for working with [Fastify](https://www.fastify.dev/) applications.
  */
 
 import javascript
 import semmle.javascript.frameworks.HTTP
 
 /**
- * Provides classes for working with [Fastify](https://www.fastify.io/) applications.
+ * Provides classes for working with [Fastify](https://www.fastify.dev/) applications.
  */
 module Fastify {
   /**

rust/ql/consistency-queries/PathResolutionConsistency.ql

@@ -10,22 +10,17 @@ private import codeql.rust.internal.PathResolution
 private import codeql.rust.internal.PathResolutionConsistency as PathResolutionConsistency
 private import codeql.rust.elements.Locatable
 private import codeql.Locations
-import PathResolutionConsistency
 
 class SourceLocatable extends Locatable {
-  Location getLocation() {
-    if super.getLocation().fromSource()
-    then result = super.getLocation()
-    else result instanceof EmptyLocation
-  }
+  SourceLocatable() { this.fromSource() }
 }
 
-query predicate multipleMethodCallTargets(SourceLocatable a, SourceLocatable b) {
-  PathResolutionConsistency::multipleMethodCallTargets(a, b)
+query predicate multipleCallTargets(SourceLocatable a) {
+  PathResolutionConsistency::multipleCallTargets(a, _)
 }
 
-query predicate multiplePathResolutions(SourceLocatable a, SourceLocatable b) {
-  PathResolutionConsistency::multiplePathResolutions(a, b)
+query predicate multiplePathResolutions(SourceLocatable a) {
+  PathResolutionConsistency::multiplePathResolutions(a, _)
 }
 
 query predicate multipleCanonicalPaths(SourceLocatable i, SourceLocatable c, string path) {

rust/ql/lib/codeql/rust/elements/internal/AstNodeImpl.qll

@@ -70,9 +70,9 @@ module Impl {
      */
     pragma[nomagic]
     predicate isFromMacroExpansion() {
-      exists(MacroCall mc |
-        MacroCallImpl::isInMacroExpansion(mc, this) and
-        not this = mc.getATokenTreeNode()
+      exists(AstNode root |
+        MacroCallImpl::isInMacroExpansion(root, this) and
+        not this = root.(MacroCall).getATokenTreeNode()
       )
     }
 

rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll

@@ -14,10 +14,12 @@ module Impl {
   private import rust
 
   pragma[nomagic]
-  predicate isInMacroExpansion(MacroCall mc, AstNode n) {
-    n = mc.getMacroCallExpansion()
+  predicate isInMacroExpansion(AstNode root, AstNode n) {
+    n = root.(MacroCall).getMacroCallExpansion()
     or
-    isInMacroExpansion(mc, n.getParentNode())
+    n = root.(Adt).getDeriveMacroExpansion(_)
+    or
+    isInMacroExpansion(root, n.getParentNode())
   }
 
   // the following QLdoc is generated: if you need to edit it, do it in the schema file

rust/ql/lib/codeql/rust/elements/internal/TupleStructPatImpl.qll

@@ -34,6 +34,11 @@ module Impl {
       exists(this.getField(pragma[only_bind_into](pos)))
     }
 
+    /**
+     * Gets the struct matched by this pattern.
+     */
+    Struct getStruct() { result = PathResolution::resolvePath(this.getPath()) }
+
     /** Gets the tuple field that matches the `pos`th pattern of this pattern. */
     pragma[nomagic]
     TupleField getTupleField(int pos) {

rust/ql/lib/codeql/rust/frameworks/Poem.qll

@@ -4,17 +4,15 @@
 
 private import rust
 private import codeql.rust.Concepts
-private import codeql.rust.dataflow.DataFlow
 
 /**
  * Parameters of a handler function
  */
 private class PoemHandlerParam extends RemoteSource::Range {
   PoemHandlerParam() {
     exists(TupleStructPat param |
-      param.getResolvedPath() = ["crate::web::query::Query", "crate::web::path::Path"]
-    |
-      this.asPat().getPat() = param.getAField()
+      this.asPat().getPat() = param.getAField() and
+      param.getStruct().getCanonicalPath() = ["poem::web::query::Query", "poem::web::path::Path"]
     )
   }
 }

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

@@ -1132,7 +1132,7 @@ pragma[nomagic]
 private predicate crateDependencyEdge(SourceFileItemNode file, string name, CrateItemNode dep) {
   exists(CrateItemNode c | dep = c.(Crate).getDependency(name) | file = c.getASourceFile())
   or
-  // Give builtin files, such as `await.rs`, access to `std`
+  // Give builtin files access to `std`
   file instanceof BuiltinSourceFile and
   dep.getName() = name and
   name = "std"
@@ -1501,7 +1501,7 @@ private predicate preludeEdge(SourceFile f, string name, ItemNode i) {
   exists(Crate stdOrCore, ModuleLikeNode mod, ModuleItemNode prelude, ModuleItemNode rust |
     f = any(Crate c0 | stdOrCore = c0.getDependency(_) or stdOrCore = c0).getASourceFile()
     or
-    // Give builtin files, such as `await.rs`, access to the prelude
+    // Give builtin files access to the prelude
     f instanceof BuiltinSourceFile
   |
     stdOrCore.getName() = ["std", "core"] and