Rust: Expand on toString of IdentPat

Author: paldepind

rust/ql/lib/codeql/rust/elements/internal/IdentPatImpl.qll

@@ -28,6 +28,18 @@ module Impl {
    * ```
    */
   class IdentPat extends Generated::IdentPat {
-    override string toString() { result = this.getName().getText() }
+    override string toString() {
+      result = strictconcat(int i | | this.toStringPart(i), " " order by i)
+    }
+
+    private string toStringPart(int index) {
+      index = 0 and this.isRef() and result = "ref"
+      or
+      index = 1 and this.isMut() and result = "mut"
+      or
+      index = 2 and result = this.getName().getText()
+      or
+      index = 3 and this.hasPat() and result = "@ ..."
+    }
   }
 }

rust/ql/test/extractor-tests/generated/IdentPat/IdentPat.expected

@@ -1,2 +1,2 @@
 | gen_ident_pat.rs:6:22:6:22 | y | getNumberOfAttrs: | 0 | isMut: | no | isRef: | no | hasName: | yes | hasPat: | no |
-| gen_ident_pat.rs:10:9:10:25 | y | getNumberOfAttrs: | 0 | isMut: | no | isRef: | no | hasName: | yes | hasPat: | yes |
+| gen_ident_pat.rs:10:9:10:25 | y @ ... | getNumberOfAttrs: | 0 | isMut: | no | isRef: | no | hasName: | yes | hasPat: | yes |

rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getName.expected

@@ -1,2 +1,2 @@
 | gen_ident_pat.rs:6:22:6:22 | y | gen_ident_pat.rs:6:22:6:22 | y |
-| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:9:10:9 | y |
+| gen_ident_pat.rs:10:9:10:25 | y @ ... | gen_ident_pat.rs:10:9:10:9 | y |

rust/ql/test/extractor-tests/generated/IdentPat/IdentPat_getPat.expected

@@ -1 +1 @@
-| gen_ident_pat.rs:10:9:10:25 | y | gen_ident_pat.rs:10:11:10:25 | ...::Some(...) |
+| gen_ident_pat.rs:10:9:10:25 | y @ ... | gen_ident_pat.rs:10:11:10:25 | ...::Some(...) |

rust/ql/test/library-tests/controlflow/BasicBlocks.expected

@@ -612,32 +612,32 @@ dominates
 | test.rs:396:13:396:13 | _ | test.rs:396:13:396:13 | _ |
 | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern |
 | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern | test.rs:401:9:404:9 | match 43 { ... } |
-| test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern | test.rs:402:13:402:21 | [match(true)] n |
+| test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern | test.rs:402:13:402:21 | [match(true)] n @ ... |
 | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern | test.rs:402:17:402:17 | 1 |
 | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern | test.rs:402:20:402:21 | 10 |
 | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern | test.rs:403:13:403:13 | _ |
 | test.rs:401:9:404:9 | match 43 { ... } | test.rs:401:9:404:9 | match 43 { ... } |
-| test.rs:402:13:402:21 | [match(true)] n | test.rs:402:13:402:21 | [match(true)] n |
-| test.rs:402:17:402:17 | 1 | test.rs:402:13:402:21 | [match(true)] n |
+| test.rs:402:13:402:21 | [match(true)] n @ ... | test.rs:402:13:402:21 | [match(true)] n @ ... |
+| test.rs:402:17:402:17 | 1 | test.rs:402:13:402:21 | [match(true)] n @ ... |
 | test.rs:402:17:402:17 | 1 | test.rs:402:17:402:17 | 1 |
 | test.rs:402:17:402:17 | 1 | test.rs:402:20:402:21 | 10 |
-| test.rs:402:20:402:21 | 10 | test.rs:402:13:402:21 | [match(true)] n |
+| test.rs:402:20:402:21 | 10 | test.rs:402:13:402:21 | [match(true)] n @ ... |
 | test.rs:402:20:402:21 | 10 | test.rs:402:20:402:21 | 10 |
 | test.rs:403:13:403:13 | _ | test.rs:403:13:403:13 | _ |
 | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref |
 | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | test.rs:409:9:412:9 | match a { ... } |
-| test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | test.rs:410:13:410:29 | [match(true)] n |
+| test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | test.rs:410:13:410:29 | [match(true)] ref mut n @ ... |
 | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | test.rs:410:25:410:25 | 1 |
 | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | test.rs:410:28:410:29 | 10 |
-| test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | test.rs:411:13:411:21 | n |
+| test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | test.rs:411:13:411:21 | ref mut n |
 | test.rs:409:9:412:9 | match a { ... } | test.rs:409:9:412:9 | match a { ... } |
-| test.rs:410:13:410:29 | [match(true)] n | test.rs:410:13:410:29 | [match(true)] n |
-| test.rs:410:25:410:25 | 1 | test.rs:410:13:410:29 | [match(true)] n |
+| test.rs:410:13:410:29 | [match(true)] ref mut n @ ... | test.rs:410:13:410:29 | [match(true)] ref mut n @ ... |
+| test.rs:410:25:410:25 | 1 | test.rs:410:13:410:29 | [match(true)] ref mut n @ ... |
 | test.rs:410:25:410:25 | 1 | test.rs:410:25:410:25 | 1 |
 | test.rs:410:25:410:25 | 1 | test.rs:410:28:410:29 | 10 |
-| test.rs:410:28:410:29 | 10 | test.rs:410:13:410:29 | [match(true)] n |
+| test.rs:410:28:410:29 | 10 | test.rs:410:13:410:29 | [match(true)] ref mut n @ ... |
 | test.rs:410:28:410:29 | 10 | test.rs:410:28:410:29 | 10 |
-| test.rs:411:13:411:21 | n | test.rs:411:13:411:21 | n |
+| test.rs:411:13:411:21 | ref mut n | test.rs:411:13:411:21 | ref mut n |
 | test.rs:418:5:423:5 | enter fn test_infinite_loop | test.rs:418:5:423:5 | enter fn test_infinite_loop |
 | test.rs:418:5:423:5 | enter fn test_infinite_loop | test.rs:420:13:420:14 | TupleExpr |
 | test.rs:420:13:420:14 | TupleExpr | test.rs:420:13:420:14 | TupleExpr |
@@ -1223,25 +1223,25 @@ postDominance
 | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern |
 | test.rs:401:9:404:9 | match 43 { ... } | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern |
 | test.rs:401:9:404:9 | match 43 { ... } | test.rs:401:9:404:9 | match 43 { ... } |
-| test.rs:401:9:404:9 | match 43 { ... } | test.rs:402:13:402:21 | [match(true)] n |
+| test.rs:401:9:404:9 | match 43 { ... } | test.rs:402:13:402:21 | [match(true)] n @ ... |
 | test.rs:401:9:404:9 | match 43 { ... } | test.rs:402:17:402:17 | 1 |
 | test.rs:401:9:404:9 | match 43 { ... } | test.rs:402:20:402:21 | 10 |
 | test.rs:401:9:404:9 | match 43 { ... } | test.rs:403:13:403:13 | _ |
-| test.rs:402:13:402:21 | [match(true)] n | test.rs:402:13:402:21 | [match(true)] n |
+| test.rs:402:13:402:21 | [match(true)] n @ ... | test.rs:402:13:402:21 | [match(true)] n @ ... |
 | test.rs:402:17:402:17 | 1 | test.rs:402:17:402:17 | 1 |
 | test.rs:402:20:402:21 | 10 | test.rs:402:20:402:21 | 10 |
 | test.rs:403:13:403:13 | _ | test.rs:403:13:403:13 | _ |
 | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref |
 | test.rs:409:9:412:9 | match a { ... } | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref |
 | test.rs:409:9:412:9 | match a { ... } | test.rs:409:9:412:9 | match a { ... } |
-| test.rs:409:9:412:9 | match a { ... } | test.rs:410:13:410:29 | [match(true)] n |
+| test.rs:409:9:412:9 | match a { ... } | test.rs:410:13:410:29 | [match(true)] ref mut n @ ... |
 | test.rs:409:9:412:9 | match a { ... } | test.rs:410:25:410:25 | 1 |
 | test.rs:409:9:412:9 | match a { ... } | test.rs:410:28:410:29 | 10 |
-| test.rs:409:9:412:9 | match a { ... } | test.rs:411:13:411:21 | n |
-| test.rs:410:13:410:29 | [match(true)] n | test.rs:410:13:410:29 | [match(true)] n |
+| test.rs:409:9:412:9 | match a { ... } | test.rs:411:13:411:21 | ref mut n |
+| test.rs:410:13:410:29 | [match(true)] ref mut n @ ... | test.rs:410:13:410:29 | [match(true)] ref mut n @ ... |
 | test.rs:410:25:410:25 | 1 | test.rs:410:25:410:25 | 1 |
 | test.rs:410:28:410:29 | 10 | test.rs:410:28:410:29 | 10 |
-| test.rs:411:13:411:21 | n | test.rs:411:13:411:21 | n |
+| test.rs:411:13:411:21 | ref mut n | test.rs:411:13:411:21 | ref mut n |
 | test.rs:418:5:423:5 | enter fn test_infinite_loop | test.rs:418:5:423:5 | enter fn test_infinite_loop |
 | test.rs:420:13:420:14 | TupleExpr | test.rs:420:13:420:14 | TupleExpr |
 | test.rs:427:5:429:5 | enter fn say_hello | test.rs:427:5:429:5 | enter fn say_hello |
@@ -1503,15 +1503,15 @@ immediateDominator
 | test.rs:395:20:395:20 | 3 | test.rs:395:13:395:13 | 5 |
 | test.rs:396:13:396:13 | _ | test.rs:395:13:395:15 | RangePat |
 | test.rs:401:9:404:9 | match 43 { ... } | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern |
-| test.rs:402:13:402:21 | [match(true)] n | test.rs:402:20:402:21 | 10 |
+| test.rs:402:13:402:21 | [match(true)] n @ ... | test.rs:402:20:402:21 | 10 |
 | test.rs:402:17:402:17 | 1 | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern |
 | test.rs:402:20:402:21 | 10 | test.rs:402:17:402:17 | 1 |
 | test.rs:403:13:403:13 | _ | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern |
 | test.rs:409:9:412:9 | match a { ... } | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref |
-| test.rs:410:13:410:29 | [match(true)] n | test.rs:410:28:410:29 | 10 |
+| test.rs:410:13:410:29 | [match(true)] ref mut n @ ... | test.rs:410:28:410:29 | 10 |
 | test.rs:410:25:410:25 | 1 | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref |
 | test.rs:410:28:410:29 | 10 | test.rs:410:25:410:25 | 1 |
-| test.rs:411:13:411:21 | n | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref |
+| test.rs:411:13:411:21 | ref mut n | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref |
 | test.rs:420:13:420:14 | TupleExpr | test.rs:418:5:423:5 | enter fn test_infinite_loop |
 | test.rs:444:28:449:9 | exit { ... } (normal) | test.rs:444:28:449:9 | enter { ... } |
 | test.rs:445:13:447:13 | if b {...} | test.rs:444:28:449:9 | enter { ... } |
@@ -2011,16 +2011,16 @@ joinBlockPredecessor
 | test.rs:395:13:395:15 | RangePat | test.rs:394:16:394:16 | 2 | 0 |
 | test.rs:396:13:396:13 | _ | test.rs:395:13:395:13 | 5 | 0 |
 | test.rs:396:13:396:13 | _ | test.rs:395:13:395:15 | RangePat | 1 |
-| test.rs:401:9:404:9 | match 43 { ... } | test.rs:402:13:402:21 | [match(true)] n | 0 |
+| test.rs:401:9:404:9 | match 43 { ... } | test.rs:402:13:402:21 | [match(true)] n @ ... | 0 |
 | test.rs:401:9:404:9 | match 43 { ... } | test.rs:403:13:403:13 | _ | 1 |
 | test.rs:403:13:403:13 | _ | test.rs:400:5:405:5 | enter fn identifier_pattern_with_subpattern | 2 |
 | test.rs:403:13:403:13 | _ | test.rs:402:17:402:17 | 1 | 1 |
 | test.rs:403:13:403:13 | _ | test.rs:402:20:402:21 | 10 | 0 |
-| test.rs:409:9:412:9 | match a { ... } | test.rs:410:13:410:29 | [match(true)] n | 0 |
-| test.rs:409:9:412:9 | match a { ... } | test.rs:411:13:411:21 | n | 1 |
-| test.rs:411:13:411:21 | n | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | 2 |
-| test.rs:411:13:411:21 | n | test.rs:410:25:410:25 | 1 | 1 |
-| test.rs:411:13:411:21 | n | test.rs:410:28:410:29 | 10 | 0 |
+| test.rs:409:9:412:9 | match a { ... } | test.rs:410:13:410:29 | [match(true)] ref mut n @ ... | 0 |
+| test.rs:409:9:412:9 | match a { ... } | test.rs:411:13:411:21 | ref mut n | 1 |
+| test.rs:411:13:411:21 | ref mut n | test.rs:407:5:414:5 | enter fn identifier_pattern_with_ref | 2 |
+| test.rs:411:13:411:21 | ref mut n | test.rs:410:25:410:25 | 1 | 1 |
+| test.rs:411:13:411:21 | ref mut n | test.rs:410:28:410:29 | 10 | 0 |
 | test.rs:420:13:420:14 | TupleExpr | test.rs:418:5:423:5 | enter fn test_infinite_loop | 1 |
 | test.rs:420:13:420:14 | TupleExpr | test.rs:420:13:420:14 | TupleExpr | 0 |
 | test.rs:444:28:449:9 | exit { ... } (normal) | test.rs:445:13:447:13 | if b {...} | 1 |