Rust: more macro expansion test tweaks

Author: Paolo Tranquilli

rust/ql/.generated.list

@@ -34,5 +34,13 @@ macro_rules! my_int {
 }
 
 fn answer() -> my_int!() {  // this doesn't expand since 0.0.274
-    42
+    let a: my_int!() = 42;  // this is fine
+    a as my_int!() // this is fine too
+}
+
+
+type MyInt = my_int!();  // this doesn't expand since 0.0.274
+
+struct MyStruct {
+    field: my_int!(),  // this doesn't expand since 0.0.274
 }

rust/ql/integration-tests/macro-expansion/calls/src/lib.rs

@@ -27,9 +27,14 @@ macro_calls
 | calls/src/lib.rs:22:9:23:13 | format!... | calls/src/lib.rs:22:9:23:13 | ...::must_use(...) |
 | calls/src/lib.rs:27:1:27:24 | concat!... | calls/src/lib.rs:27:1:27:24 | "Hello world!" |
 | calls/src/lib.rs:27:1:27:24 | include!... | calls/src/lib.rs:27:1:27:24 | MacroItems |
+| calls/src/lib.rs:37:12:37:20 | my_int!... | calls/src/lib.rs:37:12:37:20 | i32 |
+| calls/src/lib.rs:38:12:38:20 | my_int!... | calls/src/lib.rs:38:12:38:20 | i32 |
+| calls/src/lib.rs:39:10:39:18 | my_int!... | calls/src/lib.rs:39:10:39:18 | i32 |
 unexpanded_macro_calls
 | attributes/src/lib.rs:5:9:5:35 | concat!... |
 | calls/src/included.rs:2:9:2:39 | concat!... |
 | calls/src/lib.rs:22:9:22:31 | concat!... |
 | calls/src/lib.rs:29:9:29:32 | include_str!... |
 | calls/src/lib.rs:36:16:36:24 | my_int!... |
+| calls/src/lib.rs:43:14:43:22 | my_int!... |
+| calls/src/lib.rs:46:12:46:20 | my_int!... |

rust/ql/integration-tests/macro-expansion/test.expected

@@ -1 +1 @@
-| gen_macro_type_repr.rs:10:14:10:26 | MacroTypeRepr | hasMacroCall: | yes |
+| gen_macro_type_repr.rs:11:12:11:24 | MacroTypeRepr | hasMacroCall: | yes |