diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-22 21:42:54 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-12-22 21:42:54 +0000 |
| commit | 60aa4d12f95477565d5b01f122d2c9dd845015b4 (patch) | |
| tree | 86f6d29653ba7e548f2a321b2ecdb20e7dc366f4 /crates/ra_hir_ty | |
| parent | 78f7683b9a1c6192b4828ceedb14ed498b241263 (diff) | |
| parent | e424545c0f5cbaf135c52764169ea20df7d07d35 (diff) | |
Merge #2648
2648: Rudimentary name resolution for local items r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty')
| -rw-r--r-- | crates/ra_hir_ty/src/tests/simple.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir_ty/src/tests/simple.rs b/crates/ra_hir_ty/src/tests/simple.rs index 6fe647a5e..3e5e163e3 100644 --- a/crates/ra_hir_ty/src/tests/simple.rs +++ b/crates/ra_hir_ty/src/tests/simple.rs | |||
| @@ -1512,8 +1512,8 @@ fn test() { | |||
| 1512 | [49; 50) '0': u32 | 1512 | [49; 50) '0': u32 |
| 1513 | [80; 83) '101': u32 | 1513 | [80; 83) '101': u32 |
| 1514 | [95; 213) '{ ...NST; }': () | 1514 | [95; 213) '{ ...NST; }': () |
| 1515 | [138; 139) 'x': {unknown} | 1515 | [138; 139) 'x': u32 |
| 1516 | [142; 153) 'LOCAL_CONST': {unknown} | 1516 | [142; 153) 'LOCAL_CONST': u32 |
| 1517 | [163; 164) 'z': u32 | 1517 | [163; 164) 'z': u32 |
| 1518 | [167; 179) 'GLOBAL_CONST': u32 | 1518 | [167; 179) 'GLOBAL_CONST': u32 |
| 1519 | [189; 191) 'id': u32 | 1519 | [189; 191) 'id': u32 |
| @@ -1541,10 +1541,10 @@ fn test() { | |||
| 1541 | [29; 32) '101': u32 | 1541 | [29; 32) '101': u32 |
| 1542 | [70; 73) '101': u32 | 1542 | [70; 73) '101': u32 |
| 1543 | [85; 280) '{ ...MUT; }': () | 1543 | [85; 280) '{ ...MUT; }': () |
| 1544 | [173; 174) 'x': {unknown} | 1544 | [173; 174) 'x': u32 |
| 1545 | [177; 189) 'LOCAL_STATIC': {unknown} | 1545 | [177; 189) 'LOCAL_STATIC': u32 |
| 1546 | [199; 200) 'y': {unknown} | 1546 | [199; 200) 'y': u32 |
| 1547 | [203; 219) 'LOCAL_...IC_MUT': {unknown} | 1547 | [203; 219) 'LOCAL_...IC_MUT': u32 |
| 1548 | [229; 230) 'z': u32 | 1548 | [229; 230) 'z': u32 |
| 1549 | [233; 246) 'GLOBAL_STATIC': u32 | 1549 | [233; 246) 'GLOBAL_STATIC': u32 |
| 1550 | [256; 257) 'w': u32 | 1550 | [256; 257) 'w': u32 |