diff options
| author | Benjamin Coenen <[email protected]> | 2020-05-06 08:57:00 +0100 |
|---|---|---|
| committer | Benjamin Coenen <[email protected]> | 2020-05-06 08:57:00 +0100 |
| commit | c4d128e454448191c4b21d8e151c673e4c42376e (patch) | |
| tree | 17cf5bbf429642c52708cd0d3c1d8885b63543f0 /crates/ra_hir_ty/src/tests/macros.rs | |
| parent | 0bf02f5ccac99c91f10ef46bb06ff2ea316c382c (diff) | |
| parent | 30eb458b4fa8adcecd8cbf731bd1cfa9a7a8b88b (diff) | |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into fix_4311
Diffstat (limited to 'crates/ra_hir_ty/src/tests/macros.rs')
| -rw-r--r-- | crates/ra_hir_ty/src/tests/macros.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir_ty/src/tests/macros.rs b/crates/ra_hir_ty/src/tests/macros.rs index 29e38a06c..07398ddcc 100644 --- a/crates/ra_hir_ty/src/tests/macros.rs +++ b/crates/ra_hir_ty/src/tests/macros.rs | |||
| @@ -269,7 +269,7 @@ fn test() { S.foo()<|>; } | |||
| 269 | } | 269 | } |
| 270 | 270 | ||
| 271 | #[test] | 271 | #[test] |
| 272 | fn infer_impl_items_generated_by_macros() { | 272 | fn infer_assoc_items_generated_by_macros() { |
| 273 | let t = type_at( | 273 | let t = type_at( |
| 274 | r#" | 274 | r#" |
| 275 | //- /main.rs | 275 | //- /main.rs |
| @@ -288,7 +288,7 @@ fn test() { S.foo()<|>; } | |||
| 288 | } | 288 | } |
| 289 | 289 | ||
| 290 | #[test] | 290 | #[test] |
| 291 | fn infer_impl_items_generated_by_macros_chain() { | 291 | fn infer_assoc_items_generated_by_macros_chain() { |
| 292 | let t = type_at( | 292 | let t = type_at( |
| 293 | r#" | 293 | r#" |
| 294 | //- /main.rs | 294 | //- /main.rs |