aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_ty
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-05-05 17:13:57 +0100
committerGitHub <[email protected]>2020-05-05 17:13:57 +0100
commit58f64313fdbb215b29cceb843e06d2c1541d9f56 (patch)
tree0c95a20510f832ec5f208a1ede39f8aad8ffcd86 /crates/ra_hir_ty
parent756e91732b7a92d9156f5c1d8ffcaf5155cf4680 (diff)
parent92665358cd98913e3fef8294e1889cc0bb919e3f (diff)
Merge #4321
4321: Rename ImplItem to AssocItem r=matklad a=edwin0cheng Related discussion: https://github.com/rust-analyzer/rust-analyzer/pull/4283#discussion_r419352265 Co-authored-by: Edwin Cheng <[email protected]>
Diffstat (limited to 'crates/ra_hir_ty')
-rw-r--r--crates/ra_hir_ty/src/tests/macros.rs4
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]
272fn infer_impl_items_generated_by_macros() { 272fn 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]
291fn infer_impl_items_generated_by_macros_chain() { 291fn 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