Commit 0781ccd
authored
fix(rust): fully qualify Option and Result in macro (#1676)
When expanding the wit `option` and `result` types to rust, they were
printed as `Option` and `Result` respectively. This can cause collisions
with locally defined types that happen to share the same name.
For example:
```
type %result = bool;
// should return a result, but is generated returning the local alias
no-clobber: func() -> result<_, _>;
```
The generated types for `option` and `result` now expand to
`::core::option::Option` and `::core::result::Result`.
Signed-off-by: Scott Andrews <scott@andrews.me>1 parent 4ac8eaa commit 0781ccd
4 files changed
Lines changed: 57 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2384 | 2384 | | |
2385 | 2385 | | |
2386 | 2386 | | |
2387 | | - | |
| 2387 | + | |
2388 | 2388 | | |
2389 | 2389 | | |
2390 | 2390 | | |
| |||
2395 | 2395 | | |
2396 | 2396 | | |
2397 | 2397 | | |
2398 | | - | |
| 2398 | + | |
2399 | 2399 | | |
2400 | 2400 | | |
2401 | 2401 | | |
| |||
3195 | 3195 | | |
3196 | 3196 | | |
3197 | 3197 | | |
3198 | | - | |
| 3198 | + | |
3199 | 3199 | | |
3200 | 3200 | | |
3201 | 3201 | | |
3202 | 3202 | | |
3203 | 3203 | | |
3204 | 3204 | | |
3205 | | - | |
| 3205 | + | |
3206 | 3206 | | |
3207 | 3207 | | |
3208 | 3208 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
0 commit comments