diff --git a/rust/ql/test/extractor-tests/crate_graph/crates.expected b/rust/ql/test/extractor-tests/crate_graph/crates.expected index f934618db9c..21c662bb425 100644 --- a/rust/ql/test/extractor-tests/crate_graph/crates.expected +++ b/rust/ql/test/extractor-tests/crate_graph/crates.expected @@ -1,8 +1,8 @@ #-----| Crate(alloc@0.0.0) #-----| core -> Crate(core@0.0.0) -#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140) -#-----| rand -> Crate(rand@0.8.5) -#-----| rand_xorshift -> Crate(rand_xorshift@0.3.0) +#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146) +#-----| rand -> Crate(rand@0.9.0) +#-----| rand_xorshift -> Crate(rand_xorshift@0.4.0) #-----| Crate(allocator_api2@0.2.21) @@ -16,7 +16,7 @@ #-----| Crate(cfg_if@1.0.0) #-----| core -> Crate(core@0.0.0) -#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140) +#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146) #-----| Crate(cfg_if@1.0.1) #-----| proc_macro -> Crate(proc_macro@0.0.0) @@ -25,12 +25,10 @@ #-----| std -> Crate(std@0.0.0) #-----| test -> Crate(test@0.0.0) -#-----| Crate(compiler_builtins@0.1.140) +#-----| Crate(compiler_builtins@0.1.146) #-----| core -> Crate(core@0.0.0) #-----| Crate(core@0.0.0) -#-----| rand -> Crate(rand@0.8.5) -#-----| rand_xorshift -> Crate(rand_xorshift@0.3.0) #-----| Crate(crypto_common@0.1.6) #-----| proc_macro -> Crate(proc_macro@0.0.0) @@ -67,7 +65,7 @@ #-----| allocator_api2 -> Crate(allocator_api2@0.2.21) #-----| alloc -> Crate(alloc@0.0.0) #-----| core -> Crate(core@0.0.0) -#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140) +#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146) #-----| Crate(libc@0.2.169) #-----| rustc_std_workspace_core -> Crate(core@0.0.0) @@ -102,14 +100,14 @@ main.rs: #-----| Crate(panic_abort@0.0.0) #-----| alloc -> Crate(alloc@0.0.0) #-----| core -> Crate(core@0.0.0) -#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140) +#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146) #-----| cfg_if -> Crate(cfg_if@1.0.0) #-----| libc -> Crate(libc@0.2.169) #-----| Crate(panic_unwind@0.0.0) #-----| alloc -> Crate(alloc@0.0.0) #-----| core -> Crate(core@0.0.0) -#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140) +#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146) #-----| cfg_if -> Crate(cfg_if@1.0.0) #-----| libc -> Crate(libc@0.2.169) #-----| unwind -> Crate(unwind@0.0.0) @@ -118,27 +116,29 @@ main.rs: #-----| core -> Crate(core@0.0.0) #-----| std -> Crate(std@0.0.0) -#-----| Crate(rand@0.8.5) -#-----| rand_core -> Crate(rand_core@0.6.4) +#-----| Crate(rand@0.9.0) +#-----| zerocopy -> Crate(zerocopy@0.8.17) +#-----| rand_core -> Crate(rand_core@0.9.0) -#-----| Crate(rand_core@0.6.4) +#-----| Crate(rand_core@0.9.0) +#-----| zerocopy -> Crate(zerocopy@0.8.17) -#-----| Crate(rand_xorshift@0.3.0) -#-----| rand_core -> Crate(rand_core@0.6.4) +#-----| Crate(rand_xorshift@0.4.0) +#-----| rand_core -> Crate(rand_core@0.9.0) #-----| Crate(rustc_demangle@0.1.24) #-----| core -> Crate(core@0.0.0) -#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140) +#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146) #-----| Crate(std@0.0.0) #-----| alloc -> Crate(alloc@0.0.0) #-----| core -> Crate(core@0.0.0) -#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140) +#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146) #-----| cfg_if -> Crate(cfg_if@1.0.0) #-----| hashbrown -> Crate(hashbrown@0.15.2) #-----| libc -> Crate(libc@0.2.169) -#-----| rand -> Crate(rand@0.8.5) -#-----| rand_xorshift -> Crate(rand_xorshift@0.3.0) +#-----| rand -> Crate(rand@0.9.0) +#-----| rand_xorshift -> Crate(rand_xorshift@0.4.0) #-----| rustc_demangle -> Crate(rustc_demangle@0.1.24) #-----| panic_abort -> Crate(panic_abort@0.0.0) #-----| unwind -> Crate(unwind@0.0.0) @@ -148,7 +148,7 @@ main.rs: #-----| Crate(std_detect@0.1.5) #-----| alloc -> Crate(alloc@0.0.0) #-----| core -> Crate(core@0.0.0) -#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140) +#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146) #-----| cfg_if -> Crate(cfg_if@1.0.0) #-----| libc -> Crate(libc@0.2.169) @@ -178,11 +178,11 @@ lib.rs: #-----| Crate(unicode_width@0.1.14) #-----| core -> Crate(core@0.0.0) #-----| std -> Crate(std@0.0.0) -#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140) +#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146) #-----| Crate(unwind@0.0.0) #-----| core -> Crate(core@0.0.0) -#-----| compiler_builtins -> Crate(compiler_builtins@0.1.140) +#-----| compiler_builtins -> Crate(compiler_builtins@0.1.146) #-----| cfg_if -> Crate(cfg_if@1.0.0) #-----| libc -> Crate(libc@0.2.169) @@ -192,3 +192,5 @@ lib.rs: #-----| core -> Crate(core@0.0.0) #-----| std -> Crate(std@0.0.0) #-----| test -> Crate(test@0.0.0) + +#-----| Crate(zerocopy@0.8.17) diff --git a/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.expected b/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.expected index e69de29bb2d..e77dfa46a42 100644 --- a/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.expected +++ b/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel.expected @@ -0,0 +1 @@ +| gen_asm_label.rs:10:9:10:47 | AsmLabel | hasBlockExpr: | yes | diff --git a/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel_getBlockExpr.expected b/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel_getBlockExpr.expected index e69de29bb2d..8f99b753a28 100644 --- a/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel_getBlockExpr.expected +++ b/rust/ql/test/extractor-tests/generated/AsmLabel/AsmLabel_getBlockExpr.expected @@ -0,0 +1 @@ +| gen_asm_label.rs:10:9:10:47 | AsmLabel | gen_asm_label.rs:10:15:10:47 | { ... } | diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected index e69de29bb2d..66e669e9e9f 100644 --- a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected +++ b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected @@ -0,0 +1 @@ +| gen_closure_binder.rs:7:21:7:43 | ClosureBinder | hasGenericParamList: | yes | diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.expected index e69de29bb2d..f3d94f1b8fa 100644 --- a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.expected +++ b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.expected @@ -0,0 +1 @@ +| gen_closure_binder.rs:7:21:7:43 | ClosureBinder | gen_closure_binder.rs:7:24:7:43 | <...> | diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.expected b/rust/ql/test/extractor-tests/generated/Const/Const.expected index ceb8669ac83..09c791ffe4f 100644 --- a/rust/ql/test/extractor-tests/generated/Const/Const.expected +++ b/rust/ql/test/extractor-tests/generated/Const/Const.expected @@ -1 +1 @@ -| gen_const.rs:4:5:7:22 | Const | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasBody: | yes | isConst: | yes | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasVisibility: | no | hasImplementation: | yes | +| gen_const.rs:4:5:7:22 | Const | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasBody: | yes | hasGenericParamList: | no | isConst: | yes | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasVisibility: | no | hasWhereClause: | no | hasImplementation: | yes | diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getGenericParamList.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getGenericParamList.expected new file mode 100644 index 00000000000..e69de29bb2d diff --git a/rust/ql/test/extractor-tests/generated/Const/Const_getWhereClause.expected b/rust/ql/test/extractor-tests/generated/Const/Const_getWhereClause.expected new file mode 100644 index 00000000000..e69de29bb2d diff --git a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected new file mode 100644 index 00000000000..82614fc092a --- /dev/null +++ b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected @@ -0,0 +1,4 @@ +extractionWarning +| included/included.rs:2:9:2:39 | macro expansion failed: could not resolve macro 'concat' | +| macro_expansion.rs:56:9:56:31 | macro expansion failed: could not resolve macro 'concat' | +| macro_expansion.rs:63:9:63:32 | macro expansion failed: could not resolve macro 'include_str' | diff --git a/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected b/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected index a89072531cc..e92036b352b 100644 --- a/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected +++ b/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected @@ -140,7 +140,6 @@ included/included.rs: # 2| getSegment(): [PathSegment] concat # 2| getIdentifier(): [NameRef] concat # 2| getTokenTree(): [TokenTree] TokenTree -# 2| getMacroCallExpansion(): [StringLiteralExpr] "Hello world!" # 1| getName(): [Name] included # 2| [Comment] //... lib.rs: @@ -655,7 +654,6 @@ macro_expansion.rs: # 56| getSegment(): [PathSegment] concat # 56| getIdentifier(): [NameRef] concat # 56| getTokenTree(): [TokenTree] TokenTree -# 56| getMacroCallExpansion(): [StringLiteralExpr] "<{}>" # 55| getFunction(): [PathExpr] ...::format # 55| getPath(): [Path] ...::format # 55| getQualifier(): [Path] ...::fmt @@ -714,7 +712,6 @@ macro_expansion.rs: # 63| getSegment(): [PathSegment] include_str # 63| getIdentifier(): [NameRef] include_str # 63| getTokenTree(): [TokenTree] TokenTree -# 63| getMacroCallExpansion(): [StringLiteralExpr] "" # 63| getPath(): [Path] doc # 63| getSegment(): [PathSegment] doc # 63| getIdentifier(): [NameRef] doc diff --git a/rust/ql/test/extractor-tests/macro-expansion/test.expected b/rust/ql/test/extractor-tests/macro-expansion/test.expected index 5940c63da2b..1cfb74870bc 100644 --- a/rust/ql/test/extractor-tests/macro-expansion/test.expected +++ b/rust/ql/test/extractor-tests/macro-expansion/test.expected @@ -15,7 +15,6 @@ attribute_macros | macro_expansion.rs:31:5:34:5 | fn bzz | 1 | macro_expansion.rs:32:5:33:17 | fn bzz_1 | | macro_expansion.rs:31:5:34:5 | fn bzz | 2 | macro_expansion.rs:32:5:33:17 | fn bzz_2 | macro_calls -| included/included.rs:2:9:2:39 | concat!... | included/included.rs:2:17:2:38 | "Hello world!" | | macro_expansion.rs:5:9:5:34 | concat!... | macro_expansion.rs:5:17:5:34 | "Hello world!" | | macro_expansion.rs:5:9:5:34 | concat!... | macro_expansion.rs:5:17:5:34 | "Hello world!" | | macro_expansion.rs:31:5:31:16 | ...::format_args_nl!... | macro_expansion.rs:31:5:31:16 | FormatArgsExpr | @@ -30,18 +29,22 @@ macro_calls | macro_expansion.rs:44:5:44:13 | def_x!... | macro_expansion.rs:44:5:44:13 | MacroItems | | macro_expansion.rs:53:9:53:25 | concat!... | macro_expansion.rs:53:17:53:24 | "xy" | | macro_expansion.rs:55:9:58:5 | my_macro!... | macro_expansion.rs:56:9:57:13 | MacroExpr | -| macro_expansion.rs:56:9:56:31 | concat!... | macro_expansion.rs:56:17:56:30 | "<{}>" | | macro_expansion.rs:56:9:57:13 | ...::format_args!... | macro_expansion.rs:56:9:57:13 | FormatArgsExpr | | macro_expansion.rs:56:9:57:13 | format!... | macro_expansion.rs:56:9:57:13 | ...::must_use(...) | | macro_expansion.rs:61:1:61:33 | concat!... | macro_expansion.rs:61:1:61:33 | "Hello world!" | | macro_expansion.rs:61:1:61:33 | include!... | macro_expansion.rs:61:1:61:33 | MacroItems | -| macro_expansion.rs:63:9:63:32 | include_str!... | macro_expansion.rs:63:22:63:31 | "" | | macro_expansion.rs:70:16:70:24 | my_int!... | macro_expansion.rs:70:16:70:24 | i32 | | macro_expansion.rs:71:12:71:20 | my_int!... | macro_expansion.rs:71:12:71:20 | i32 | | macro_expansion.rs:72:10:72:18 | my_int!... | macro_expansion.rs:72:10:72:18 | i32 | | macro_expansion.rs:76:14:76:22 | my_int!... | macro_expansion.rs:76:14:76:22 | i32 | | macro_expansion.rs:79:12:79:20 | my_int!... | macro_expansion.rs:79:12:79:20 | i32 | unexpanded_macro_calls +| included/included.rs:2:9:2:39 | concat!... | | macro_expansion.rs:5:9:5:35 | concat!... | | macro_expansion.rs:33:9:33:16 | hello!... | +| macro_expansion.rs:56:9:56:31 | concat!... | +| macro_expansion.rs:63:9:63:32 | include_str!... | warnings +| included/included.rs:2:9:2:39 | macro expansion failed: could not resolve macro 'concat' | +| macro_expansion.rs:56:9:56:31 | macro expansion failed: could not resolve macro 'concat' | +| macro_expansion.rs:63:9:63:32 | macro expansion failed: could not resolve macro 'include_str' | diff --git a/rust/ql/test/library-tests/dataflow/local/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/local/CONSISTENCY/PathResolutionConsistency.expected index b9ee72e892b..2595a1c05d1 100644 --- a/rust/ql/test/library-tests/dataflow/local/CONSISTENCY/PathResolutionConsistency.expected +++ b/rust/ql/test/library-tests/dataflow/local/CONSISTENCY/PathResolutionConsistency.expected @@ -6,6 +6,12 @@ multiplePathResolutions | main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from | | main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from | | main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from | +| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from | +| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from | +| main.rs:532:10:532:18 | ...::from | file://:0:0:0:0 | fn from | +| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from | +| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from | +| main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from | | main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from | | main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from | | main.rs:538:10:538:18 | ...::from | file://:0:0:0:0 | fn from | diff --git a/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected index 82fc38ae2fa..e673be7aa3b 100644 --- a/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected +++ b/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected @@ -1,3 +1,10 @@ +multipleMethodCallTargets +| main.rs:374:5:374:27 | ... .add_assign(...) | file://:0:0:0:0 | fn add_assign | +| main.rs:374:5:374:27 | ... .add_assign(...) | file://:0:0:0:0 | fn add_assign | +| main.rs:374:5:374:27 | ... .add_assign(...) | file://:0:0:0:0 | fn add_assign | +| main.rs:459:9:459:23 | z.add_assign(...) | file://:0:0:0:0 | fn add_assign | +| main.rs:459:9:459:23 | z.add_assign(...) | file://:0:0:0:0 | fn add_assign | +| main.rs:459:9:459:23 | z.add_assign(...) | file://:0:0:0:0 | fn add_assign | multiplePathResolutions | main.rs:85:19:85:30 | ...::from | file://:0:0:0:0 | fn from | | main.rs:85:19:85:30 | ...::from | file://:0:0:0:0 | fn from |