Merge branch 'main' into redsun82/cargo-upgrade-3

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/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/PathResolutionConsistency.qll

@@ -17,11 +17,13 @@ query predicate multiplePathResolutions(Path p, ItemNode i) {
       not use.isGlob() and
       not use.hasUseTreeList()
     ).getPath() and
+  // avoid overlap with `multipleCallTargets` below
+  not p = any(CallExpr ce).getFunction().(PathExpr).getPath() and
   strictcount(resolvePath(p)) > 1
 }
 
 /** Holds if `call` has multiple static call targets including `target`. */
-query predicate multipleMethodCallTargets(MethodCallExpr call, Callable target) {
+query predicate multipleCallTargets(CallExprBase call, Callable target) {
   target = call.getStaticTarget() and
   strictcount(call.getStaticTarget()) > 1
 }
@@ -51,8 +53,8 @@ int getPathResolutionInconsistencyCounts(string type) {
   type = "Multiple path resolutions" and
   result = count(Path p | multiplePathResolutions(p, _) | p)
   or
-  type = "Multiple static method call targets" and
-  result = count(CallExprBase call | multipleMethodCallTargets(call, _) | call)
+  type = "Multiple static call targets" and
+  result = count(CallExprBase call | multipleCallTargets(call, _) | call)
   or
   type = "Multiple record fields" and
   result = count(FieldExpr fe | multipleStructFields(fe, _) | fe)

rust/ql/test/extractor-tests/crate_graph/CONSISTENCY/PathResolutionConsistency.expected

@@ -1,3 +1,9 @@
+multipleCallTargets
+| proc_macro.rs:16:12:16:16 | ...::to_tokens(...) |
+| proc_macro.rs:26:10:26:12 | ...::to_tokens(...) |
+| proc_macro.rs:27:10:27:16 | ...::to_tokens(...) |
+| proc_macro.rs:42:16:42:26 | ...::to_tokens(...) |
+| proc_macro.rs:44:27:44:30 | ...::to_tokens(...) |
+| proc_macro.rs:46:18:46:28 | ...::to_tokens(...) |
 multiplePathResolutions
-| macro_expansion.rs:1:5:1:14 | proc_macro | file://:0:0:0:0 | Crate(proc_macro@0.0.0) |
-| macro_expansion.rs:1:5:1:14 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| macro_expansion.rs:1:5:1:14 | proc_macro |