hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'redsun82/rust-qltest-proc-macro' into redsun82/rust-expand-assoc-items

Browse Source
This commit is contained in:
Paolo Tranquilli
2025-06-18 11:12:40 +02:00
parent f3c5bde3c0 75616de613
commit 40e1af9428
8 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rust/extractor/src/qltest.rs
View File

@@ -91,6 +91,6 @@ pub(crate) fn prepare(config: &mut Config) -> anyhow::Result<()> {
} else {
anyhow::bail!("requested cargo check failed");
}
}
};
Ok(())
}

2
rust/extractor/src/qltest_cargo.mustache
View File

@@ -31,7 +31,7 @@ proc_macro = { path = "../.proc_macro" }
{{#Macro}}
[package]
name = "proc_macro"
version = "0.1.0"
version = "0.0.1"
edition = "2021"
[lib]
path = "../proc_macro.rs"

2
rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected
View File

@@ -1,3 +1,3 @@
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.1.0) |
| macro_expansion.rs:1:5:1:14 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |

2
rust/ql/test/extractor-tests/macro-expansion/Cargo.lock generated
View File

@@ -13,7 +13,7 @@ dependencies = [
[[package]]
name = "proc_macro"
version = "0.1.0"
version = "0.0.1"
dependencies = [
"quote",
"syn",

2
rust/ql/test/library-tests/dataflow/models/Cargo.lock generated
View File

@@ -219,7 +219,7 @@ dependencies = [
[[package]]
name = "test"
version = "0.1.0"
version = "0.0.1"
dependencies = [
"tokio",
]

6
rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected
View File

@@ -1,3 +1,9 @@
multiplePathResolutions
| main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
| main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
| main.rs:626:3:626:12 | proc_macro | file://:0:0:0:0 | Crate(proc_macro@0.0.0) |
| main.rs:626:3:626:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
| main.rs:631:7:631:16 | proc_macro | file://:0:0:0:0 | Crate(proc_macro@0.0.0) |
| main.rs:631:7:631:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
| main.rs:634:7:634:16 | proc_macro | file://:0:0:0:0 | Crate(proc_macro@0.0.0) |
| main.rs:634:7:634:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |

2
rust/ql/test/library-tests/path-resolution/Cargo.lock generated
View File

@@ -13,7 +13,7 @@ dependencies = [
[[package]]
name = "proc_macro"
version = "0.1.0"
version = "0.0.1"
dependencies = [
"quote",
"syn",

6
rust/ql/test/library-tests/path-resolution/path-resolution.expected
View File

@@ -267,14 +267,14 @@ resolvePath
| main.rs:620:9:620:47 | ...::call_both | main.rs:586:9:589:9 | fn call_both |
| main.rs:620:25:620:35 | Implementor | main.rs:592:5:592:23 | struct Implementor |
| main.rs:626:3:626:12 | proc_macro | {EXTERNAL LOCATION} | Crate(proc_macro@0.0.0) |
| main.rs:626:3:626:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.1.0) |
| main.rs:626:3:626:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
| main.rs:626:3:626:24 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
| main.rs:630:6:630:12 | AStruct | main.rs:629:1:629:17 | struct AStruct |
| main.rs:631:7:631:16 | proc_macro | {EXTERNAL LOCATION} | Crate(proc_macro@0.0.0) |
| main.rs:631:7:631:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.1.0) |
| main.rs:631:7:631:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
| main.rs:631:7:631:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
| main.rs:634:7:634:16 | proc_macro | {EXTERNAL LOCATION} | Crate(proc_macro@0.0.0) |
| main.rs:634:7:634:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.1.0) |
| main.rs:634:7:634:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
| main.rs:634:7:634:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
| main.rs:639:5:639:6 | my | main.rs:1:1:1:7 | mod my |
| main.rs:639:5:639:14 | ...::nested | my.rs:1:1:1:15 | mod nested |