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

redsun82 · web-flow · commit 9f2b962fe8af · 2024-12-16T15:06:00.000+01:00
Rust: Fix semantic merge conflicts
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

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`query: queries/security/CWE-327/BrokenCryptoAlgorithm.ql`
`2`		`-postprocess: utils/InlineExpectationsTestQuery.ql`
	`2`	`+postprocess: utils/test/InlineExpectationsTestQuery.ql`