Merge branch 'main' into aibaars/rust-expand-assoc-items

Author: redsun82

rust/extractor/src/config.rs

@@ -62,6 +62,7 @@ pub struct Config {
     pub qltest: bool,
     pub qltest_cargo_check: bool,
     pub qltest_dependencies: Vec<String>,
+    pub qltest_use_nightly: bool,
     pub sysroot: Option<PathBuf>,
     pub sysroot_src: Option<PathBuf>,
     pub rustc_src: Option<PathBuf>,

rust/extractor/src/qltest.rs

@@ -8,6 +8,9 @@ use std::path::Path;
 use std::process::Command;
 use tracing::info;
 
+const EDITION: &str = "2021";
+const NIGHTLY: &str = "nightly-2025-06-01";
+
 fn dump_lib() -> anyhow::Result<()> {
     let path_iterator = glob("*.rs").context("globbing test sources")?;
     let paths = path_iterator
@@ -29,8 +32,11 @@ enum TestCargoManifest<'a> {
         uses_proc_macro: bool,
         uses_main: bool,
         dependencies: &'a [String],
+        edition: &'a str,
+    },
+    Macro {
+        edition: &'a str,
     },
-    Macro {},
 }
 
 impl TestCargoManifest<'_> {
@@ -56,16 +62,26 @@ fn dump_cargo_manifest(dependencies: &[String]) -> anyhow::Result<()> {
         uses_proc_macro,
         uses_main: fs::exists("main.rs").context("checking existence of main.rs")?,
         dependencies,
+        edition: EDITION,
     };
     if uses_proc_macro {
         TestCargoManifest::Workspace {}.dump("")?;
         lib_manifest.dump(".lib")?;
-        TestCargoManifest::Macro {}.dump(".proc_macro")
+        TestCargoManifest::Macro { edition: EDITION }.dump(".proc_macro")
     } else {
         lib_manifest.dump("")
     }
 }
 
+fn dump_nightly_toolchain() -> anyhow::Result<()> {
+    fs::write(
+        "rust-toolchain.toml",
+        format!("[toolchain]\nchannel = \"{NIGHTLY}\"\n"),
+    )
+    .context("writing rust-toolchain.toml")?;
+    Ok(())
+}
+
 fn set_sources(config: &mut Config) -> anyhow::Result<()> {
     let path_iterator = glob("**/*.rs").context("globbing test sources")?;
     config.inputs = path_iterator
@@ -79,6 +95,9 @@ pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> {
     dump_lib()?;
     set_sources(config)?;
     dump_cargo_manifest(&config.qltest_dependencies)?;
+    if config.qltest_use_nightly {
+        dump_nightly_toolchain()?;
+    }
     if config.qltest_cargo_check {
         let status = Command::new("cargo")
             .env("RUSTFLAGS", "-Awarnings")

rust/extractor/src/qltest_cargo.mustache

@@ -11,7 +11,7 @@ members = [".lib", ".proc_macro"]
 [package]
 name = "test"
 version = "0.0.1"
-edition = "2021"
+edition = "{{ edition }}"
 [lib]
 path = "{{#uses_proc_macro}}../{{/uses_proc_macro}}lib.rs"
 {{#uses_main}}
@@ -32,7 +32,7 @@ proc_macro = { path = "../.proc_macro" }
 [package]
 name = "proc_macro"
 version = "0.0.1"
-edition = "2021"
+edition = "{{ edition }}"
 [lib]
 path = "../proc_macro.rs"
 proc_macro = true

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

@@ -35,7 +35,7 @@ module Impl {
    */
   abstract class Call extends ExprImpl::Expr {
     /** Holds if the receiver of this call is implicitly borrowed. */
-    predicate receiverImplicitlyBorrowed() { this.implicitBorrowAt(TSelfArgumentPosition()) }
+    predicate receiverImplicitlyBorrowed() { this.implicitBorrowAt(TSelfArgumentPosition(), _) }
 
     /** Gets the trait targeted by this call, if any. */
     abstract Trait getTrait();
@@ -47,7 +47,7 @@ module Impl {
     abstract Expr getArgument(ArgumentPosition pos);
 
     /** Holds if the argument at `pos` might be implicitly borrowed. */
-    abstract predicate implicitBorrowAt(ArgumentPosition pos);
+    abstract predicate implicitBorrowAt(ArgumentPosition pos, boolean certain);
 
     /** Gets the number of arguments _excluding_ any `self` argument. */
     int getNumberOfArguments() { result = count(this.getArgument(TPositionalArgumentPosition(_))) }
@@ -85,7 +85,7 @@ module Impl {
 
     override Trait getTrait() { none() }
 
-    override predicate implicitBorrowAt(ArgumentPosition pos) { none() }
+    override predicate implicitBorrowAt(ArgumentPosition pos, boolean certain) { none() }
 
     override Expr getArgument(ArgumentPosition pos) {
       result = super.getArgList().getArg(pos.asPosition())
@@ -109,7 +109,7 @@ module Impl {
       qualifier.toString() != "Self"
     }
 
-    override predicate implicitBorrowAt(ArgumentPosition pos) { none() }
+    override predicate implicitBorrowAt(ArgumentPosition pos, boolean certain) { none() }
 
     override Expr getArgument(ArgumentPosition pos) {
       pos.isSelf() and result = super.getArgList().getArg(0)
@@ -123,7 +123,9 @@ module Impl {
 
     override Trait getTrait() { none() }
 
-    override predicate implicitBorrowAt(ArgumentPosition pos) { pos.isSelf() }
+    override predicate implicitBorrowAt(ArgumentPosition pos, boolean certain) {
+      pos.isSelf() and certain = false
+    }
 
     override Expr getArgument(ArgumentPosition pos) {
       pos.isSelf() and result = this.(MethodCallExpr).getReceiver()
@@ -143,10 +145,13 @@ module Impl {
 
     override Trait getTrait() { result = trait }
 
-    override predicate implicitBorrowAt(ArgumentPosition pos) {
-      pos.isSelf() and borrows >= 1
-      or
-      pos.asPosition() = 0 and borrows = 2
+    override predicate implicitBorrowAt(ArgumentPosition pos, boolean certain) {
+      (
+        pos.isSelf() and borrows >= 1
+        or
+        pos.asPosition() = 0 and borrows = 2
+      ) and
+      certain = true
     }
 
     override Expr getArgument(ArgumentPosition pos) {

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

@@ -22,7 +22,7 @@ private predicate isOverloaded(string op, int arity, string path, string method,
     op = "!" and path = "core::ops::bit::Not" and method = "not" and borrows = 0
     or
     // Dereference
-    op = "*" and path = "core::ops::deref::Deref" and method = "deref" and borrows = 0
+    op = "*" and path = "core::ops::deref::Deref" and method = "deref" and borrows = 1
   )
   or
   arity = 2 and

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

@@ -205,7 +205,11 @@ abstract class ItemNode extends Locatable {
     else result = this.getImmediateParentModule().getImmediateParentModule()
     or
     name = "self" and
-    if this instanceof Module or this instanceof Enum or this instanceof Struct
+    if
+      this instanceof Module or
+      this instanceof Enum or
+      this instanceof Struct or
+      this instanceof Crate
     then result = this
     else result = this.getImmediateParentModule()
     or