Merge pull request #18297 from hvitved/rust/fix-semantic-merge

Rust: Fix semantic merge conflicts
github · Dec 16, 2024 · 9f2b962 · 9f2b962
2 parents 32bfbb8 + 5ed03e2
commit 9f2b962
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rust/ql/test/library-tests/dataflow/closures/inline-flow.ql b/rust/ql/test/library-tests/dataflow/closures/inline-flow.ql
@@ -3,7 +3,7 @@
  */
 
 import rust
-import utils.InlineFlowTest
+import utils.test.InlineFlowTest
 import DefaultFlowTest
 import ValueFlow::PathGraph
 

diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.qlref b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.qlref
@@ -1,2 +1,2 @@
 query: queries/security/CWE-327/BrokenCryptoAlgorithm.ql
-postprocess: utils/InlineExpectationsTestQuery.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql