Merge pull request #17623 from hvitved/rust/labelled-block

github · Sep 30, 2024 · c3311e5 · c3311e5
2 parents 752502b + 5ae6699
commit c3311e5
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 5 deletions.
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
diff --git a/rust/ql/lib/codeql/rust/elements/BreakExpr.qll b/rust/ql/lib/codeql/rust/elements/BreakExpr.qll
diff --git a/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/BreakExprImpl.qll
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/BreakExpr.qll
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
diff --git a/rust/ql/test/extractor-tests/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr.expected
@@ -1,2 +1,3 @@
 | gen_break_expr.rs:7:13:7:17 | BreakExpr | getNumberOfAttrs: | 0 | hasExpr: | no | hasLifetime: | no |
 | gen_break_expr.rs:12:13:12:27 | BreakExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
+| gen_break_expr.rs:17:13:17:27 | BreakExpr | getNumberOfAttrs: | 0 | hasExpr: | yes | hasLifetime: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.expected
@@ -1 +1,2 @@
 | gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:12:26:12:27 | 42 |
+| gen_break_expr.rs:17:13:17:27 | BreakExpr | gen_break_expr.rs:17:26:17:27 | 42 |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.expected b/rust/ql/test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.expected
@@ -1 +1,2 @@
 | gen_break_expr.rs:12:13:12:27 | BreakExpr | gen_break_expr.rs:12:19:12:24 | Lifetime |
+| gen_break_expr.rs:17:13:17:27 | BreakExpr | gen_break_expr.rs:17:19:17:24 | Lifetime |
diff --git a/rust/ql/test/extractor-tests/generated/BreakExpr/gen_break_expr.rs b/rust/ql/test/extractor-tests/generated/BreakExpr/gen_break_expr.rs
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
@@ -289,6 +289,14 @@ class _:
         }
     };
     ```
+    ```rust
+    let x = 'label: {
+        if exit() {
+            break 'label 42;
+        }
+        0;
+    };
+    ```
   """
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		\| gen_break_expr.rs:12:13:12:27 \| BreakExpr \| gen_break_expr.rs:12:26:12:27 \| 42 \|
		\| gen_break_expr.rs:17:13:17:27 \| BreakExpr \| gen_break_expr.rs:17:26:17:27 \| 42 \|
-Original file line number
+Diff line change
@@ Expand Up / @@ -289,6 +289,14 @@ class _: @@
             }
         };
         ```
+        ```rust
+        let x = 'label: {
+            if exit() {
+                break 'label 42;
+            }
+;
+        };
+        ```
       """
@@ Expand Down @@